|
@@ -649,10 +649,7 @@
|
649
|
649
|
#endif // EXTRUDERS > 2
|
650
|
650
|
#endif // EXTRUDERS > 1
|
651
|
651
|
|
652
|
|
-// Marlin needs to account for pins that equal -1
|
653
|
|
-#define marlinAnalogInputToDigitalPin(p) ((p) == -1 ? -1 : analogInputToDigitalPin(p))
|
654
|
|
-
|
655
|
|
-#define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_0_PIN),
|
|
652
|
+#define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_0_PIN),
|
656
|
653
|
#define _H1_PINS
|
657
|
654
|
#define _H2_PINS
|
658
|
655
|
#define _H3_PINS
|
|
@@ -660,16 +657,16 @@
|
660
|
657
|
|
661
|
658
|
#if HOTENDS > 1
|
662
|
659
|
#undef _H1_PINS
|
663
|
|
- #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_1_PIN),
|
|
660
|
+ #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_1_PIN),
|
664
|
661
|
#if HOTENDS > 2
|
665
|
662
|
#undef _H2_PINS
|
666
|
|
- #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_2_PIN),
|
|
663
|
+ #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_2_PIN),
|
667
|
664
|
#if HOTENDS > 3
|
668
|
665
|
#undef _H3_PINS
|
669
|
|
- #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_3_PIN),
|
|
666
|
+ #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_3_PIN),
|
670
|
667
|
#if HOTENDS > 4
|
671
|
668
|
#undef _H4_PINS
|
672
|
|
- #define _H4_PINS HEATER_4_PIN, marlinAnalogInputToDigitalPin(TEMP_4_PIN),
|
|
669
|
+ #define _H4_PINS HEATER_4_PIN, analogInputToDigitalPin(TEMP_4_PIN),
|
673
|
670
|
#endif // HOTENDS > 4
|
674
|
671
|
#endif // HOTENDS > 3
|
675
|
672
|
#endif // HOTENDS > 2
|
|
@@ -690,7 +687,7 @@
|
690
|
687
|
#endif // MIXING_STEPPERS > 2
|
691
|
688
|
#endif // MIXING_STEPPERS > 1
|
692
|
689
|
|
693
|
|
-#define BED_PINS HEATER_BED_PIN, marlinAnalogInputToDigitalPin(TEMP_BED_PIN),
|
|
690
|
+#define BED_PINS HEATER_BED_PIN, analogInputToDigitalPin(TEMP_BED_PIN),
|
694
|
691
|
|
695
|
692
|
//
|
696
|
693
|
// Assign endstop pins for boards with only 3 connectors
|