Browse Source

Fixes for Anet10 and gt2560

Fixes for 2 "... not declared in this scope" compiler errors.
Phr3d13 7 years ago
parent
commit
10c1b442ca

+ 4
- 7
Marlin/src/Marlin.cpp View File

239
   #endif
239
   #endif
240
 }
240
 }
241
 
241
 
242
-void suicide() {
243
-  #if HAS_SUICIDE
244
-    OUT_WRITE(SUICIDE_PIN, LOW);
245
-  #endif
246
-}
247
-
248
 #if HAS_SERVOS
242
 #if HAS_SERVOS
249
 
243
 
250
   HAL_SERVO_LIB servo[NUM_SERVOS];
244
   HAL_SERVO_LIB servo[NUM_SERVOS];
612
     SET_INPUT(PS_ON_PIN);
606
     SET_INPUT(PS_ON_PIN);
613
   #endif
607
   #endif
614
 
608
 
615
-  suicide();
609
+  #if HAS_SUICIDE
610
+    suicide();
611
+  #endif
612
+
616
   while (1) {
613
   while (1) {
617
     #if ENABLED(USE_WATCHDOG)
614
     #if ENABLED(USE_WATCHDOG)
618
       watchdog_reset();
615
       watchdog_reset();

+ 4
- 0
Marlin/src/Marlin.h View File

218
 
218
 
219
 bool pin_is_protected(const int8_t pin);
219
 bool pin_is_protected(const int8_t pin);
220
 
220
 
221
+#if HAS_SUICIDE
222
+  inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); }
223
+#endif
224
+
221
 #endif // __MARLIN_H__
225
 #endif // __MARLIN_H__

+ 4
- 0
Marlin/src/gcode/control/M80_M81.cpp View File

30
   #include "../../lcd/ultralcd.h"
30
   #include "../../lcd/ultralcd.h"
31
 #endif
31
 #endif
32
 
32
 
33
+#if HAS_SUICIDE
34
+  #include "../../Marlin.h"
35
+#endif
36
+
33
 #if HAS_POWER_SWITCH
37
 #if HAS_POWER_SWITCH
34
 
38
 
35
   // Could be moved to a feature, but this is all the data
39
   // Could be moved to a feature, but this is all the data

+ 1
- 1
Marlin/src/module/temperature.cpp View File

1972
 
1972
 
1973
     #if ENABLED(ADC_KEYPAD)
1973
     #if ENABLED(ADC_KEYPAD)
1974
       case Prepare_ADC_KEY:
1974
       case Prepare_ADC_KEY:
1975
-        START_ADC(ADC_KEYPAD_PIN);
1975
+        HAL_START_ADC(ADC_KEYPAD_PIN);
1976
         break;
1976
         break;
1977
       case Measure_ADC_KEY:
1977
       case Measure_ADC_KEY:
1978
         if (ADCKey_count < 16) {
1978
         if (ADCKey_count < 16) {

Loading…
Cancel
Save