Skip to content

Add coolant pin messages to startup #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdring merged 4 commits into from
Oct 23, 2020
Merged

Add coolant pin messages to startup #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbc03c6
Add coolant pin messages to startup
bdring Oct 17, 2020
fc19e85
Removing incorrect STEPPER_RESET definition
bdring Oct 21, 2020
4c550dd
Fix laser mode startup message
bdring Oct 21, 2020
7740486
cleanup
bdring Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Grbl_Esp32/src/CoolantControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion Grbl_Esp32/src/Grbl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <sdkconfig.h>
#include <Arduino.h>
Expand Down
2 changes: 0 additions & 2 deletions Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Grbl_Esp32/src/Spindles/Laser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down