Browse Source

Revert marlinAnalogInputToDigitalPin

Scott Lahteine 6 years ago
parent
commit
374ea49be9
1 changed files with 6 additions and 9 deletions
  1. 6
    9
      Marlin/src/pins/pins.h

+ 6
- 9
Marlin/src/pins/pins.h View File

649
   #endif // EXTRUDERS > 2
649
   #endif // EXTRUDERS > 2
650
 #endif // EXTRUDERS > 1
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
 #define _H1_PINS
653
 #define _H1_PINS
657
 #define _H2_PINS
654
 #define _H2_PINS
658
 #define _H3_PINS
655
 #define _H3_PINS
660
 
657
 
661
 #if HOTENDS > 1
658
 #if HOTENDS > 1
662
   #undef _H1_PINS
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
   #if HOTENDS > 2
661
   #if HOTENDS > 2
665
     #undef _H2_PINS
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
     #if HOTENDS > 3
664
     #if HOTENDS > 3
668
       #undef _H3_PINS
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
       #if HOTENDS > 4
667
       #if HOTENDS > 4
671
         #undef _H4_PINS
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
       #endif // HOTENDS > 4
670
       #endif // HOTENDS > 4
674
     #endif // HOTENDS > 3
671
     #endif // HOTENDS > 3
675
   #endif // HOTENDS > 2
672
   #endif // HOTENDS > 2
690
   #endif // MIXING_STEPPERS > 2
687
   #endif // MIXING_STEPPERS > 2
691
 #endif // MIXING_STEPPERS > 1
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
 // Assign endstop pins for boards with only 3 connectors
693
 // Assign endstop pins for boards with only 3 connectors

Loading…
Cancel
Save