diff --git a/g2core/settings/settings_Printrbot_Play.h b/g2core/settings/settings_Printrbot_Play.h
index bcae1bf1..a1e2a9f4 100644
--- a/g2core/settings/settings_Printrbot_Play.h
+++ b/g2core/settings/settings_Printrbot_Play.h
@@ -323,69 +323,45 @@
 
 //** Temperature Sensors **
 
-#include "device/max31865/max31865.h"
-
-#define USING_A_MAX31865 1
-
 #define HAS_TEMPERATURE_SENSOR_1  true
 #if HAS_TEMPERATURE_SENSOR_1
-//    #define TEMPERATURE_SENSOR_1_CIRCUIT_TYPE ADCCircuitSimplePullup
-//    #define TEMPERATURE_SENSOR_1_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
-//    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<kADC1_PinNumber>
-//    #define TEMPERATURE_SENSOR_1_INIT { \
-//        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-//        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, &temperature_sensor_1_circuit \
-//    }
-
-    #define TEMPERATURE_SENSOR_1_CIRCUIT_TYPE ADCCircuitRawResistance
-    #define TEMPERATURE_SENSOR_1_CIRCUIT_INIT { /*pullup_resistance:*/ 430 }
-    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<MAX31865<SPIBus_used_t::SPIBusDevice>>
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<ADCPin<kADC1_PinNumber>>
     #define TEMPERATURE_SENSOR_1_INIT { \
         /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-        /*R1:*/  99500.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, &temperature_sensor_1_circuit \
-        /*MAX31865 config*/ spiBus, spiCSPinMux.getCS(5), 150000 \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_1_circuit \
     }
-
 #endif // HAS_TEMPERATURE_SENSOR_1
 
-#define EXTRUDER_1_OUTPUT_PIN kHeaterOutput1_PinNumber
-#define EXTRUDER_1_FAN_PIN    kOutput5_PinNumber
-
+#define EXTRUDER_1_OUTPUT_PIN kOutput1_PinNumber
+#define EXTRUDER_1_FAN_PIN    kOutput3_PinNumber
 
 #define HAS_TEMPERATURE_SENSOR_2  false
 #if HAS_TEMPERATURE_SENSOR_2
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<ADCDifferentialPair<kADC2_Neg_PinNumber, kADC2_Pos_PinNumber>>
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<ADCPin<kADC2_PinNumber>>
     #define TEMPERATURE_SENSOR_2_INIT { \
-    /*T1:*/     25.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/  99500.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 10500.0 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_2_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_2_TYPE  PT100<ADCDifferentialPair<kADC2_Neg_PinNumber, kADC2_Pos_PinNumber>>
-    #define TEMPERATURE_SENSOR_2_INIT {/*pullup_resistance:*/ 200, /*inline_resistance*/0.0}
-//    #define TEMPERATURE_SENSOR_2_TYPE  PT100<MAX31865<SPIBus_used_t::SPIBusDevice>>
-//    #define TEMPERATURE_SENSOR_2_INIT {/*pullup_resistance:*/ 430, /*inline_resistance*/0, spiBus, spiCSPinMux.getCS(5)}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_2
 
-#define EXTRUDER_2_OUTPUT_PIN kHeaterOutput2_PinNumber
-
+#define EXTRUDER_2_OUTPUT_PIN kOutput2_PinNumber
 
 #define HAS_TEMPERATURE_SENSOR_3  false
 #if HAS_TEMPERATURE_SENSOR_3
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<ADCDifferentialPair<kADC2_Neg_PinNumber, kADC2_Pos_PinNumber>>
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<ADCPin<kADC3_PinNumber>>
     #define TEMPERATURE_SENSOR_3_INIT { \
-    /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/  99500.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 10500.0 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_3_circuit \
     }
