Browse Source

Fix compilation errors

esenapaj 8 years ago
parent
commit
00456b0cb3
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/pinsDebug.h

+ 2
- 2
Marlin/Marlin_main.cpp View File

4690
           pin_state[pin - first_pin] = digitalRead(pin);
4690
           pin_state[pin - first_pin] = digitalRead(pin);
4691
       }
4691
       }
4692
 
4692
 
4693
-      #if ENABLED(EMERGENCY_PARSER)
4693
+      #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
4694
         wait_for_user = true;
4694
         wait_for_user = true;
4695
       #endif
4695
       #endif
4696
 
4696
 
4708
           }
4708
           }
4709
         }
4709
         }
4710
 
4710
 
4711
-        #if ENABLED(EMERGENCY_PARSER)
4711
+        #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
4712
           if (!wait_for_user) break;
4712
           if (!wait_for_user) break;
4713
         #endif
4713
         #endif
4714
 
4714
 

+ 1
- 1
Marlin/pinsDebug.h View File

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

Loading…
Cancel
Save