Overridable Options - Part 4 (PR#2556)

Apply `ENABLED` / `DISABLED` / `HAS_SERVOS` macros to pins files.
This commit is contained in:
Scott Lahteine
2015-07-30 22:11:19 -07:00
committed by Richard Wackerbarth
parent 4b40964064
commit c0d7ea3e7e
21 changed files with 99 additions and 95 deletions

View File

@ -61,23 +61,23 @@
#define SDSS 53
#define LED_PIN 13
#if MB(RAMPS_13_EEB) && defined(FILAMENT_SENSOR) // FMM added for Filament Extruder
#if MB(RAMPS_13_EEB) && ENABLED(FILAMENT_SENSOR) // FMM added for Filament Extruder
// define analog pin for the filament width sensor input
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5
#endif
#ifdef Z_PROBE_ENDSTOP
#if ENABLED(Z_PROBE_ENDSTOP)
// Define a pin to use as the signal pin on Arduino for the Z_PROBE endstop.
#define Z_PROBE_PIN 32
#endif
#ifdef FILAMENT_RUNOUT_SENSOR
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
#define FILRUNOUT_PIN 4
#endif
#if MB(RAMPS_13_EFF) || defined(IS_RAMPS_EFB)
#if MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
#define FAN_PIN 9 // (Sprinter config)
#if MB(RAMPS_13_EFF)
#define CONTROLLERFAN_PIN -1 // Pin used for the fan to cool controller
@ -90,7 +90,7 @@
#define PS_ON_PIN 12
#if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL)
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
#define KILL_PIN 41
#else
#define KILL_PIN -1
@ -102,7 +102,7 @@
#define HEATER_0_PIN 10 // EXTRUDER 1
#endif
#if MB(RAMPS_13_SF) || defined(IS_RAMPS_EFB)
#if MB(RAMPS_13_SF) || ENABLED(IS_RAMPS_EFB)
#define HEATER_1_PIN -1
#else
#define HEATER_1_PIN 9 // EXTRUDER 2 (FAN On Sprinter)
@ -122,7 +122,7 @@
#define TEMP_BED_PIN 14 // ANALOG NUMBERING
#ifdef NUM_SERVOS
#if HAS_SERVOS
#define SERVO0_PIN 11
#if NUM_SERVOS > 1
#define SERVO1_PIN 6
@ -135,15 +135,14 @@
#endif
#endif
#ifdef Z_PROBE_SLED
#if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1
#endif
#ifdef ULTRA_LCD
#if ENABLED(ULTRA_LCD)
#ifdef NEWPANEL
#ifdef PANEL_ONE
#if ENABLED(NEWPANEL)
#if ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65
@ -159,7 +158,7 @@
#define LCD_PINS_D7 29
#endif
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER 37
#define BTN_EN1 31
@ -167,20 +166,20 @@
#define BTN_ENC 35
#define SDCARDDETECT 49
#elif defined(LCD_I2C_PANELOLU2)
#elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43
#define BTN_ENC 32
#define LCD_SDSS 53
#define SDCARDDETECT -1
#define KILL_PIN 41
#elif defined(LCD_I2C_VIKI)
#elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 // reverse if the encoder turns the wrong way.
#define BTN_EN2 7
#define BTN_ENC -1
#define LCD_SDSS 53
#define SDCARDDETECT 49
#elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37
#define BTN_ENC 31
@ -217,14 +216,14 @@
#define BEEPER 33 // Beeper on AUX-4
// buttons are directly attached using AUX-2
#ifdef REPRAPWORLD_KEYPAD
#if ENABLED(REPRAPWORLD_KEYPAD)
#define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register
#elif defined(PANEL_ONE)
#elif ENABLED(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7
@ -234,7 +233,7 @@
#define BTN_ENC 31 // the click
#endif
#ifdef G3D_PANEL
#if ENABLED(G3D_PANEL)
#define SDCARDDETECT 49
#else
#define SDCARDDETECT -1 // Ramps does not use this port
@ -264,13 +263,13 @@
#endif // ULTRA_LCD
// SPI for Max6675 Thermocouple
#ifndef SDSUPPORT
#if DISABLED(SDSUPPORT)
#define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
#ifndef SDSUPPORT
#if DISABLED(SDSUPPORT)
// these pins are defined in the SD library if building with SD support
#define SCK_PIN 52
#define MISO_PIN 50