bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 ANY => EITHER

Browse Source
This commit is contained in:
Scott Lahteine
2022-07-13 21:22:53 -05:00
parent e840015cad
commit 9283859b1e
33 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View File

@ -582,7 +582,7 @@
#define LCD_SDSS SDSS
#define SD_DETECT_PIN 49
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
#define DOGLCD_CS 45
#define DOGLCD_A0 44

2
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View File

@ -238,7 +238,7 @@
#define LCD_SDSS P0_28 // EXP2.4
#define LCD_PINS_ENABLE P0_18 // EXP1.3
#define LCD_PINS_D4 P0_15 // EXP1.5
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define DOGLCD_SCK SD_SCK_PIN
#define DOGLCD_MOSI SD_MOSI_PIN
#endif

2
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View File

@ -351,7 +351,7 @@
//#define SHIFT_EN_PIN P1_22 // (41) J5-4 & AUX-4
#endif
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define DOGLCD_CS P0_16 // (16)
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#define DOGLCD_SCK SD_SCK_PIN

2
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
View File

@ -107,7 +107,7 @@
// Display
//
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN P1_31
#define DOGLCD_A0 P2_06
#define DOGLCD_CS P0_16

2
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View File

@ -154,7 +154,7 @@
//#define SHIFT_EN_PIN P1_22 // (41) J5-4 & AUX-4
#endif
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN P1_30 // (37) may change if cable changes
#define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
#define DOGLCD_SCK SD_SCK_PIN

2
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
View File

@ -91,7 +91,7 @@
//
// LCD / Controller
//
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN P1_31
#define DOGLCD_A0 P2_11

2
Marlin/src/pins/rambo/pins_RAMBO.h
View File

@ -208,7 +208,7 @@
#define LCD_PINS_D6 74
#define LCD_PINS_D7 75
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN 44
// NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
// beeper/buzzer is connected to pin 33; however, the pin used in the

2
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
View File

@ -143,7 +143,7 @@
#define HOME_PIN BTN_HOME
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN 44
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 70

2
Marlin/src/pins/ramps/pins_AZTEEG_X3.h
View File

@ -51,7 +51,7 @@
#undef STAT_LED_RED_PIN
#undef STAT_LED_BLUE_PIN
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#undef DOGLCD_A0
#undef DOGLCD_CS

4
Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
View File

@ -142,7 +142,7 @@
#undef BEEPER_PIN
#define BEEPER_PIN 33
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 49 // For easy adapter board
#undef BEEPER_PIN
@ -169,7 +169,7 @@
#undef SPINDLE_DIR_PIN
#if HAS_CUTTER // EXP2 header
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BTN_EN2 31 // Pin 7 needed for Spindle PWM
#endif
#define SPINDLE_LASER_PWM_PIN 7 // Hardware PWM

2
Marlin/src/pins/ramps/pins_MKS_GEN_13.h
View File

@ -60,7 +60,7 @@
//
// LCD / Controller
//
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
/**
* VIKI2 Has two groups of wires with...
*

2
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -728,7 +728,7 @@
#define LCD_SDSS SDSS
#define SD_DETECT_PIN EXP2_04_PIN
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
#define DOGLCD_CS AUX4_05_PIN
#define DOGLCD_A0 AUX2_07_PIN

2
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View File

@ -128,7 +128,7 @@
// LCD Display input pins
#if IS_NEWPANEL
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#undef DOGLCD_A0
#define DOGLCD_A0 23
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)

2
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View File

@ -163,7 +163,7 @@
//
// LCD / Controller
//
#if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
#if EITHER(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
#define LCD_PINS_RS 24
#define LCD_PINS_ENABLE 22

2
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
View File

@ -217,7 +217,7 @@
#endif
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define DOGLCD_A0 EXP1_04_PIN
#define KILL_PIN 51
#define STAT_LED_BLUE_PIN EXP1_08_PIN

2
Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
View File

@ -373,7 +373,7 @@
//#define LCD_SDSS SDSS
//#define SD_DETECT_PIN EXP2_01_PIN
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
// TO TEST
//#define DOGLCD_CS 45

2
Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
View File

@ -424,7 +424,7 @@
//#define LCD_SDSS SDSS
//#define SD_DETECT_PIN EXP2_01_PIN
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
// TO TEST
//#define DOGLCD_CS 45

2
Marlin/src/pins/samd/pins_RAMPS_144.h
View File

@ -408,7 +408,7 @@
//#define LCD_SDSS SDSS
//#define SD_DETECT_PIN 49
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
// TO TEST
//#define DOGLCD_CS 45

2
Marlin/src/pins/stm32f1/pins_BEAST.h
View File

@ -131,7 +131,7 @@
#error "LCD_I2C_PANELOLU2 is not supported."
#elif ENABLED(LCD_I2C_VIKI)
#error "LCD_I2C_VIKI is not supported."
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
#error "VIKI2 / miniVIKI is not supported."
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."

2
Marlin/src/pins/stm32f1/pins_CHITU3D.h
View File

@ -171,7 +171,7 @@
#define LCD_SDSS PD5 // 53
#define SD_DETECT_PIN PD1 // 49
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN PC1 // 33

2
Marlin/src/pins/stm32f1/pins_STM32F1R.h
View File

@ -120,7 +120,7 @@
#error "LCD_I2C_PANELOLU2 is not supported."
#elif ENABLED(LCD_I2C_VIKI)
#error "LCD_I2C_VIKI is not supported."
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
#error "VIKI2 / miniVIKI is not supported."
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."

2
Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
View File

@ -144,7 +144,7 @@
#error "LCD_I2C_PANELOLU2 is not supported."
#elif ENABLED(LCD_I2C_VIKI)
#error "LCD_I2C_VIKI is not supported."
#elif ANY(VIKI2, miniVIKI)
#elif EITHER(VIKI2, miniVIKI)
#error "VIKI2 / miniVIKI is not supported."
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."

2
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
View File

@ -261,7 +261,7 @@
#endif
#endif
#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
#if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
#define TFT_CS_PIN EXP1_04_PIN
#define TFT_SCK_PIN EXP2_09_PIN
#define TFT_MISO_PIN EXP2_10_PIN

2
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
View File

@ -130,7 +130,7 @@
#define LCD_PINS_D6 5 // D5 JP11-6
#define LCD_PINS_D7 4 // D4 JP11-5
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN 8 // E0 JP11-10
#define DOGLCD_A0 40 // F2 JP2-2

2
Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
View File

@ -207,7 +207,7 @@
#define LCD_PINS_D6 5 // D5 JP11-6
#define LCD_PINS_D7 4 // D4 JP11-5
#if ANY(VIKI2, miniVIKI)
#if EITHER(VIKI2, miniVIKI)
#define BEEPER_PIN 8 // E0 JP11-10
#define DOGLCD_A0 40 // F2 JP2-2