Browse Source

Rename BEEPER to BEEPER_PIN

For consistency with other pins, allowing use of `PIN_EXISTS` macro.
Scott Lahteine 9 years ago
parent
commit
f03e063750
4 changed files with 44 additions and 44 deletions
  1. 10
    10
      Marlin/pins_GEN7_CUSTOM.h
  2. 14
    14
      Marlin/pins_OMCA_A.h
  3. 3
    3
      Marlin/pins_RAMPS_13.h
  4. 17
    17
      Marlin/pins_RUMBA.h

+ 10
- 10
Marlin/pins_GEN7_CUSTOM.h View File

13
 #define X_STEP_PIN      21                  // different from standard GEN7
13
 #define X_STEP_PIN      21                  // different from standard GEN7
14
 #define X_DIR_PIN       20                  // different from standard GEN7
14
 #define X_DIR_PIN       20                  // different from standard GEN7
15
 #define X_ENABLE_PIN    24
15
 #define X_ENABLE_PIN    24
16
-#define X_STOP_PIN      0
16
+#define X_STOP_PIN       0
17
 
17
 
18
 //y axis pins
18
 //y axis pins
19
 #define Y_STEP_PIN      23
19
 #define Y_STEP_PIN      23
20
 #define Y_DIR_PIN       22
20
 #define Y_DIR_PIN       22
21
 #define Y_ENABLE_PIN    24
21
 #define Y_ENABLE_PIN    24
22
-#define Y_STOP_PIN      1
22
+#define Y_STOP_PIN       1
23
 
23
 
24
 //z axis pins
24
 //z axis pins
25
 #define Z_STEP_PIN      26
25
 #define Z_STEP_PIN      26
26
 #define Z_DIR_PIN       25
26
 #define Z_DIR_PIN       25
27
 #define Z_ENABLE_PIN    24
27
 #define Z_ENABLE_PIN    24
28
-#define Z_STOP_PIN      2
28
+#define Z_STOP_PIN       2
29
 
29
 
30
 //extruder pins
30
 //extruder pins
31
 #define E0_STEP_PIN     28
31
 #define E0_STEP_PIN     28
32
 #define E0_DIR_PIN      27
32
 #define E0_DIR_PIN      27
33
 #define E0_ENABLE_PIN   24
33
 #define E0_ENABLE_PIN   24
34
 
34
 
35
-#define TEMP_0_PIN      2
35
+#define TEMP_0_PIN       2
36
 #define TEMP_1_PIN      -1
36
 #define TEMP_1_PIN      -1
37
 #define TEMP_2_PIN      -1
37
 #define TEMP_2_PIN      -1
38
-#define TEMP_BED_PIN    1   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
38
+#define TEMP_BED_PIN     1   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
39
 
39
 
40
-#define HEATER_0_PIN    4
40
+#define HEATER_0_PIN     4
41
 #define HEATER_1_PIN    -1
41
 #define HEATER_1_PIN    -1
42
 #define HEATER_2_PIN    -1
42
 #define HEATER_2_PIN    -1
43
-#define HEATER_BED_PIN  3  // (bed)
43
+#define HEATER_BED_PIN   3  // (bed)
44
 
44
 
45
 #define SDPOWER         -1
45
 #define SDPOWER         -1
46
 #define SDSS            31                  // SCL pin of I2C header || CS Pin for SD Card support
46
 #define SDSS            31                  // SCL pin of I2C header || CS Pin for SD Card support
56
 //#define TX_ENABLE_PIN       12
56
 //#define TX_ENABLE_PIN       12
57
 //#define RX_ENABLE_PIN       13
57
 //#define RX_ENABLE_PIN       13
58
 
58
 
59
-#define BEEPER_PIN -1
60
-#define SD_DETECT_PIN -1
61
-#define SUICIDE_PIN -1    //has to be defined; otherwise Power_off doesn't work
59
+#define BEEPER_PIN       -1
60
+#define SD_DETECT_PIN    -1
61
+#define SUICIDE_PIN      -1    //has to be defined; otherwise Power_off doesn't work
62
 
62
 
63
 #define KILL_PIN -1
63
 #define KILL_PIN -1
64
 //Pins for 4bit LCD Support
64
 //Pins for 4bit LCD Support

+ 14
- 14
Marlin/pins_OMCA_A.h View File

35
 #define X_STEP_PIN         21