-#else
-    // #define TEMPERATURE_SENSOR_3_TYPE  PT100<ADCDifferentialPair<kADC3_Neg_PinNumber, kADC3_Pos_PinNumber>>
-    // #define TEMPERATURE_SENSOR_3_INIT {/*pullup_resistance:*/ 200, /*inline_resistance*/0.0}
-   #define TEMPERATURE_SENSOR_3_TYPE  PT100<MAX31865<SPIBus_used_t::SPIBusDevice>>
-   #define TEMPERATURE_SENSOR_3_INIT {/*pullup_resistance:*/ 430, /*inline_resistance*/0, spiBus, spiCSPinMux.getCS(6)}
-
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_3
 
 #define BED_OUTPUT_PIN kHeaterOutput11_PinNumber
diff --git a/g2core/settings/settings_Printrbot_Plus.h b/g2core/settings/settings_Printrbot_Plus.h
index af270793..1881b888 100644
--- a/g2core/settings/settings_Printrbot_Plus.h
+++ b/g2core/settings/settings_Printrbot_Plus.h
@@ -247,50 +247,43 @@
 
 #define HAS_TEMPERATURE_SENSOR_1  true
 #if HAS_TEMPERATURE_SENSOR_1
-// Must choose Thermistor or PT100
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<kADC1_PinNumber>
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<ADCPin<kADC1_PinNumber>>
     #define TEMPERATURE_SENSOR_1_INIT { \
         /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_1_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_1_TYPE  PT100<kADC1_PinNumber>
-    #define TEMPERATURE_SENSOR_1_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_1
 
 #define EXTRUDER_1_OUTPUT_PIN kOutput1_PinNumber
 #define EXTRUDER_1_FAN_PIN    kOutput3_PinNumber
 
-#define HAS_TEMPERATURE_SENSOR_2  true
+#define HAS_TEMPERATURE_SENSOR_2  false
 #if HAS_TEMPERATURE_SENSOR_2
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<kADC2_PinNumber>
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<ADCPin<kADC2_PinNumber>>
     #define TEMPERATURE_SENSOR_2_INIT { \
-    /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_2_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_2_TYPE  PT100<kADC2_PinNumber>
-    #define TEMPERATURE_SENSOR_2_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_2
 
 #define EXTRUDER_2_OUTPUT_PIN kOutput2_PinNumber
 
-#define HAS_TEMPERATURE_SENSOR_3  true
+#define HAS_TEMPERATURE_SENSOR_3  false
 #if HAS_TEMPERATURE_SENSOR_3
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<kADC3_PinNumber>
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<ADCPin<kADC3_PinNumber>>
     #define TEMPERATURE_SENSOR_3_INIT { \
-    /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_3_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_3_TYPE  PT100<kADC3_PinNumber>
-    #define TEMPERATURE_SENSOR_3_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_3
 
 #define BED_OUTPUT_PIN kOutput11_PinNumber
diff --git a/g2core/settings/settings_Printrbot_Simple_1403.h b/g2core/settings/settings_Printrbot_Simple_1403.h
index dc9ea2a9..053d79a2 100644
--- a/g2core/settings/settings_Printrbot_Simple_1403.h
+++ b/g2core/settings/settings_Printrbot_Simple_1403.h
@@ -243,50 +243,43 @@
 
 #define HAS_TEMPERATURE_SENSOR_1  true
 #if HAS_TEMPERATURE_SENSOR_1
-// Must choose Thermistor or PT100
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<kADC1_PinNumber>
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<ADCPin<kADC1_PinNumber>>
     #define TEMPERATURE_SENSOR_1_INIT { \
         /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_1_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_1_TYPE  PT100<kADC1_PinNumber>
-    #define TEMPERATURE_SENSOR_1_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_1
 
 #define EXTRUDER_1_OUTPUT_PIN kOutput1_PinNumber
 #define EXTRUDER_1_FAN_PIN    kOutput3_PinNumber
 
-#define HAS_TEMPERATURE_SENSOR_2  true
+#define HAS_TEMPERATURE_SENSOR_2  false
 #if HAS_TEMPERATURE_SENSOR_2
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<kADC2_PinNumber>
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<ADCPin<kADC2_PinNumber>>
     #define TEMPERATURE_SENSOR_2_INIT { \
