1
0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-15 19:14:06 +02:00

trying to fix newlines

This commit is contained in:
Jesse Schoch
2021-08-05 15:53:47 -07:00
parent a26d86f607
commit b7d65bbaac
4 changed files with 9 additions and 5 deletions

View File

@@ -44,6 +44,7 @@
namespace Spindles { namespace Spindles {
// An instance of each type of spindle is created here. // An instance of each type of spindle is created here.
// This allows the spindle to be dynamicly switched // This allows the spindle to be dynamicly switched
Null null; Null null;
PWM pwm; PWM pwm;
Relay relay; Relay relay;
@@ -53,8 +54,8 @@ namespace Spindles {
H2A h2a; H2A h2a;
BESC besc; BESC besc;
_10v _10v; _10v _10v;
YL620 yl620; YL620 yl620;
L510 l510; L510 l510;
void Spindle::select() { void Spindle::select() {
switch (static_cast<SpindleType>(spindle_type->get())) { switch (static_cast<SpindleType>(spindle_type->get())) {
@@ -114,4 +115,4 @@ namespace Spindles {
void Spindle::deinit() { stop(); } void Spindle::deinit() { stop(); }
} }
Spindles::Spindle* spindle; Spindles::Spindle* spindle;

View File

@@ -38,6 +38,7 @@ namespace Spindles {
void L510::direction_command(SpindleState mode, ModbusCommand& data) { void L510::direction_command(SpindleState mode, ModbusCommand& data) {
// Note: The direction command is always called on M3,M4, and M5 // Note: The direction command is always called on M3,M4, and M5
// This is where the spindle start/stop should be sent // This is where the spindle start/stop should be sent
// NOTE: data length is excluding the CRC16 checksum. // NOTE: data length is excluding the CRC16 checksum.
data.tx_length = 6; data.tx_length = 6;
@@ -206,4 +207,4 @@ namespace Spindles {
return true; return true;
}; };
} }
} }

View File

@@ -19,6 +19,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Grbl. If not, see <http://www.gnu.org/licenses/>. along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*/ */
namespace Spindles { namespace Spindles {

View File

@@ -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_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 // Not sure why this isn't a setting
#define DEFAULT_SPINDLE_RPM_MAX 24000.0 // rpm #define DEFAULT_SPINDLE_RPM_MAX 24000.0 // rpm
#define DEFAULT_SPINDLE_RPM_MIN 6000.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
max frequency is currenly hardcode max frequency is currenly hardcode