Merge pull request #7769 from thinkyhead/bf2_GT2560

Fixes for GT2560, ANET A8

Marlin/src/Marlin.cpp

@@ -239,12 +239,6 @@ void setup_powerhold() {
   #endif
 }
 
-void suicide() {
-  #if HAS_SUICIDE
-    OUT_WRITE(SUICIDE_PIN, LOW);
-  #endif
-}
-
 #if HAS_SERVOS
 
   HAL_SERVO_LIB servo[NUM_SERVOS];
@@ -612,7 +606,10 @@ void kill(const char* lcd_msg) {
     SET_INPUT(PS_ON_PIN);
   #endif
 
+  #if HAS_SUICIDE
     suicide();
+  #endif
+
   while (1) {
     #if ENABLED(USE_WATCHDOG)
       watchdog_reset();

Marlin/src/Marlin.h

@@ -218,4 +218,8 @@ extern millis_t max_inactive_time, stepper_inactive_time;
 
 bool pin_is_protected(const int8_t pin);
 
+#if HAS_SUICIDE
+  inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); }
+#endif
+
 #endif // __MARLIN_H__

Marlin/src/gcode/control/M80_M81.cpp

@@ -30,6 +30,10 @@
   #include "../../lcd/ultralcd.h"
 #endif
 
+#if HAS_SUICIDE
+  #include "../../Marlin.h"
+#endif
+
 #if HAS_POWER_SWITCH
 
   // Could be moved to a feature, but this is all the data

Marlin/src/module/temperature.cpp

@@ -1972,7 +1972,7 @@ void Temperature::isr() {
 
     #if ENABLED(ADC_KEYPAD)
       case Prepare_ADC_KEY:
-        START_ADC(ADC_KEYPAD_PIN);
+        HAL_START_ADC(ADC_KEYPAD_PIN);
         break;
       case Measure_ADC_KEY:
         if (ADCKey_count < 16) {

Marlin/src/pins/pins_GT2560_REV_A_PLUS.h

@@ -29,4 +29,8 @@
 #undef BOARD_NAME
 #define BOARD_NAME  "GT2560 Rev.A+"
 
+#if ENABLED(BLTOUCH)
+  #define SERVO0_PIN  32
+#else
   #define SERVO0_PIN  11
+#endif