35
 #define X_STEP_PIN         21
36
 #define X_DIR_PIN          20
36
 #define X_DIR_PIN          20
37
 #define X_ENABLE_PIN       24
37
 #define X_ENABLE_PIN       24
38
-#define X_STOP_PIN         0
38
+#define X_STOP_PIN          0
39
 
39
 
40
 #define Y_STEP_PIN         23
40
 #define Y_STEP_PIN         23
41
 #define Y_DIR_PIN          22
41
 #define Y_DIR_PIN          22
42
 #define Y_ENABLE_PIN       24
42
 #define Y_ENABLE_PIN       24
43
-#define Y_STOP_PIN         1
43
+#define Y_STOP_PIN          1
44
 
44
 
45
 #define Z_STEP_PIN         26
45
 #define Z_STEP_PIN         26
46
 #define Z_DIR_PIN          25
46
 #define Z_DIR_PIN          25
47
 #define Z_ENABLE_PIN       24
47
 #define Z_ENABLE_PIN       24
48
-#define Z_STOP_PIN         2
48
+#define Z_STOP_PIN          2
49
 
49
 
50
-#define E0_STEP_PIN         28
51
-#define E0_DIR_PIN          27
52
-#define E0_ENABLE_PIN       24
50
+#define E0_STEP_PIN        28
51
+#define E0_DIR_PIN         27
52
+#define E0_ENABLE_PIN      24
53
 
53
 
54
-#define E1_STEP_PIN         -1 // 19
55
-#define E1_DIR_PIN          -1 // 18
56
-#define E1_ENABLE_PIN       24
54
+#define E1_STEP_PIN        -1 // 19
55
+#define E1_DIR_PIN         -1 // 18
56
+#define E1_ENABLE_PIN      24
57
 
57
 
58
-#define E2_STEP_PIN         -1 // 17
59
-#define E2_DIR_PIN          -1 // 16
60
-#define E2_ENABLE_PIN       24
58
+#define E2_STEP_PIN        -1 // 17
59
+#define E2_DIR_PIN         -1 // 16
60
+#define E2_ENABLE_PIN      24
61
 
61
 
62
 #define SDPOWER            -1
62
 #define SDPOWER            -1
63
 #define SDSS               11
63
 #define SDSS               11
64
 #define SD_DETECT_PIN      -1 // 10 optional also used as mode pin
64
 #define SD_DETECT_PIN      -1 // 10 optional also used as mode pin
65
 #define LED_PIN            -1
65
 #define LED_PIN            -1
66
-#define FAN_PIN            3
66
+#define FAN_PIN             3
67
 #define PS_ON_PIN          -1
67
 #define PS_ON_PIN          -1
68
 #define KILL_PIN           -1
68
 #define KILL_PIN           -1
69
 
69
 
70
-#define HEATER_0_PIN       4
70
+#define HEATER_0_PIN        4
71
 #define HEATER_1_PIN       -1 // 12
71
 #define HEATER_1_PIN       -1 // 12
72
 #define HEATER_2_PIN       -1 // 13
72
 #define HEATER_2_PIN       -1 // 13
73
 #define TEMP_0_PIN          0 //D27   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
73
 #define TEMP_0_PIN          0 //D27   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!

+ 3
- 3
Marlin/pins_RAMPS_13.h View File

117
 #if MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
117
 #if MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF)
118
   #define HEATER_BED_PIN     -1    // NO BED
118
   #define HEATER_BED_PIN     -1    // NO BED
119
 #else
119
 #else
120
-  #define HEATER_BED_PIN     8    // BED
120
+  #define HEATER_BED_PIN      8    // BED
121
 #endif
121
 #endif
122
 
122
 
123
-#define TEMP_BED_PIN       14   // ANALOG NUMBERING
123
+#define TEMP_BED_PIN         14   // ANALOG NUMBERING
124
 
124
 
125
 #if HAS_SERVOS
125
 #if HAS_SERVOS
126
   #define SERVO0_PIN         11
126
   #define SERVO0_PIN         11
136
 #endif
136
 #endif
137
 
137
 
138
 #if ENABLED(Z_PROBE_SLED)
138
 #if ENABLED(Z_PROBE_SLED)
139
-  #define SLED_PIN         -1
139
+  #define SLED_PIN           -1
140
 #endif
140
 #endif
141
 
141
 
142
 #if ENABLED(ULTRA_LCD)
