mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-27 08:14:31 +02:00
Code Issues Releases Wiki Activity

fix smell and update readme

Browse Source
This commit is contained in:
Jesse Schoch
2021-08-05 11:42:10 -07:00
parent 07fd65b57a
commit 68f934d714
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Grbl_Esp32/src/Spindles/TecoL510.cpp
View File

@@ -69,19 +69,7 @@ namespace Spindles {
data.tx_length = 6; data.tx_length = 6;
data.rx_length = 6; data.rx_length = 6;
// We have to know the max RPM before we can set the current RPM: uint16_t freq = rpm_to_frequency(rpm);
auto max_rpm = this->_max_rpm;
auto max_freq = this->_max_freq;
// Assuming max frequncy is 400Hz
// Speed is in [0..40,000]
uint16_t freq = (uint16_t(rpm) * max_freq) / uint32_t(max_rpm);
if (freq < 0) {
freq = 0;
}
if (freq > max_freq) {
freq = max_freq;
}
data.msg[1] = 0x06; // WRITE data.msg[1] = 0x06; // WRITE
data.msg[2] = 0x25; // Command ID 0x2502 data.msg[2] = 0x25; // Command ID 0x2502
@@ -97,6 +85,12 @@ namespace Spindles {
auto max_rpm = this->_max_rpm; auto max_rpm = this->_max_rpm;
auto max_freq = this->_max_freq; auto max_freq = this->_max_freq;
uint16_t freq = (uint32_t(rpm) * max_freq) / uint32_t(max_rpm); uint16_t freq = (uint32_t(rpm) * max_freq) / uint32_t(max_rpm);
if (freq < 0) {
freq = 0;
}
if (freq > max_freq) {
freq = max_freq;
}
return freq; return freq;
} }

4
Grbl_Esp32/src/Spindles/TecoL510_README.md
View File

@@ -21,7 +21,9 @@ this was tested with pin 16 RX and 26 TX mapped in the machine config file. Pin
#define VFD_RS485_TXD_PIN GPIO_NUM_26 #define VFD_RS485_TXD_PIN GPIO_NUM_26
#define VFD_RS485_RTS_PIN GPIO_NUM_4 #define VFD_RS485_RTS_PIN GPIO_NUM_4
#define VFD_RS485_RXD_PIN GPIO_NUM_16 #define VFD_RS485_RXD_PIN GPIO_NUM_16
// Not sure why this isn't a setting
#define DEFAULT_SPINDLE_RPM_MAX 24000.0 // rpm
#define DEFAULT_SPINDLE_RPM_MIN 6000.0 // rpm
``` ```
not sure how to detect and parse error messages not sure how to detect and parse error messages