-    /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_2_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_2_TYPE  PT100<kADC2_PinNumber>
-    #define TEMPERATURE_SENSOR_2_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_2
 
 #define EXTRUDER_2_OUTPUT_PIN kOutput2_PinNumber
 
-#define HAS_TEMPERATURE_SENSOR_3  true
+#define HAS_TEMPERATURE_SENSOR_3  false
 #if HAS_TEMPERATURE_SENSOR_3
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<kADC3_PinNumber>
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<ADCPin<kADC3_PinNumber>>
     #define TEMPERATURE_SENSOR_3_INIT { \
-    /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_3_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_3_TYPE  PT100<kADC3_PinNumber>
-    #define TEMPERATURE_SENSOR_3_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_3
 
 #define BED_OUTPUT_PIN kOutput11_PinNumber
diff --git a/g2core/settings/settings_Printrbot_Simple_1608.h b/g2core/settings/settings_Printrbot_Simple_1608.h
index aec6782f..8bfd6b68 100644
--- a/g2core/settings/settings_Printrbot_Simple_1608.h
+++ b/g2core/settings/settings_Printrbot_Simple_1608.h
@@ -257,17 +257,14 @@
 
 #define HAS_TEMPERATURE_SENSOR_1  true
 #if HAS_TEMPERATURE_SENSOR_1
-// Must choose Thermistor or PT100
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<kADC1_PinNumber>
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_1_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_1_TYPE  Thermistor<ADCPin<kADC1_PinNumber>>
     #define TEMPERATURE_SENSOR_1_INIT { \
         /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_1_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_1_TYPE  PT100<kADC1_PinNumber>
-    #define TEMPERATURE_SENSOR_1_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_1
 
 #define EXTRUDER_1_OUTPUT_PIN kOutput1_PinNumber
@@ -275,32 +272,28 @@
 
 #define HAS_TEMPERATURE_SENSOR_2  false
 #if HAS_TEMPERATURE_SENSOR_2
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<kADC2_PinNumber>
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_2_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_2_TYPE  Thermistor<ADCPin<kADC2_PinNumber>>
     #define TEMPERATURE_SENSOR_2_INIT { \
-    /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_2_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_2_TYPE  PT100<kADC2_PinNumber>
-    #define TEMPERATURE_SENSOR_2_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_2
 
 #define EXTRUDER_2_OUTPUT_PIN kOutput2_PinNumber
 
-#define HAS_TEMPERATURE_SENSOR_3  true
+#define HAS_TEMPERATURE_SENSOR_3  false
 #if HAS_TEMPERATURE_SENSOR_3
-#if 1 // 1 if a Thermistor, 0 if a PT100
-    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<kADC3_PinNumber>
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_TYPE ADCCircuitSimplePullup
+    #define TEMPERATURE_SENSOR_3_CIRCUIT_INIT { /*pullup_resistance:*/ 4700 }
+    #define TEMPERATURE_SENSOR_3_TYPE  Thermistor<ADCPin<kADC3_PinNumber>>
     #define TEMPERATURE_SENSOR_3_INIT { \
-    /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
-    /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, /*pullup_resistance:*/ 4700 \
+        /*T1:*/     20.0, /*T2:*/   190.0,  /*T3:*/ 255.0, \
+        /*R1:*/ 144700.0, /*R2:*/  5190.0, /*R3:*/ 4809.0, \
+        &temperature_sensor_3_circuit \
     }
-#else
-    #define TEMPERATURE_SENSOR_3_TYPE  PT100<kADC3_PinNumber>
-    #define TEMPERATURE_SENSOR_3_INIT {/*pullup_resistance:*/ 2325, /*inline_resistance*/0.75}
-#endif // 0 or 1
 #endif // HAS_TEMPERATURE_SENSOR_3
 
 #define BED_OUTPUT_PIN kOutput11_PinNumber