LPC176x Framework SPI Fixes for MAX6675, MAX31855 and MAX31865 SPI boards

Marlin/src/HAL/LPC1768/inc/SanityCheck.h

@@ -31,7 +31,7 @@
 /**
  * Detect an old pins file by checking for old ADC pins values.
  */
-#define _OLD_TEMP_PIN(P) PIN_EXISTS(P) && _CAT(P,_PIN) <= 7 && _CAT(P,_PIN) != 2 && _CAT(P,_PIN) != 3
+#define _OLD_TEMP_PIN(P) PIN_EXISTS(P) && _CAT(P,_PIN) <= 7 && !(_CAT(P,_PIN) >= 0 && _CAT(P,_PIN) <= 3)
 #if _OLD_TEMP_PIN(TEMP_BED)
   #error "TEMP_BED_PIN must be defined using the Pn_nn or Pn_nn_An format. (See the included pins files)."
 #elif _OLD_TEMP_PIN(TEMP_0)

Marlin/src/MarlinCore.cpp

@@ -1013,11 +1013,31 @@ void setup() {
   SETUP_RUN(HAL_init());
 
   // Init and disable SPI thermocouples
-  #if HEATER_0_USES_MAX6675
-    OUT_WRITE(MAX6675_SS_PIN, HIGH);  // Disable
+  #if HEATER_0_USES_MAX6675 && PIN_EXISTS(MAX6675_SS)
+    OUT_WRITE(MAX6675_SS_PIN, HIGH);
   #endif
-  #if HEATER_1_USES_MAX6675
-    OUT_WRITE(MAX6675_SS2_PIN, HIGH); // Disable
+  #if HEATER_1_USES_MAX6675 && PIN_EXISTS(MAX6675_SS2)
+    OUT_WRITE(MAX6675_SS2_PIN, HIGH);
+  #endif
+  #if HEATER_0_USES_MAX6675 && PIN_EXISTS(MAX6675_CS)
+    OUT_WRITE(MAX6675_CS_PIN, HIGH);
+  #endif
+  #if HEATER_1_USES_MAX6675 && PIN_EXISTS(MAX6675_CS2)
+    OUT_WRITE(MAX6675_CS2_PIN, HIGH);
+  #endif
+
+  #if HEATER_0_USES_MAX6675 && PIN_EXISTS(MAX31855_CS)
+    OUT_WRITE(MAX31855_CS_PIN, HIGH);
+  #endif
+  #if HEATER_1_USES_MAX6675 && PIN_EXISTS(MAX31855_CS2)
+    OUT_WRITE(MAX31855_CS2_PIN, HIGH);
+  #endif
+
+  #if HEATER_0_USES_MAX6675 && PIN_EXISTS(MAX31865_CS)
+    OUT_WRITE(MAX31865_CS_PIN, HIGH);
+  #endif
+  #if HEATER_1_USES_MAX6675 && PIN_EXISTS(MAX31865_CS2)
+    OUT_WRITE(MAX31865_CS2_PIN, HIGH);
   #endif
 
   #if HAS_L64XX

Marlin/src/core/boards.h

@@ -406,5 +406,3 @@
 
 #define _MB_1(B)  (defined(BOARD_##B) && MOTHERBOARD==BOARD_##B)
 #define MB(V...)  DO(MB,||,V)
-
-#define IS_MELZI MB(MELZI, MELZI_CREALITY, MELZI_MAKR3D, MELZI_MALYAN, MELZI_TRONXY, MELZI_V2)

Marlin/src/inc/Conditionals_post.h

@@ -411,6 +411,8 @@
     #define MAX6675_0_IS_MAX31865 1
   #elif TEMP_SENSOR_0 == -3
     #define MAX6675_0_IS_MAX31855 1
+  #elif TEMP_SENSOR_0 == -2
+    #define MAX6675_0_IS_MAX6675 1
   #endif
 #elif TEMP_SENSOR_0 == -4
   #define HEATER_0_USES_AD8495 1
@@ -442,6 +444,8 @@
     #define MAX6675_1_IS_MAX31865 1
   #elif TEMP_SENSOR_1 == -3
     #define MAX6675_1_IS_MAX31855 1
+  #elif TEMP_SENSOR_1 == -2
+    #define MAX6675_1_IS_MAX6675 1
   #endif
   #if TEMP_SENSOR_1 != TEMP_SENSOR_0
     #if   TEMP_SENSOR_1 == -5
@@ -469,6 +473,16 @@
   #undef HEATER_1_MAXTEMP
 #endif
 
+#if MAX6675_0_IS_MAX31855 || MAX6675_1_IS_MAX31855
+  #define MAX6675_HAS_MAX31855 1
+#endif
+#if MAX6675_0_IS_MAX31865 || MAX6675_1_IS_MAX31865
+  #define MAX6675_HAS_MAX31865 1
+#endif
+#if MAX6675_0_IS_MAX6675 || MAX6675_1_IS_MAX6675
+  #define MAX6675_HAS_MAX6675 1
+#endif
+
 #if TEMP_SENSOR_2 == -4
   #define HEATER_2_USES_AD8495 1
 #elif TEMP_SENSOR_2 == -3

Marlin/src/inc/SanityCheck.h

@@ -1700,21 +1700,21 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
 /**
  * Pins and Sensor IDs must be set for each heater
  */
-#if HEATER_0_USES_MAX6675 && !PIN_EXISTS(MAX6675_SS)
-  #error "MAX6675_SS_PIN (required for TEMP_SENSOR_0) not defined for this board."
+#if HEATER_0_USES_MAX6675 && !ANY_PIN(MAX6675_SS, MAX31855_CS, MAX31865_CS, MAX6675_CS)
+  #error "TEMP_SENSOR_0 requires a MAX6675_SS2_PIN, MAX6675_CS2_PIN, MAX31855_CS2_PIN, or MAX31865_CS2_PIN."
 #elif HAS_HOTEND && !HAS_TEMP_HOTEND && !HEATER_0_DUMMY_THERMISTOR
   #error "TEMP_0_PIN (required for TEMP_SENSOR_0) not defined for this board."
 #elif EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL) && !HAS_HEATER_1
   #error "HEATER_1_PIN is not defined. TEMP_SENSOR_1 might not be set, or the board (not EEB / EEF?) doesn't define a pin."
 #endif
 
 #if HAS_MULTI_HOTEND
-  #if HEATER_1_USES_MAX6675 && !PIN_EXISTS(MAX6675_SS2)
-    #error "MAX6675_SS2_PIN (required for TEMP_SENSOR_1) not defined for this board."
+  #if HEATER_1_USES_MAX6675 && !ANY_PIN(MAX6675_SS2, MAX31855_CS2, MAX31865_CS2, MAX6675_CS2)
+    #error "TEMP_SENSOR_1 requires a MAX6675_SS2_PIN, MAX6675_CS2_PIN, MAX31855_CS2_PIN, or MAX31865_CS2_PIN."
   #elif TEMP_SENSOR_1 == 0
     #error "TEMP_SENSOR_1 is required with 2 or more HOTENDS."
   #elif !ANY_PIN(TEMP_1, MAX6675_SS2) && !HEATER_1_DUMMY_THERMISTOR
-    #error "TEMP_1_PIN not defined for this board."
+    #error "TEMP_1_PIN or MAX6675_SS2_PIN not defined for this board."
   #elif ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
     #error "HOTENDS must be 1 with TEMP_SENSOR_1_AS_REDUNDANT."
   #endif
@@ -1884,7 +1884,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
 #if !HAS_HEATER_0 && EXTRUDERS
   #error "HEATER_0_PIN not defined for this board."
 #elif !ANY_PIN(TEMP_0, MAX6675_SS)
-  #error "TEMP_0_PIN not defined for this board."
+  #error "TEMP_0_PIN or MAX6675_SS not defined for this board."
 #elif ((defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && !PINS_EXIST(E0_STEP, E0_DIR))
   #error "E0_STEP_PIN or E0_DIR_PIN not defined for this board."
 #elif ( !(defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284P__)) && (!PINS_EXIST(E0_STEP, E0_DIR) || !HAS_E0_ENABLE))