From c6f1337f5c871843af7d2905b1eed0e217078cdb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 28 Apr 2016 17:59:52 -0700
Subject: [PATCH 1/3] NOOP macro for do-nothing macros

---
 Marlin/macros.h   | 2 ++
 Marlin/ultralcd.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/macros.h b/Marlin/macros.h
index 5f53ee987..69ecc6fdb 100644
--- a/Marlin/macros.h
+++ b/Marlin/macros.h
@@ -60,4 +60,6 @@
 #define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
 #define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
 
+#define NOOP do{}while(0)
+
 #endif //__MACROS_H
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index 9665c2ce9..e20f5cc33 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -156,8 +156,8 @@
   FORCE_INLINE void lcd_reset_alert_level() {}
   FORCE_INLINE bool lcd_detected(void) { return true; }
 
-  #define LCD_MESSAGEPGM(x) do{}while(0)
-  #define LCD_ALERTMESSAGEPGM(x) do{}while(0)
+  #define LCD_MESSAGEPGM(x) NOOP
+  #define LCD_ALERTMESSAGEPGM(x) NOOP
 
 #endif //ULTRA_LCD
 

From f508c54c6c67df588551408a7174145e19fb1dc8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 28 Apr 2016 18:04:45 -0700
Subject: [PATCH 2/3] Use #undef in AZTEEG_X3_PRO for RAMPS overrides

---
 Marlin/pins_AZTEEG_X3_PRO.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h
index a184ec2b9..a209d0b83 100644
--- a/Marlin/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/pins_AZTEEG_X3_PRO.h
@@ -28,6 +28,8 @@
 
 #undef FAN_PIN
 #define FAN_PIN             6 //Part Cooling System
+
+#undef BEEPER_PIN
 #define BEEPER_PIN         33
 #define CONTROLLERFAN_PIN   4 //Pin used for the fan to cool motherboard (-1 to disable)
 //Fans/Water Pump to cool the hotend cool side.
@@ -55,7 +57,8 @@
   #define Z_MIN_PIN        19
   #define Z_MAX_PIN        18
 #endif
-//
+
+
 #if ENABLED(Z_MIN_PROBE_ENDSTOP)
   //#undef Z_MIN_PIN
   //#define Z_MIN_PIN        15
@@ -95,10 +98,11 @@
 #define TC2                 5   // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
 
 //
-//These Servo pins are for when they are defined. Tested for usage with bed leveling
-//on a Delta with 1 servo. Running through the Z servo endstop in code.
-//Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
+// These Servo pins are for when they are defined. Tested for usage with bed leveling
+// on a Delta with 1 servo. Running through the Z servo endstop in code.
+// Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
 //
+#undef SERVO0_PIN
 #define SERVO0_PIN         47
 
 //LCD Pins//

From 5b7a6c217a0d19b0d959778613d5e3cc54bb132b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Thu, 28 Apr 2016 18:11:36 -0700
Subject: [PATCH 3/3] Include more fans in sensitive pins list

---
 Marlin/pins.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/pins.h b/Marlin/pins.h
index eb37f87af..a13df540c 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -270,7 +270,8 @@
     X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, \
     Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, \
     Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_MIN_PROBE_PIN, \
-    PS_ON_PIN, HEATER_BED_PIN, FAN_PIN, \
+    PS_ON_PIN, HEATER_BED_PIN, FAN_PIN, CONTROLLERFAN_PIN, \
+    EXTRUDER_0_AUTO_FAN_PIN, EXTRUDER_1_AUTO_FAN_PIN, EXTRUDER_2_AUTO_FAN_PIN, EXTRUDER_3_AUTO_FAN_PIN, \
     _E0_PINS _E1_PINS _E2_PINS _E3_PINS \
     analogInputToDigitalPin(TEMP_BED_PIN) \
   }