142
 #if ENABLED(ULTRA_LCD)

+ 17
- 17
Marlin/pins_RUMBA.h View File

42
 
42
 
43
 #define LED_PIN            13
43
 #define LED_PIN            13
44
 
44
 
45
-#define FAN_PIN            7
46
-#define FAN1_PIN           8
45
+#define FAN_PIN             7
46
+#define FAN1_PIN            8
47
 
47
 
48
 #define PS_ON_PIN          45
48
 #define PS_ON_PIN          45
49
 #define KILL_PIN           46
49
 #define KILL_PIN           46
50
 
50
 
51
 #if (TEMP_SENSOR_0==0)
51
 #if (TEMP_SENSOR_0==0)
52
-  #define TEMP_0_PIN         -1
53
-  #define HEATER_0_PIN       -1
52
+  #define TEMP_0_PIN           -1
53
+  #define HEATER_0_PIN         -1
54
 #else
54
 #else
55
-  #define HEATER_0_PIN        2    // EXTRUDER 1
55
+  #define HEATER_0_PIN          2   // EXTRUDER 1
56
   #if (TEMP_SENSOR_0==-1)
56
   #if (TEMP_SENSOR_0==-1)
57
-    #define TEMP_0_PIN         6    // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used
57
+    #define TEMP_0_PIN          6   // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used
58
   #else
58
   #else
59
     #define TEMP_0_PIN         15   // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used
59
     #define TEMP_0_PIN         15   // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used
60
   #endif
60
   #endif
61
 #endif
61
 #endif
62
 
62
 
63
 #if (TEMP_SENSOR_1==0)
63
 #if (TEMP_SENSOR_1==0)
64
-  #define TEMP_1_PIN         -1
65
-  #define HEATER_1_PIN       -1
64
+  #define TEMP_1_PIN           -1
65
+  #define HEATER_1_PIN         -1
66
 #else
66
 #else
67
-  #define HEATER_1_PIN        3    // EXTRUDER 2
67
+  #define HEATER_1_PIN          3   // EXTRUDER 2
68
   #if (TEMP_SENSOR_1==-1)
68
   #if (TEMP_SENSOR_1==-1)
69
-    #define TEMP_1_PIN         5    // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used
69
+    #define TEMP_1_PIN          5   // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used
70
   #else
70
   #else
71
     #define TEMP_1_PIN         14   // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used
71
     #define TEMP_1_PIN         14   // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used
72
   #endif
72
   #endif
73
 #endif
73
 #endif
74
 
74
 
75
 #if (TEMP_SENSOR_2==0)
75
 #if (TEMP_SENSOR_2==0)
76
-  #define TEMP_2_PIN         -1
77
-  #define HEATER_2_PIN       -1
76
+  #define TEMP_2_PIN          -1
77
+  #define HEATER_2_PIN        -1
78
 #else
78
 #else
79
-  #define HEATER_2_PIN        6    // EXTRUDER 3
79
+  #define HEATER_2_PIN         6    // EXTRUDER 3
80
   #if (TEMP_SENSOR_2==-1)
80
   #if (TEMP_SENSOR_2==-1)
81
     #define TEMP_2_PIN         7    // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple
81
     #define TEMP_2_PIN         7    // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple
82
   #else
82
   #else
88
 //optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN       8    // EXTRUDER 4
88
 //optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN       8    // EXTRUDER 4
89
 
89
 
90
 #if (TEMP_SENSOR_BED==0)
90
 #if (TEMP_SENSOR_BED==0)
91
-  #define TEMP_BED_PIN       -1
92
-  #define HEATER_BED_PIN     -1
91
+  #define TEMP_BED_PIN        -1
92
+  #define HEATER_BED_PIN      -1
93
 #else
93
 #else
94
-  #define HEATER_BED_PIN      9    // BED
94
+  #define HEATER_BED_PIN       9    // BED
95
   #if (TEMP_SENSOR_BED==-1)
95
   #if (TEMP_SENSOR_BED==-1)
96
     #define TEMP_BED_PIN       7    // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple
96
     #define TEMP_BED_PIN       7    // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple
97
   #else
97
   #else
98
-    #define TEMP_BED_PIN       11   // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used
98
+    #define TEMP_BED_PIN      11    // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used
99
   #endif
99
   #endif
100
 #endif
100
 #endif
101
 
101
 

Loading…
Cancel
Save