Browse Source

Always define temp sensor, heater pins for RUMBA

Scott Lahteine 8 years ago
parent
commit
8268c0a9a0
1 changed files with 21 additions and 28 deletions
  1. 21
    28
      Marlin/pins_RUMBA.h

+ 21
- 28
Marlin/pins_RUMBA.h View File

@@ -77,43 +77,36 @@
77 77
 #define PS_ON_PIN          45
78 78
 #define KILL_PIN           46
79 79
 
80
-#if TEMP_SENSOR_0 != 0
81
-  #define HEATER_0_PIN          2   // EXTRUDER 1
82
-  #if TEMP_SENSOR_0 == -1
83
-    #define TEMP_0_PIN          6   // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used
84
-  #else
85
-    #define TEMP_0_PIN         15   // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used
86
-  #endif
80
+#define HEATER_0_PIN        2   // EXTRUDER 1
81
+#define HEATER_1_PIN        3   // EXTRUDER 2
82
+#define HEATER_2_PIN        6   // EXTRUDER 3
83
+
84
+#if TEMP_SENSOR_0 == -1
85
+  #define TEMP_0_PIN        6   // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used
86
+#else
87
+  #define TEMP_0_PIN       15   // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used
87 88
 #endif
88 89
 
89
-#if TEMP_SENSOR_1 != 0
90
-  #define HEATER_1_PIN          3   // EXTRUDER 2
91
-  #if TEMP_SENSOR_1 == -1
92
-    #define TEMP_1_PIN          5   // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used
93
-  #else
94
-    #define TEMP_1_PIN         14   // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used
95
-  #endif
90
+#if TEMP_SENSOR_1 == -1
91
+  #define TEMP_1_PIN        5   // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used
92
+#else
93
+  #define TEMP_1_PIN       14   // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used
96 94
 #endif
97 95
 
98
-#if TEMP_SENSOR_2 != 0
99
-  #define HEATER_2_PIN         6    // EXTRUDER 3
100
-  #if TEMP_SENSOR_2 == -1
101
-    #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
102
-  #else
103
-    #define TEMP_2_PIN         13   // ANALOG NUMBERING - default connector for thermistor *T2* on rumba board is used
104
-  #endif
96
+#if TEMP_SENSOR_2 == -1
97
+  #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
98
+#else
99
+  #define TEMP_2_PIN       13   // ANALOG NUMBERING - default connector for thermistor *T2* on rumba board is used
105 100
 #endif
106 101
 
107 102
 //optional for extruder 4 or chamber: #define TEMP_X_PIN         12   // ANALOG NUMBERING - default connector for thermistor *T3* on rumba board is used
108 103
 //optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN       8    // EXTRUDER 4
109 104
 
110
-#if TEMP_SENSOR_BED != 0
111
-  #define HEATER_BED_PIN       9    // BED
112
-  #if TEMP_SENSOR_BED == -1
113
-    #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
114
-  #else
115
-    #define TEMP_BED_PIN      11    // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used
116
-  #endif
105
+#define HEATER_BED_PIN      9    // BED
106
+#if TEMP_SENSOR_BED == -1
107
+  #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
108
+#else
109
+  #define TEMP_BED_PIN     11    // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used
117 110
 #endif
118 111
 
119 112
 #define SDSS               53

Loading…
Cancel
Save