diff --git a/Grbl_Esp32/src/CoolantControl.cpp b/Grbl_Esp32/src/CoolantControl.cpp index ca14a8f1..6e823c77 100644 --- a/Grbl_Esp32/src/CoolantControl.cpp +++ b/Grbl_Esp32/src/CoolantControl.cpp @@ -24,12 +24,25 @@ #include "Grbl.h" void coolant_init() { + static bool init_message = true; // used to show messages only once. + #ifdef COOLANT_FLOOD_PIN pinMode(COOLANT_FLOOD_PIN, OUTPUT); #endif #ifdef COOLANT_MIST_PIN pinMode(COOLANT_MIST_PIN, OUTPUT); #endif + + if (init_message) { +#ifdef COOLANT_FLOOD_PIN + grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", pinName(COOLANT_FLOOD_PIN).c_str()); +#endif +#ifdef COOLANT_MIST_PIN + grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", pinName(COOLANT_MIST_PIN).c_str()); +#endif + init_message = false; + } + coolant_stop(); } diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h index a3106010..b2e9c2d8 100644 --- a/Grbl_Esp32/src/Grbl.h +++ b/Grbl_Esp32/src/Grbl.h @@ -23,7 +23,7 @@ // Grbl versioning system const char* const GRBL_VERSION = "1.3a"; -const char* const GRBL_VERSION_BUILD = "20201015"; +const char* const GRBL_VERSION_BUILD = "20201022"; //#include #include diff --git a/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h b/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h index 0107cd94..9e935607 100644 --- a/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h @@ -45,8 +45,6 @@ #define X2_STEPPER_MS3 I2SO(14) // A_CS #define Y2_STEPPER_MS3 I2SO(19) // B_CS -#define STEPPER_RESET GPIO_NUM_19 - // Motor Socket #1 #define X_DISABLE_PIN I2SO(0) #define X_DIRECTION_PIN I2SO(1) diff --git a/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h b/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h index d1f36e54..034dade2 100644 --- a/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h @@ -45,8 +45,6 @@ #define X2_STEPPER_MS3 I2SO(14) // A_CS #define Y2_STEPPER_MS3 I2SO(19) // B_CS -#define STEPPER_RESET GPIO_NUM_19 - // Motor Socket #1 #define X_DISABLE_PIN I2SO(0) #define X_DIRECTION_PIN I2SO(1) diff --git a/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h b/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h index ea00a45e..28ab79db 100644 --- a/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h @@ -45,8 +45,6 @@ #define Y_STEPPER_MS3 I2SO(6) // Y_CS #define Z_STEPPER_MS3 I2SO(11) // Z_CS -#define STEPPER_RESET GPIO_NUM_19 - // Motor Socket #1 #define X_DISABLE_PIN I2SO(0) #define X_DIRECTION_PIN I2SO(1) @@ -122,7 +120,6 @@ Socket #5 // #define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_27 // //#define INVERT_CONTROL_PIN_MASK B0000 - // ================= Setting Defaults ========================== #define DEFAULT_X_STEPS_PER_MM 800 #define DEFAULT_Y_STEPS_PER_MM 800 diff --git a/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h b/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h index d08faf2b..caf673be 100644 --- a/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h @@ -47,8 +47,6 @@ #define B_STEPPER_MS3 I2SO(19) // B_CS #define C_STEPPER_MS3 I2SO(22) // C_CS -#define STEPPER_RESET GPIO_NUM_19 - // Motor Socket #1 #define X_DISABLE_PIN I2SO(0) #define X_DIRECTION_PIN I2SO(1) diff --git a/Grbl_Esp32/src/Spindles/Laser.cpp b/Grbl_Esp32/src/Spindles/Laser.cpp index 4500600d..b9fa0c72 100644 --- a/Grbl_Esp32/src/Spindles/Laser.cpp +++ b/Grbl_Esp32/src/Spindles/Laser.cpp @@ -31,11 +31,11 @@ namespace Spindles { void Laser::config_message() { grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, - "Laser spindle on Pin:%s, Freq:%.2fHz, Res:%dbits Laser mode:$32=%d", + "Laser spindle on Pin:%s, Freq:%dHz, Res:%dbits Laser mode:%s", pinName(_output_pin).c_str(), _pwm_freq, _pwm_precision, - isRateAdjusted()); // the current mode + laser_mode->getStringValue()); // the current mode use_delays = false; // this will override the value set in Spindle::PWM::init() }