MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix compilation errors

Browse Source
This commit is contained in:
esenapaj 2016-10-10 14:22:17 +09:00
parent f4ec265363
commit 00456b0cb3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -4690,7 +4690,7 @@ inline void gcode_M42() {
pin_state[pin - first_pin] = digitalRead(pin); pin_state[pin - first_pin] = digitalRead(pin);
} }
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
wait_for_user = true; wait_for_user = true;
#endif #endif
@ -4708,7 +4708,7 @@ inline void gcode_M42() {
} }
} }
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
if (!wait_for_user) break; if (!wait_for_user) break;
#endif #endif

2
Marlin/pinsDebug.h
View File

@ -36,7 +36,7 @@
#define _PIN_SAY(NAME) { SERIAL_ECHOPGM(STRINGIFY(NAME)); return true; } #define _PIN_SAY(NAME) { SERIAL_ECHOPGM(STRINGIFY(NAME)); return true; }
#define PIN_SAY(NAME) if (pin == NAME) _PIN_SAY(_##NAME##_); #define PIN_SAY(NAME) if (pin == NAME) _PIN_SAY(_##NAME##_);
#define ANALOG_PIN_SAY(NAME) if (pin == analogInputToDigitalPin(NAME)) _PIN_SAY(_##NAME##_); #define ANALOG_PIN_SAY(NAME) if (pin == analogInputToDigitalPin(NAME)) _PIN_SAY(_##NAME##_);
#define IS_ANALOG(P) if ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(5))) #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(5)))
// Report pin name for a given fastio digital pin index // Report pin name for a given fastio digital pin index
static bool report_pin_name(int8_t pin) { static bool report_pin_name(int8_t pin) {