diff --git a/.travis.yml b/.travis.yml
index 23d673f4b28b0356ecc93e3b945868ec5f8853f9..8408ecf40fda0d968268d54698469ae86db4fbab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,6 +93,12 @@ script:
- opt_enable PIDTEMPBED
- build_marlin
#
+ # Test MAX6675
+ #
+ - restore_configs
+ - opt_set TEMP_SENSOR_0 -2
+ - build_marlin
+ #
# Test a "Fix Mounted" Probe along with Safe Homing
#
- restore_configs
diff --git a/Marlin/pins.h b/Marlin/pins.h
index 3657675db5d8cad340d077ff82c036393213597c..bc1ede37fa016e15018e49e9ea451a17b9a2bd22 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -214,6 +214,9 @@
#ifndef FAN2_PIN
#define FAN2_PIN -1
#endif
+#ifndef CONTROLLERFAN_PIN
+ #define CONTROLLERFAN_PIN -1
+#endif
#ifndef HEATER_0_PIN
#define HEATER_0_PIN -1
@@ -456,17 +459,56 @@
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
+/**
+ * Define SPI Pins: SCK, MISO, MOSI, SS
+ */
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
+ #define AVR_SCK_PIN 13
+ #define AVR_MISO_PIN 12
+ #define AVR_MOSI_PIN 11
+ #define AVR_SS_PIN 10
+#elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
+ #define AVR_SCK_PIN 7
+ #define AVR_MISO_PIN 6
+ #define AVR_MOSI_PIN 5
+ #define AVR_SS_PIN 4
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+ #define AVR_SCK_PIN 52
+ #define AVR_MISO_PIN 50
+ #define AVR_MOSI_PIN 51
+ #define AVR_SS_PIN 53
+#elif defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
+ #if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS)
+ // Teensy pin assignments
+ #define AVR_SCK_PIN 21
+ #define AVR_MISO_PIN 23
+ #define AVR_MOSI_PIN 22
+ #define AVR_SS_PIN 20
+ #else
+ // Traditional pin assignments
+ #define AVR_SCK_PIN 9
+ #define AVR_MISO_PIN 11
+ #define AVR_MOSI_PIN 10
+ #define AVR_SS_PIN 8
+ #endif
+#elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
+ #define AVR_SCK_PIN 10
+ #define AVR_MISO_PIN 12
+ #define AVR_MOSI_PIN 11
+ #define AVR_SS_PIN 16
+#endif
+
#ifndef SCK_PIN
- #define SCK_PIN SCK
+ #define SCK_PIN AVR_SCK_PIN
#endif
#ifndef MISO_PIN
- #define MISO_PIN MISO
+ #define MISO_PIN AVR_MISO_PIN
#endif
#ifndef MOSI_PIN
- #define MOSI_PIN MOSI
+ #define MOSI_PIN AVR_MOSI_PIN
#endif
#ifndef SS_PIN
- #define SS_PIN SS
+ #define SS_PIN AVR_SS_PIN
#endif
#endif //__PINS_H
diff --git a/Marlin/pins_BQ_ZUM_MEGA_3D.h b/Marlin/pins_BQ_ZUM_MEGA_3D.h
index c5509d4e5ff0ae82bc641d86d9be4b9d1c95f692..51b30e6dd31b930bd14e67a69458027b3b8b472e 100644
--- a/Marlin/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/pins_BQ_ZUM_MEGA_3D.h
@@ -30,6 +30,11 @@
#define BOARD_NAME "ZUM Mega 3D"
+#define RAMPS_D8_PIN 10
+#define RAMPS_D9_PIN 12
+#define RAMPS_D10_PIN 9
+#define MOSFET_D_PIN 7
+
#include "pins_RAMPS_13.h"
#undef X_MAX_PIN
@@ -38,15 +43,6 @@
#undef Z_ENABLE_PIN
#define Z_ENABLE_PIN 77 // 62
-#undef FAN_PIN
-#define FAN_PIN 12 // 4
-
-#undef HEATER_0_PIN
-#define HEATER_0_PIN 9 // 10
-
-#undef HEATER_1_PIN
-#define HEATER_1_PIN 10 // 9
-
#undef TEMP_1_PIN
#define TEMP_1_PIN 14 // 15
@@ -56,8 +52,6 @@
#define DIGIPOTSS_PIN 22
#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
-#define FAN1_PIN 7
-
#undef PS_ON_PIN // 12
#define PS_ON_PIN 81 // External Power Supply
diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/pins_BRAINWAVE_PRO.h
index cba0d469449c1bab0629fe48e294b04e22adff7c..b0d53a0ca97079632c77be251950a8f77e566930 100644
--- a/Marlin/pins_BRAINWAVE_PRO.h
+++ b/Marlin/pins_BRAINWAVE_PRO.h
@@ -33,7 +33,7 @@
#include "fastio.h"
-#ifndef AT90USBxx_TEENSYPP_ASSIGNMENTS // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
+#if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
#error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config"
#endif
diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 5f2e0d1194e9246e35d03c7ec75337d2f86f0397..7e2acc21ec2a85ff8a248d7c603fa845e5dbe8c1 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -159,7 +159,6 @@
#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
#define FAN_PIN RAMPS_D9_PIN
#define FAN1_PIN RAMPS_D8_PIN
- #define CONTROLLERFAN_PIN -1
#elif ENABLED(IS_RAMPS_SF) // Spindle, Fan
#define FAN_PIN RAMPS_D8_PIN
#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
diff --git a/Marlin/pins_TEENSY2.h b/Marlin/pins_TEENSY2.h
index f4f7d4c01379a9fc85ccfa03b6fed142070d4eae..bfadf295d56ed0e2f1a5e7f61ac521d92f69cf82 100644
--- a/Marlin/pins_TEENSY2.h
+++ b/Marlin/pins_TEENSY2.h
@@ -69,7 +69,7 @@
#error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu."
#endif
-#ifndef AT90USBxx_TEENSYPP_ASSIGNMENTS // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
+#if DISABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical.
#error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config"
// (or build from command line)
#endif
diff --git a/buildroot/bin/opt_disable_adv b/buildroot/bin/opt_disable_adv
old mode 100644
new mode 100755
diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs
index ba7a72cd891903590de5c98cb449f10aa9db4b8a..73240bd438ef476bd9336a84082e1d0b4d2dae8b 100755
--- a/buildroot/bin/restore_configs
+++ b/buildroot/bin/restore_configs
@@ -2,7 +2,7 @@
cp Marlin/Configuration.h.backup Marlin/Configuration.h
cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h
-cp Marlin/pins_RAMPS_14.h.backup Marlin/pins_RAMPS_14.h
+cp Marlin/pins_RAMPS.h.backup Marlin/pins_RAMPS.h
if [ -f Marlin/_Bootscreen.h ]; then
rm Marlin/_Bootscreen.h