Skip to content

Commit 8c01797

Browse files
authored
Add coolant pin messages to startup (#647)
* Add coolant pin messages to startup Help with user support. * Removing incorrect STEPPER_RESET definition * Fix laser mode startup message * cleanup - coolant_init() will behave as before - update build date - return default machine to test_drive
1 parent b72cd4c commit 8c01797

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

Grbl_Esp32/src/CoolantControl.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,25 @@
2424
#include "Grbl.h"
2525

2626
void coolant_init() {
27+
static bool init_message = true; // used to show messages only once.
28+
2729
#ifdef COOLANT_FLOOD_PIN
2830
pinMode(COOLANT_FLOOD_PIN, OUTPUT);
2931
#endif
3032
#ifdef COOLANT_MIST_PIN
3133
pinMode(COOLANT_MIST_PIN, OUTPUT);
3234
#endif
35+
36+
if (init_message) {
37+
#ifdef COOLANT_FLOOD_PIN
38+
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", pinName(COOLANT_FLOOD_PIN).c_str());
39+
#endif
40+
#ifdef COOLANT_MIST_PIN
41+
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", pinName(COOLANT_MIST_PIN).c_str());
42+
#endif
43+
init_message = false;
44+
}
45+
3346
coolant_stop();
3447
}
3548

Grbl_Esp32/src/Grbl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// Grbl versioning system
2424

2525
const char* const GRBL_VERSION = "1.3a";
26-
const char* const GRBL_VERSION_BUILD = "20201015";
26+
const char* const GRBL_VERSION_BUILD = "20201022";
2727

2828
//#include <sdkconfig.h>
2929
#include <Arduino.h>

Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
#define X2_STEPPER_MS3 I2SO(14) // A_CS
4646
#define Y2_STEPPER_MS3 I2SO(19) // B_CS
4747

48-
#define STEPPER_RESET GPIO_NUM_19
49-
5048
// Motor Socket #1
5149
#define X_DISABLE_PIN I2SO(0)
5250
#define X_DIRECTION_PIN I2SO(1)

Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
#define X2_STEPPER_MS3 I2SO(14) // A_CS
4646
#define Y2_STEPPER_MS3 I2SO(19) // B_CS
4747

48-
#define STEPPER_RESET GPIO_NUM_19
49-
5048
// Motor Socket #1
5149
#define X_DISABLE_PIN I2SO(0)
5250
#define X_DIRECTION_PIN I2SO(1)

Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
#define Y_STEPPER_MS3 I2SO(6) // Y_CS
4646
#define Z_STEPPER_MS3 I2SO(11) // Z_CS
4747

48-
#define STEPPER_RESET GPIO_NUM_19
49-
5048
// Motor Socket #1
5149
#define X_DISABLE_PIN I2SO(0)
5250
#define X_DIRECTION_PIN I2SO(1)
@@ -122,7 +120,6 @@ Socket #5
122120
// #define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_27
123121
// //#define INVERT_CONTROL_PIN_MASK B0000
124122

125-
126123
// ================= Setting Defaults ==========================
127124
#define DEFAULT_X_STEPS_PER_MM 800
128125
#define DEFAULT_Y_STEPS_PER_MM 800

Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
#define B_STEPPER_MS3 I2SO(19) // B_CS
4848
#define C_STEPPER_MS3 I2SO(22) // C_CS
4949

50-
#define STEPPER_RESET GPIO_NUM_19
51-
5250
// Motor Socket #1
5351
#define X_DISABLE_PIN I2SO(0)
5452
#define X_DIRECTION_PIN I2SO(1)

Grbl_Esp32/src/Spindles/Laser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ namespace Spindles {
3131
void Laser::config_message() {
3232
grbl_msg_sendf(CLIENT_SERIAL,
3333
MsgLevel::Info,
34-
"Laser spindle on Pin:%s, Freq:%.2fHz, Res:%dbits Laser mode:$32=%d",
34+
"Laser spindle on Pin:%s, Freq:%dHz, Res:%dbits Laser mode:%s",
3535
pinName(_output_pin).c_str(),
3636
_pwm_freq,
3737
_pwm_precision,
38-
isRateAdjusted()); // the current mode
38+
laser_mode->getStringValue()); // the current mode
3939

4040
use_delays = false; // this will override the value set in Spindle::PWM::init()
4141
}

0 commit comments

Comments
 (0)