Browse Source

More universal Formbot pins

Replace `ROXYs_TRex` with pre-defines of the relevant pins at the configuration level.
Scott Lahteine 5 years ago
parent
commit
69c333ead9

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

181
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
181
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
182
 //
182
 //
183
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
183
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
184
-  #define LCD_PINS_RS      16
185
-  #define LCD_PINS_ENABLE  17
186
-  #define LCD_PINS_D4      23
187
-  #define LCD_PINS_D5      25
188
-  #define LCD_PINS_D6      27
189
-  #define LCD_PINS_D7      29
190
   #define BEEPER_PIN       37
184
   #define BEEPER_PIN       37
191
   #define BTN_EN1          31
185
   #define BTN_EN1          31
192
   #define BTN_EN2          33
186
   #define BTN_EN2          33
193
   #define BTN_ENC          35
187
   #define BTN_ENC          35
194
   #define SD_DETECT_PIN    49
188
   #define SD_DETECT_PIN    49
195
   #define KILL_PIN         41
189
   #define KILL_PIN         41
190
+  #define LCD_PINS_RS      16
191
+  #define LCD_PINS_ENABLE  17
192
+  #define LCD_PINS_D4      23
193
+  #define LCD_PINS_D5      25
194
+  #define LCD_PINS_D6      27
195
+  #define LCD_PINS_D7      29
196
 #endif
196
 #endif

+ 13
- 10
Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h View File

155
 //
155
 //
156
 // Misc. Functions
156
 // Misc. Functions
157
 //
157
 //
158
-#define CASE_LIGHT_PIN      8
159
 #define SDSS               53
158
 #define SDSS               53
160
-#ifndef ROXYs_TRex
159
+#ifndef LED_PIN
161
   #define LED_PIN          13   // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
160
   #define LED_PIN          13   // The Formbot v 1 board has almost no unassigned pins on it.  The Board's LED
162
 #endif                          // is a good place to get a signal to control the Max7219 LED Matrix.
161
 #endif                          // is a good place to get a signal to control the Max7219 LED Matrix.
163
 
162
 
168
   #define PS_ON_PIN        12
167
   #define PS_ON_PIN        12
169
 #endif
168
 #endif
170
 
169
 
170
+#define CASE_LIGHT_PIN      8
171
+
171
 //
172
 //
172
 // LCD / Controller
173
 // LCD / Controller
173
 //
174
 //
174
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
175
 // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
175
 //
176
 //
176
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
177
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
177
-  #define LCD_PINS_RS      16
178
-  #define LCD_PINS_ENABLE  17
179
-  #define LCD_PINS_D4      23
180
-  #define LCD_PINS_D5      25
181
-  #define LCD_PINS_D6      27
182
-  #define LCD_PINS_D7      29
178
+  #ifndef BEEPER_PIN
179
+    #define BEEPER_PIN     37
180
+  #endif
183
   #define BTN_EN1          31
181
   #define BTN_EN1          31
184
   #define BTN_EN2          33
182
   #define BTN_EN2          33
185
   #define BTN_ENC          35
183
   #define BTN_ENC          35
186
   #define SD_DETECT_PIN    49
184
   #define SD_DETECT_PIN    49
187
-  #ifndef ROXYs_TRex
185
+  #ifndef KILL_PIN
188
     #define KILL_PIN       41
186
     #define KILL_PIN       41
189
-    #define BEEPER_PIN     37
190
   #endif
187
   #endif
188
+  #define LCD_PINS_RS      16
189
+  #define LCD_PINS_ENABLE  17
190
+  #define LCD_PINS_D4      23
191
+  #define LCD_PINS_D5      25
192
+  #define LCD_PINS_D6      27
193
+  #define LCD_PINS_D7      29
191
 #endif
194
 #endif

+ 4
- 2
Marlin/src/pins/pins_FORMBOT_TREX3.h View File

139
 //
139
 //
140
 #define CASE_LIGHT_PIN      5
140
 #define CASE_LIGHT_PIN      5
141
 #define SDSS               53
141
 #define SDSS               53
142
-#ifndef ROXYs_TRex
142
+#ifndef LED_PIN
143
   #define LED_PIN          13
143
   #define LED_PIN          13
144
 #endif
144
 #endif
145
 
145
 
165
   #define BTN_EN2          33
165
   #define BTN_EN2          33
166
   #define BTN_ENC          35
166
   #define BTN_ENC          35
167
   #define SD_DETECT_PIN    49
167
   #define SD_DETECT_PIN    49
168
-  #ifndef ROXYs_TRex
168
+  #ifndef KILL_PIN
169
     #define KILL_PIN       41
169
     #define KILL_PIN       41
170
+  #endif
171
+  #ifndef BEEPER_PIN
170
     #define BEEPER_PIN     37
172
     #define BEEPER_PIN     37
171
   #endif
173
   #endif
172
 #endif
174
 #endif

+ 1
- 1
Marlin/src/pins/pins_GEN7_13.h View File

24
  * Gen7 v1.3 pin assignments
24
  * Gen7 v1.3 pin assignments
25
  */
25
  */
26
 
26
 
27
- /**
27
+/**
28
  * Rev B    26 DEC 2016
28
  * Rev B    26 DEC 2016
29
  *
29
  *
30
  * added pointer to a current Arduino IDE extension
30
  * added pointer to a current Arduino IDE extension

+ 6
- 0
config/examples/Formbot/T_Rex_2+/Configuration.h View File

2159
 
2159
 
2160
 // Allow servo angle to be edited and saved to EEPROM
2160
 // Allow servo angle to be edited and saved to EEPROM
2161
 //#define EDITABLE_SERVO_ANGLES
2161
 //#define EDITABLE_SERVO_ANGLES
2162
+
2163
+#ifdef ROXYs_TRex
2164
+  #define LED_PIN     -1
2165
+  #define BEEPER_PIN  -1
2166
+  #define KILL_PIN    -1
2167
+#endif

+ 6
- 0
config/examples/Formbot/T_Rex_3/Configuration.h View File

2152
 
2152
 
2153
 // Allow servo angle to be edited and saved to EEPROM
2153
 // Allow servo angle to be edited and saved to EEPROM
2154
 //#define EDITABLE_SERVO_ANGLES
2154
 //#define EDITABLE_SERVO_ANGLES
2155
+
2156
+#ifdef ROXYs_TRex
2157
+  #define LED_PIN     -1
2158
+  #define BEEPER_PIN  -1
2159
+  #define KILL_PIN    -1
2160
+#endif

Loading…
Cancel
Save