More universal Formbot pins

Replace `ROXYs_TRex` with pre-defines of the relevant pins at the configuration level.
This commit is contained in:
Scott Lahteine 2019-04-18 21:09:21 -05:00
parent 0a6835fbea
commit 69c333ead9
6 changed files with 36 additions and 19 deletions

View file

@ -181,16 +181,16 @@
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
// //
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define KILL_PIN 41 #define KILL_PIN 41
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#endif #endif

View file

@ -155,9 +155,8 @@
// //
// Misc. Functions // Misc. Functions
// //
#define CASE_LIGHT_PIN 8
#define SDSS 53 #define SDSS 53
#ifndef ROXYs_TRex #ifndef LED_PIN
#define LED_PIN 13 // The Formbot v 1 board has almost no unassigned pins on it. The Board's LED #define LED_PIN 13 // The Formbot v 1 board has almost no unassigned pins on it. The Board's LED
#endif // is a good place to get a signal to control the Max7219 LED Matrix. #endif // is a good place to get a signal to control the Max7219 LED Matrix.
@ -168,24 +167,28 @@
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#endif #endif
#define CASE_LIGHT_PIN 8
// //
// LCD / Controller // LCD / Controller
// //
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER // Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
// //
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#ifndef BEEPER_PIN
#define BEEPER_PIN 37
#endif
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_ENC 35
#define SD_DETECT_PIN 49
#ifndef KILL_PIN
#define KILL_PIN 41
#endif
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23 #define LCD_PINS_D4 23
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_ENC 35
#define SD_DETECT_PIN 49
#ifndef ROXYs_TRex
#define KILL_PIN 41
#define BEEPER_PIN 37
#endif
#endif #endif

View file

@ -139,7 +139,7 @@
// //
#define CASE_LIGHT_PIN 5 #define CASE_LIGHT_PIN 5
#define SDSS 53 #define SDSS 53
#ifndef ROXYs_TRex #ifndef LED_PIN
#define LED_PIN 13 #define LED_PIN 13
#endif #endif
@ -165,8 +165,10 @@
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#ifndef ROXYs_TRex #ifndef KILL_PIN
#define KILL_PIN 41 #define KILL_PIN 41
#endif
#ifndef BEEPER_PIN
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#endif #endif
#endif #endif

View file

@ -24,7 +24,7 @@
* Gen7 v1.3 pin assignments * Gen7 v1.3 pin assignments
*/ */
/** /**
* Rev B 26 DEC 2016 * Rev B 26 DEC 2016
* *
* added pointer to a current Arduino IDE extension * added pointer to a current Arduino IDE extension

View file

@ -2159,3 +2159,9 @@
// Allow servo angle to be edited and saved to EEPROM // Allow servo angle to be edited and saved to EEPROM
//#define EDITABLE_SERVO_ANGLES //#define EDITABLE_SERVO_ANGLES
#ifdef ROXYs_TRex
#define LED_PIN -1
#define BEEPER_PIN -1
#define KILL_PIN -1
#endif

View file

@ -2152,3 +2152,9 @@
// Allow servo angle to be edited and saved to EEPROM // Allow servo angle to be edited and saved to EEPROM
//#define EDITABLE_SERVO_ANGLES //#define EDITABLE_SERVO_ANGLES
#ifdef ROXYs_TRex
#define LED_PIN -1
#define BEEPER_PIN -1
#define KILL_PIN -1
#endif