From b7d65bbaaca74a48ba36cbb8bccfc09b390503dd Mon Sep 17 00:00:00 2001 From: Jesse Schoch Date: Thu, 5 Aug 2021 15:53:47 -0700 Subject: [PATCH] trying to fix newlines --- Grbl_Esp32/src/Spindles/Spindle.cpp | 7 ++++--- Grbl_Esp32/src/Spindles/TecoL510.cpp | 3 ++- Grbl_Esp32/src/Spindles/TecoL510.h | 1 + Grbl_Esp32/src/Spindles/TecoL510_README.md | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Grbl_Esp32/src/Spindles/Spindle.cpp b/Grbl_Esp32/src/Spindles/Spindle.cpp index c783309b..bc15ab96 100644 --- a/Grbl_Esp32/src/Spindles/Spindle.cpp +++ b/Grbl_Esp32/src/Spindles/Spindle.cpp @@ -44,6 +44,7 @@ namespace Spindles { // An instance of each type of spindle is created here. // This allows the spindle to be dynamicly switched + Null null; PWM pwm; Relay relay; @@ -53,8 +54,8 @@ namespace Spindles { H2A h2a; BESC besc; _10v _10v; - YL620 yl620; - L510 l510; + YL620 yl620; + L510 l510; void Spindle::select() { switch (static_cast(spindle_type->get())) { @@ -114,4 +115,4 @@ namespace Spindles { void Spindle::deinit() { stop(); } } - Spindles::Spindle* spindle; +Spindles::Spindle* spindle; diff --git a/Grbl_Esp32/src/Spindles/TecoL510.cpp b/Grbl_Esp32/src/Spindles/TecoL510.cpp index 0e730c82..90516908 100644 --- a/Grbl_Esp32/src/Spindles/TecoL510.cpp +++ b/Grbl_Esp32/src/Spindles/TecoL510.cpp @@ -38,6 +38,7 @@ namespace Spindles { void L510::direction_command(SpindleState mode, ModbusCommand& data) { // Note: The direction command is always called on M3,M4, and M5 // This is where the spindle start/stop should be sent + // NOTE: data length is excluding the CRC16 checksum. data.tx_length = 6; @@ -206,4 +207,4 @@ namespace Spindles { return true; }; } -} \ No newline at end of file +} diff --git a/Grbl_Esp32/src/Spindles/TecoL510.h b/Grbl_Esp32/src/Spindles/TecoL510.h index 99eabe77..f89de262 100644 --- a/Grbl_Esp32/src/Spindles/TecoL510.h +++ b/Grbl_Esp32/src/Spindles/TecoL510.h @@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License along with Grbl. If not, see . + */ namespace Spindles { diff --git a/Grbl_Esp32/src/Spindles/TecoL510_README.md b/Grbl_Esp32/src/Spindles/TecoL510_README.md index 1fdafb87..9cdfd6e9 100644 --- a/Grbl_Esp32/src/Spindles/TecoL510_README.md +++ b/Grbl_Esp32/src/Spindles/TecoL510_README.md @@ -22,9 +22,10 @@ this was tested with pin 16 RX and 26 TX mapped in the machine config file. Pin #define VFD_RS485_RTS_PIN GPIO_NUM_4 #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 -max frequency is currenly hardcode \ No newline at end of file +max frequency is currenly hardcode