Browse Source

Merge pull request #3654 from thinkyhead/rc_cleanup_pins

Pins cleanups
Scott Lahteine 9 years ago
parent
commit
196af30467
4 changed files with 14 additions and 7 deletions
  1. 2
    0
      Marlin/macros.h
  2. 2
    1
      Marlin/pins.h
  3. 8
    4
      Marlin/pins_AZTEEG_X3_PRO.h
  4. 2
    2
      Marlin/ultralcd.h

+ 2
- 0
Marlin/macros.h View File

60
 #define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
60
 #define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
61
 #define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
61
 #define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
62
 
62
 
63
+#define NOOP do{}while(0)
64
+
63
 #endif //__MACROS_H
65
 #endif //__MACROS_H

+ 2
- 1
Marlin/pins.h View File

270
     X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, \
270
     X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, \
271
     Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, \
271
     Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, \
272
     Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_MIN_PROBE_PIN, \
272
     Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_MIN_PROBE_PIN, \
273
-    PS_ON_PIN, HEATER_BED_PIN, FAN_PIN, \
273
+    PS_ON_PIN, HEATER_BED_PIN, FAN_PIN, CONTROLLERFAN_PIN, \
274
+    EXTRUDER_0_AUTO_FAN_PIN, EXTRUDER_1_AUTO_FAN_PIN, EXTRUDER_2_AUTO_FAN_PIN, EXTRUDER_3_AUTO_FAN_PIN, \
274
     _E0_PINS _E1_PINS _E2_PINS _E3_PINS \
275
     _E0_PINS _E1_PINS _E2_PINS _E3_PINS \
275
     analogInputToDigitalPin(TEMP_BED_PIN) \
276
     analogInputToDigitalPin(TEMP_BED_PIN) \
276
   }
277
   }

+ 8
- 4
Marlin/pins_AZTEEG_X3_PRO.h View File

28
 
28
 
29
 #undef FAN_PIN
29
 #undef FAN_PIN
30
 #define FAN_PIN             6 //Part Cooling System
30
 #define FAN_PIN             6 //Part Cooling System
31
+
32
+#undef BEEPER_PIN
31
 #define BEEPER_PIN         33
33
 #define BEEPER_PIN         33
32
 #define CONTROLLERFAN_PIN   4 //Pin used for the fan to cool motherboard (-1 to disable)
34
 #define CONTROLLERFAN_PIN   4 //Pin used for the fan to cool motherboard (-1 to disable)
33
 //Fans/Water Pump to cool the hotend cool side.
35
 //Fans/Water Pump to cool the hotend cool side.
55
   #define Z_MIN_PIN        19
57
   #define Z_MIN_PIN        19
56
   #define Z_MAX_PIN        18
58
   #define Z_MAX_PIN        18
57
 #endif
59
 #endif
58
-//
60
+
61
+
59
 #if ENABLED(Z_MIN_PROBE_ENDSTOP)
62
 #if ENABLED(Z_MIN_PROBE_ENDSTOP)
60
   //#undef Z_MIN_PIN
63
   //#undef Z_MIN_PIN
61
   //#define Z_MIN_PIN        15
64
   //#define Z_MIN_PIN        15
95
 #define TC2                 5   // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
98
 #define TC2                 5   // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
96
 
99
 
97
 //
100
 //
98
-//These Servo pins are for when they are defined. Tested for usage with bed leveling
99
-//on a Delta with 1 servo. Running through the Z servo endstop in code.
100
-//Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
101
+// These Servo pins are for when they are defined. Tested for usage with bed leveling
102
+// on a Delta with 1 servo. Running through the Z servo endstop in code.
103
+// Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
101
 //
104
 //
105
+#undef SERVO0_PIN
102
 #define SERVO0_PIN         47
106
 #define SERVO0_PIN         47
103
 
107
 
104
 //LCD Pins//
108
 //LCD Pins//

+ 2
- 2
Marlin/ultralcd.h View File

156
   FORCE_INLINE void lcd_reset_alert_level() {}
156
   FORCE_INLINE void lcd_reset_alert_level() {}
157
   FORCE_INLINE bool lcd_detected(void) { return true; }
157
   FORCE_INLINE bool lcd_detected(void) { return true; }
158
 
158
 
159
-  #define LCD_MESSAGEPGM(x) do{}while(0)
160
-  #define LCD_ALERTMESSAGEPGM(x) do{}while(0)
159
+  #define LCD_MESSAGEPGM(x) NOOP
160
+  #define LCD_ALERTMESSAGEPGM(x) NOOP
161
 
161
 
162
 #endif //ULTRA_LCD
162
 #endif //ULTRA_LCD
163
 
163
 

Loading…
Cancel
Save