mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-01 02:21:46 +02:00
Code Issues Releases Wiki Activity

Killed some dead ifdefs

Browse Source
This commit is contained in:
Mitch Bradley
2021-05-22 14:56:09 -10:00
parent 4d82665837
commit de6a6d5de0
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Grbl_Esp32/src/Config.h
View File

@@ -219,19 +219,6 @@ static const uint8_t NHomingLocateCycle = 1; // Integer (1-128)
// previous tool path, as if nothing happened.
#define ENABLE_SAFETY_DOOR_INPUT_PIN // ESP32 Leave this enabled for now .. code for undefined not ready
// Inverts select limit pin states based on the following mask. This effects all limit pin functions,
// such as hard limits and homing. However, this is different from overall invert limits setting.
// This build option will invert only the limit pins defined here, and then the invert limits setting
// will be applied to all of them. This is useful when a user has a mixed set of limit pins with both
// normally-open(NO) and normally-closed(NC) switches installed on their machine.
// NOTE: PLEASE DO NOT USE THIS, unless you have a situation that needs it.
// #define INVERT_LIMIT_PIN_MASK (bit(X_AXIS)|bit(Y_AXIS)) // Default disabled. Uncomment to enable.
// Inverts the selected coolant pin from low-disabled/high-enabled to low-enabled/high-disabled. Useful
// for some pre-built electronic boards.
// #define INVERT_COOLANT_FLOOD_PIN // Default disabled. Uncomment to enable.
// #define INVERT_COOLANT_MIST_PIN // Default disabled. Note: Enable M7 mist coolant in config.h
// When Grbl powers-cycles or is hard reset with the Arduino reset button, Grbl boots up with no ALARM
// by default. This is to make it as simple as possible for new users to start using Grbl. When homing
// is enabled and a user has installed limit switches, Grbl will boot up in an ALARM state to indicate

12
Grbl_Esp32/src/CoolantControl.cpp
View File

@@ -28,10 +28,12 @@ void CoolantControl::init() {
static bool init_message = true; // used to show messages only once.
if (init_message) {
if (flood_.defined())
if (flood_.defined()) {
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", flood_.name().c_str());
if (mist_.defined())
}
if (mist_.defined()) {
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", mist_.name().c_str());
}
init_message = false;
}
@@ -48,9 +50,6 @@ CoolantState CoolantControl::get_state() {
if (flood_.defined()) {
auto pinState = flood_.read();
#ifdef INVERT_COOLANT_FLOOD_PIN
pinState = !pinState;
#endif
if (pinState) {
cl_state.Flood = 1;
@@ -59,9 +58,6 @@ CoolantState CoolantControl::get_state() {
if (mist_.defined()) {
auto pinState = mist_.read();
#ifdef INVERT_COOLANT_MIST_PIN
pinState = !pinState;
#endif
if (pinState) {
cl_state.Mist = 1;