Browse Source

🎨 ANY => EITHER

Scott Lahteine 1 year ago
parent
commit
2dc543c4f5
33 changed files with 46 additions and 46 deletions
  1. 2
    2
      Marlin/src/inc/Conditionals_LCD.h
  2. 1
    1
      Marlin/src/inc/Conditionals_post.h
  3. 1
    1
      Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
  4. 1
    1
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
  5. 8
    8
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
  6. 1
    1
      Marlin/src/libs/nozzle.cpp
  7. 1
    1
      Marlin/src/module/probe.cpp
  8. 5
    5
      Marlin/src/module/temperature.cpp
  9. 1
    1
      Marlin/src/pins/linux/pins_RAMPS_LINUX.h
  10. 1
    1
      Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
  11. 1
    1
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  12. 1
    1
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
  13. 1
    1
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
  14. 1
    1
      Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
  15. 1
    1
      Marlin/src/pins/rambo/pins_RAMBO.h
  16. 1
    1
      Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
  17. 1
    1
      Marlin/src/pins/ramps/pins_AZTEEG_X3.h
  18. 2
    2
      Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
  19. 1
    1
      Marlin/src/pins/ramps/pins_MKS_GEN_13.h
  20. 1
    1
      Marlin/src/pins/ramps/pins_RAMPS.h
  21. 1
    1
      Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
  22. 1
    1
      Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
  23. 1
    1
      Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
  24. 1
    1
      Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
  25. 1
    1
      Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
  26. 1
    1
      Marlin/src/pins/samd/pins_RAMPS_144.h
  27. 1
    1
      Marlin/src/pins/stm32f1/pins_BEAST.h
  28. 1
    1
      Marlin/src/pins/stm32f1/pins_CHITU3D.h
  29. 1
    1
      Marlin/src/pins/stm32f1/pins_STM32F1R.h
  30. 1
    1
      Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
  31. 1
    1
      Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
  32. 1
    1
      Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
  33. 1
    1
      Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h

+ 2
- 2
Marlin/src/inc/Conditionals_LCD.h View File

464
   #define HAS_DGUS_LCD_CLASSIC 1
464
   #define HAS_DGUS_LCD_CLASSIC 1
465
 #endif
465
 #endif
466
 
466
 
467
-#if ANY(HAS_DGUS_LCD_CLASSIC, DGUS_LCD_UI_RELOADED)
467
+#if EITHER(HAS_DGUS_LCD_CLASSIC, DGUS_LCD_UI_RELOADED)
468
   #define HAS_DGUS_LCD 1
468
   #define HAS_DGUS_LCD 1
469
 #endif
469
 #endif
470
 
470
 
1431
   #define TFT_DEFAULT_ORIENTATION 0
1431
   #define TFT_DEFAULT_ORIENTATION 0
1432
   #define TFT_RES_480x272
1432
   #define TFT_RES_480x272
1433
   #define TFT_INTERFACE_FSMC
1433
   #define TFT_INTERFACE_FSMC
1434
-#elif ANY(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)                               // ILI9328 or R61505
1434
+#elif EITHER(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)                            // ILI9328 or R61505
1435
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
1435
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
1436
   #define TFT_RES_320x240
1436
   #define TFT_RES_320x240
1437
   #define TFT_INTERFACE_FSMC
1437
   #define TFT_INTERFACE_FSMC

+ 1
- 1
Marlin/src/inc/Conditionals_post.h View File

48
   // Set additional flags to let HALs choose in their Conditionals_post.h
48
   // Set additional flags to let HALs choose in their Conditionals_post.h
49
   #if ANY(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION, QSPI_EEPROM)
49
   #if ANY(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION, QSPI_EEPROM)
50
     #define USE_EMULATED_EEPROM 1
50
     #define USE_EMULATED_EEPROM 1
51
-  #elif ANY(I2C_EEPROM, SPI_EEPROM)
51
+  #elif EITHER(I2C_EEPROM, SPI_EEPROM)
52
     #define USE_WIRED_EEPROM    1
52
     #define USE_WIRED_EEPROM    1
53
   #elif ENABLED(IIC_BL24CXX_EEPROM)
53
   #elif ENABLED(IIC_BL24CXX_EEPROM)
54
     // nothing
54
     // nothing

+ 1
- 1
Marlin/src/lcd/e3v2/marlinui/ui_common.cpp View File

565
 
565
 
566
   #endif // AUTO_BED_LEVELING_UBL
566
   #endif // AUTO_BED_LEVELING_UBL
567
 
567
 
568
-  #if ANY(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
568
+  #if EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
569
 
569
 
570
     void MarlinUI::zoffset_overlay(const int8_t dir) {
570
     void MarlinUI::zoffset_overlay(const int8_t dir) {
571
       const int rot_up = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCCW, ICON_RotateCW),
571
       const int rot_up = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCCW, ICON_RotateCW),

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp View File

1208
       + ENABLED(TOUCH_UI_INVERTED) * 1
1208
       + ENABLED(TOUCH_UI_INVERTED) * 1
1209
     );
1209
     );
1210
     cmd.execute();
1210
     cmd.execute();
1211
-  #elif ANY(TOUCH_UI_PORTRAIT, TOUCH_UI_MIRRORED)
1211
+  #elif EITHER(TOUCH_UI_PORTRAIT, TOUCH_UI_MIRRORED)
1212
     #error "PORTRAIT or MIRRORED orientation not supported on the FT800."
1212
     #error "PORTRAIT or MIRRORED orientation not supported on the FT800."
1213
   #elif ENABLED(TOUCH_UI_INVERTED)
1213
   #elif ENABLED(TOUCH_UI_INVERTED)
1214
     mem_write_32(REG::ROTATE, 1);
1214
     mem_write_32(REG::ROTATE, 1);

+ 8
- 8
Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h View File

37
   #else
37
   #else
38
     // Use linear accent colors
38
     // Use linear accent colors
39
 
39
 
40
-    #if ANY(TOUCH_UI_ROYAL_THEME, TOUCH_UI_FROZEN_THEME)
41
-        // Dark blue accent colors
42
-        constexpr int      accent_hue       = 216;
43
-        constexpr float    accent_sat       = 0.7;
40
+    #if EITHER(TOUCH_UI_ROYAL_THEME, TOUCH_UI_FROZEN_THEME)
41
+      // Dark blue accent colors
42
+      constexpr int      accent_hue       = 216;
43
+      constexpr float    accent_sat       = 0.7;
44
     #else
44
     #else
45
-        // Green accent colors
46
-        constexpr int      accent_hue       = 68;
47
-        constexpr float    accent_sat       = 0.68;
45
+      // Green accent colors
46
+      constexpr int      accent_hue       = 68;
47
+      constexpr float    accent_sat       = 0.68;
48
     #endif
48
     #endif
49
 
49
 
50
     // Shades of accent color
50
     // Shades of accent color
88
 
88
 
89
     constexpr uint32_t bed_mesh_lines_rgb   = 0xFFFFFF;
89
     constexpr uint32_t bed_mesh_lines_rgb   = 0xFFFFFF;
90
     constexpr uint32_t bed_mesh_shadow_rgb  = 0x444444;
90
     constexpr uint32_t bed_mesh_shadow_rgb  = 0x444444;
91
-  #elif ANY(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME)
91
+  #elif EITHER(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME)
92
     constexpr uint32_t theme_darkest        = accent_color_1;
92
     constexpr uint32_t theme_darkest        = accent_color_1;
93
     constexpr uint32_t theme_dark           = accent_color_4;
93
     constexpr uint32_t theme_dark           = accent_color_4;
94
 
94
 

+ 1
- 1
Marlin/src/libs/nozzle.cpp View File

161
   void Nozzle::clean(const uint8_t &pattern, const uint8_t &strokes, const_float_t radius, const uint8_t &objects, const uint8_t cleans) {
161
   void Nozzle::clean(const uint8_t &pattern, const uint8_t &strokes, const_float_t radius, const uint8_t &objects, const uint8_t cleans) {
162
     xyz_pos_t start[HOTENDS] = NOZZLE_CLEAN_START_POINT, end[HOTENDS] = NOZZLE_CLEAN_END_POINT, middle[HOTENDS] = NOZZLE_CLEAN_CIRCLE_MIDDLE;
162
     xyz_pos_t start[HOTENDS] = NOZZLE_CLEAN_START_POINT, end[HOTENDS] = NOZZLE_CLEAN_END_POINT, middle[HOTENDS] = NOZZLE_CLEAN_CIRCLE_MIDDLE;
163
 
163
 
164
-    const uint8_t arrPos = ANY(SINGLENOZZLE, MIXING_EXTRUDER) ? 0 : active_extruder;
164
+    const uint8_t arrPos = EITHER(SINGLENOZZLE, MIXING_EXTRUDER) ? 0 : active_extruder;
165
 
165
 
166
     #if NOZZLE_CLEAN_MIN_TEMP > 20
166
     #if NOZZLE_CLEAN_MIN_TEMP > 20
167
       if (thermalManager.degTargetHotend(arrPos) < NOZZLE_CLEAN_MIN_TEMP) {
167
       if (thermalManager.degTargetHotend(arrPos) < NOZZLE_CLEAN_MIN_TEMP) {

+ 1
- 1
Marlin/src/module/probe.cpp View File

53
   float largest_sensorless_adj = 0;
53
   float largest_sensorless_adj = 0;
54
 #endif
54
 #endif
55
 
55
 
56
-#if ANY(HAS_QUIET_PROBING, USE_SENSORLESS)
56
+#if EITHER(HAS_QUIET_PROBING, USE_SENSORLESS)
57
   #include "stepper/indirection.h"
57
   #include "stepper/indirection.h"
58
   #if BOTH(HAS_QUIET_PROBING, PROBING_ESTEPPERS_OFF)
58
   #if BOTH(HAS_QUIET_PROBING, PROBING_ESTEPPERS_OFF)
59
     #include "stepper.h"
59
     #include "stepper.h"

+ 5
- 5
Marlin/src/module/temperature.cpp View File

904
         temp_hotend[active_extruder].target = 0.0f;
904
         temp_hotend[active_extruder].target = 0.0f;
905
         temp_hotend[active_extruder].soft_pwm_amount = 0;
905
         temp_hotend[active_extruder].soft_pwm_amount = 0;
906
         #if HAS_FAN
906
         #if HAS_FAN
907
-          set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
907
+          set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
908
           planner.sync_fan_speeds(fan_speed);
908
           planner.sync_fan_speeds(fan_speed);
909
         #endif
909
         #endif
910
 
910
 
922
     disable_all_heaters();
922
     disable_all_heaters();
923
     #if HAS_FAN
923
     #if HAS_FAN
924
       zero_fan_speeds();
924
       zero_fan_speeds();
925
-      set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
925
+      set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
926
       planner.sync_fan_speeds(fan_speed);
926
       planner.sync_fan_speeds(fan_speed);
927
     #endif
927
     #endif
928
     const xyz_pos_t tuningpos = MPC_TUNING_POS;
928
     const xyz_pos_t tuningpos = MPC_TUNING_POS;
949
     }
949
     }
950
 
950
 
951
     #if HAS_FAN
951
     #if HAS_FAN
952
-      set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
952
+      set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
953
       planner.sync_fan_speeds(fan_speed);
953
       planner.sync_fan_speeds(fan_speed);
954
     #endif
954
     #endif
955
 
955
 
1031
           total_energy_fan0 += constants.heater_power * hotend.soft_pwm_amount / 127 * MPC_dT + (last_temp - current_temp) * constants.block_heat_capacity;
1031
           total_energy_fan0 += constants.heater_power * hotend.soft_pwm_amount / 127 * MPC_dT + (last_temp - current_temp) * constants.block_heat_capacity;
1032
         #if HAS_FAN
1032
         #if HAS_FAN
1033
           else if (ELAPSED(ms, test_end_ms) && !fan0_done) {
1033
           else if (ELAPSED(ms, test_end_ms) && !fan0_done) {
1034
-            set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
1034
+            set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
1035
             planner.sync_fan_speeds(fan_speed);
1035
             planner.sync_fan_speeds(fan_speed);
1036
             settle_end_ms = ms + settle_time;
1036
             settle_end_ms = ms + settle_time;
1037
             test_end_ms = settle_end_ms + test_duration;
1037
             test_end_ms = settle_end_ms + test_duration;
1430
 
1430
 
1431
       float ambient_xfer_coeff = constants.ambient_xfer_coeff_fan0;
1431
       float ambient_xfer_coeff = constants.ambient_xfer_coeff_fan0;
1432
       #if ENABLED(MPC_INCLUDE_FAN)
1432
       #if ENABLED(MPC_INCLUDE_FAN)
1433
-        const uint8_t fan_index = ANY(MPC_FAN_0_ACTIVE_HOTEND, MPC_FAN_0_ALL_HOTENDS) ? 0 : ee;
1433
+        const uint8_t fan_index = EITHER(MPC_FAN_0_ACTIVE_HOTEND, MPC_FAN_0_ALL_HOTENDS) ? 0 : ee;
1434
         const float fan_fraction = TERN_(MPC_FAN_0_ACTIVE_HOTEND, !this_hotend ? 0.0f : ) fan_speed[fan_index] * RECIPROCAL(255);
1434
         const float fan_fraction = TERN_(MPC_FAN_0_ACTIVE_HOTEND, !this_hotend ? 0.0f : ) fan_speed[fan_index] * RECIPROCAL(255);
1435
         ambient_xfer_coeff += fan_fraction * constants.fan255_adjustment;
1435
         ambient_xfer_coeff += fan_fraction * constants.fan255_adjustment;
1436
       #endif
1436
       #endif

+ 1
- 1
Marlin/src/pins/linux/pins_RAMPS_LINUX.h View File

582
       #define LCD_SDSS                      SDSS
582
       #define LCD_SDSS                      SDSS
583
       #define SD_DETECT_PIN                   49
583
       #define SD_DETECT_PIN                   49
584
 
584
 
585
-    #elif ANY(VIKI2, miniVIKI)
585
+    #elif EITHER(VIKI2, miniVIKI)
586
 
586
 
587
       #define DOGLCD_CS                       45
587
       #define DOGLCD_CS                       45
588
       #define DOGLCD_A0                       44
588
       #define DOGLCD_A0                       44

+ 1
- 1
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h View File

238
   #define LCD_SDSS                         P0_28  // EXP2.4
238
   #define LCD_SDSS                         P0_28  // EXP2.4
239
   #define LCD_PINS_ENABLE                  P0_18  // EXP1.3
239
   #define LCD_PINS_ENABLE                  P0_18  // EXP1.3
240
   #define LCD_PINS_D4                      P0_15  // EXP1.5
240
   #define LCD_PINS_D4                      P0_15  // EXP1.5
241
-  #if ANY(VIKI2, miniVIKI)
241
+  #if EITHER(VIKI2, miniVIKI)
242
     #define DOGLCD_SCK                SD_SCK_PIN
242
     #define DOGLCD_SCK                SD_SCK_PIN
243
     #define DOGLCD_MOSI              SD_MOSI_PIN
243
     #define DOGLCD_MOSI              SD_MOSI_PIN
244
   #endif
244
   #endif

+ 1
- 1
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h View File

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

+ 1
- 1
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h View File

107
 // Display
107
 // Display
108
 //
108
 //
109
 
109
 
110
-#if ANY(VIKI2, miniVIKI)
110
+#if EITHER(VIKI2, miniVIKI)
111
   #define BEEPER_PIN                       P1_31
111
   #define BEEPER_PIN                       P1_31
112
   #define DOGLCD_A0                        P2_06
112
   #define DOGLCD_A0                        P2_06
113
   #define DOGLCD_CS                        P0_16
113
   #define DOGLCD_CS                        P0_16

+ 1
- 1
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h View File

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

+ 1
- 1
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h View File

91
 //
91
 //
92
 // LCD / Controller
92
 // LCD / Controller
93
 //
93
 //
94
-#if ANY(VIKI2, miniVIKI)
94
+#if EITHER(VIKI2, miniVIKI)
95
 
95
 
96
   #define BEEPER_PIN                       P1_31
96
   #define BEEPER_PIN                       P1_31
97
   #define DOGLCD_A0                        P2_11
97
   #define DOGLCD_A0                        P2_11

+ 1
- 1
Marlin/src/pins/rambo/pins_RAMBO.h View File

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

+ 1
- 1
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h View File

143
 
143
 
144
 #define HOME_PIN                        BTN_HOME
144
 #define HOME_PIN                        BTN_HOME
145
 
145
 
146
-#if ANY(VIKI2, miniVIKI)
146
+#if EITHER(VIKI2, miniVIKI)
147
   #define BEEPER_PIN                          44
147
   #define BEEPER_PIN                          44
148
   // Pins for DOGM SPI LCD Support
148
   // Pins for DOGM SPI LCD Support
149
   #define DOGLCD_A0                           70
149
   #define DOGLCD_A0                           70

+ 1
- 1
Marlin/src/pins/ramps/pins_AZTEEG_X3.h View File

51
 #undef STAT_LED_RED_PIN
51
 #undef STAT_LED_RED_PIN
52
 #undef STAT_LED_BLUE_PIN
52
 #undef STAT_LED_BLUE_PIN
53
 
53
 
54
-#if ANY(VIKI2, miniVIKI)
54
+#if EITHER(VIKI2, miniVIKI)
55
 
55
 
56
   #undef DOGLCD_A0
56
   #undef DOGLCD_A0
57
   #undef DOGLCD_CS
57
   #undef DOGLCD_CS

+ 2
- 2
Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h View File

142
 #undef BEEPER_PIN
142
 #undef BEEPER_PIN
143
 #define BEEPER_PIN                            33
143
 #define BEEPER_PIN                            33
144
 
144
 
145
-#if ANY(VIKI2, miniVIKI)
145
+#if EITHER(VIKI2, miniVIKI)
146
   #undef SD_DETECT_PIN
146
   #undef SD_DETECT_PIN
147
   #define SD_DETECT_PIN                       49  // For easy adapter board
147
   #define SD_DETECT_PIN                       49  // For easy adapter board
148
   #undef BEEPER_PIN
148
   #undef BEEPER_PIN
169
 #undef SPINDLE_DIR_PIN
169
 #undef SPINDLE_DIR_PIN
170
 
170
 
171
 #if HAS_CUTTER                                    // EXP2 header
171
 #if HAS_CUTTER                                    // EXP2 header
172
-  #if ANY(VIKI2, miniVIKI)
172
+  #if EITHER(VIKI2, miniVIKI)
173
     #define BTN_EN2                           31  // Pin 7 needed for Spindle PWM
173
     #define BTN_EN2                           31  // Pin 7 needed for Spindle PWM
174
   #endif
174
   #endif
175
   #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
175
   #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM

+ 1
- 1
Marlin/src/pins/ramps/pins_MKS_GEN_13.h View File

60
 //
60
 //
61
 // LCD / Controller
61
 // LCD / Controller
62
 //
62
 //
63
-#if ANY(VIKI2, miniVIKI)
63
+#if EITHER(VIKI2, miniVIKI)
64
   /**
64
   /**
65
    * VIKI2 Has two groups of wires with...
65
    * VIKI2 Has two groups of wires with...
66
    *
66
    *

+ 1
- 1
Marlin/src/pins/ramps/pins_RAMPS.h View File

728
       #define LCD_SDSS                      SDSS
728
       #define LCD_SDSS                      SDSS
729
       #define SD_DETECT_PIN          EXP2_04_PIN
729
       #define SD_DETECT_PIN          EXP2_04_PIN
730
 
730
 
731
-    #elif ANY(VIKI2, miniVIKI)
731
+    #elif EITHER(VIKI2, miniVIKI)
732
 
732
 
733
       #define DOGLCD_CS              AUX4_05_PIN
733
       #define DOGLCD_CS              AUX4_05_PIN
734
       #define DOGLCD_A0              AUX2_07_PIN
734
       #define DOGLCD_A0              AUX2_07_PIN

+ 1
- 1
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h View File

128
 
128
 
129
   // LCD Display input pins
129
   // LCD Display input pins
130
   #if IS_NEWPANEL
130
   #if IS_NEWPANEL
131
-    #if ANY(VIKI2, miniVIKI)
131
+    #if EITHER(VIKI2, miniVIKI)
132
       #undef DOGLCD_A0
132
       #undef DOGLCD_A0
133
       #define DOGLCD_A0                       23
133
       #define DOGLCD_A0                       23
134
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
134
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)

+ 1
- 1
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h View File

163
 //
163
 //
164
 // LCD / Controller
164
 // LCD / Controller
165
 //
165
 //
166
-#if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
166
+#if EITHER(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
167
 
167
 
168
   #define LCD_PINS_RS                         24
168
   #define LCD_PINS_RS                         24
169
   #define LCD_PINS_ENABLE                     22
169
   #define LCD_PINS_ENABLE                     22

+ 1
- 1
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h View File

217
 
217
 
218
   #endif
218
   #endif
219
 
219
 
220
-  #if ANY(VIKI2, miniVIKI)
220
+  #if EITHER(VIKI2, miniVIKI)
221
     #define DOGLCD_A0                EXP1_04_PIN
221
     #define DOGLCD_A0                EXP1_04_PIN
222
     #define KILL_PIN                          51
222
     #define KILL_PIN                          51
223
     #define STAT_LED_BLUE_PIN        EXP1_08_PIN
223
     #define STAT_LED_BLUE_PIN        EXP1_08_PIN

+ 1
- 1
Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h View File

373
       //#define LCD_SDSS                    SDSS
373
       //#define LCD_SDSS                    SDSS
374
       //#define SD_DETECT_PIN        EXP2_01_PIN
374
       //#define SD_DETECT_PIN        EXP2_01_PIN
375
 
375
 
376
-    #elif ANY(VIKI2, miniVIKI)
376
+    #elif EITHER(VIKI2, miniVIKI)
377
 
377
 
378
       // TO TEST
378
       // TO TEST
379
       //#define DOGLCD_CS                     45
379
       //#define DOGLCD_CS                     45

+ 1
- 1
Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h View File

424
       //#define LCD_SDSS                    SDSS
424
       //#define LCD_SDSS                    SDSS
425
       //#define SD_DETECT_PIN        EXP2_01_PIN
425
       //#define SD_DETECT_PIN        EXP2_01_PIN
426
 
426
 
427
-    #elif ANY(VIKI2, miniVIKI)
427
+    #elif EITHER(VIKI2, miniVIKI)
428
 
428
 
429
       // TO TEST
429
       // TO TEST
430
       //#define DOGLCD_CS                     45
430
       //#define DOGLCD_CS                     45

+ 1
- 1
Marlin/src/pins/samd/pins_RAMPS_144.h View File

408
       //#define LCD_SDSS                    SDSS
408
       //#define LCD_SDSS                    SDSS
409
       //#define SD_DETECT_PIN                 49
409
       //#define SD_DETECT_PIN                 49
410
 
410
 
411
-    #elif ANY(VIKI2, miniVIKI)
411
+    #elif EITHER(VIKI2, miniVIKI)
412
 
412
 
413
       // TO TEST
413
       // TO TEST
414
       //#define DOGLCD_CS                     45
414
       //#define DOGLCD_CS                     45

+ 1
- 1
Marlin/src/pins/stm32f1/pins_BEAST.h View File

131
       #error "LCD_I2C_PANELOLU2 is not supported."
131
       #error "LCD_I2C_PANELOLU2 is not supported."
132
     #elif ENABLED(LCD_I2C_VIKI)
132
     #elif ENABLED(LCD_I2C_VIKI)
133
       #error "LCD_I2C_VIKI is not supported."
133
       #error "LCD_I2C_VIKI is not supported."
134
-    #elif ANY(VIKI2, miniVIKI)
134
+    #elif EITHER(VIKI2, miniVIKI)
135
       #error "VIKI2 / miniVIKI is not supported."
135
       #error "VIKI2 / miniVIKI is not supported."
136
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
136
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
137
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
137
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CHITU3D.h View File

171
       #define LCD_SDSS                      PD5   // 53
171
       #define LCD_SDSS                      PD5   // 53
172
       #define SD_DETECT_PIN                 PD1   // 49
172
       #define SD_DETECT_PIN                 PD1   // 49
173
 
173
 
174
-    #elif ANY(VIKI2, miniVIKI)
174
+    #elif EITHER(VIKI2, miniVIKI)
175
 
175
 
176
       #define BEEPER_PIN                    PC1   // 33
176
       #define BEEPER_PIN                    PC1   // 33
177
 
177
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_STM32F1R.h View File

120
       #error "LCD_I2C_PANELOLU2 is not supported."
120
       #error "LCD_I2C_PANELOLU2 is not supported."
121
     #elif ENABLED(LCD_I2C_VIKI)
121
     #elif ENABLED(LCD_I2C_VIKI)
122
       #error "LCD_I2C_VIKI is not supported."
122
       #error "LCD_I2C_VIKI is not supported."
123
-    #elif ANY(VIKI2, miniVIKI)
123
+    #elif EITHER(VIKI2, miniVIKI)
124
       #error "VIKI2 / miniVIKI is not supported."
124
       #error "VIKI2 / miniVIKI is not supported."
125
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
125
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
126
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
126
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."

+ 1
- 1
Marlin/src/pins/stm32f1/pins_STM3R_MINI.h View File

144
       #error "LCD_I2C_PANELOLU2 is not supported."
144
       #error "LCD_I2C_PANELOLU2 is not supported."
145
     #elif ENABLED(LCD_I2C_VIKI)
145
     #elif ENABLED(LCD_I2C_VIKI)
146
       #error "LCD_I2C_VIKI is not supported."
146
       #error "LCD_I2C_VIKI is not supported."
147
-    #elif ANY(VIKI2, miniVIKI)
147
+    #elif EITHER(VIKI2, miniVIKI)
148
       #error "VIKI2 / miniVIKI is not supported."
148
       #error "VIKI2 / miniVIKI is not supported."
149
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
149
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
150
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
150
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h View File

261
   #endif
261
   #endif
262
 #endif
262
 #endif
263
 
263
 
264
-#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
264
+#if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
265
   #define TFT_CS_PIN                 EXP1_04_PIN
265
   #define TFT_CS_PIN                 EXP1_04_PIN
266
   #define TFT_SCK_PIN                EXP2_09_PIN
266
   #define TFT_SCK_PIN                EXP2_09_PIN
267
   #define TFT_MISO_PIN               EXP2_10_PIN
267
   #define TFT_MISO_PIN               EXP2_10_PIN

+ 1
- 1
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h View File

130
   #define LCD_PINS_D6                          5  // D5       JP11-6
130
   #define LCD_PINS_D6                          5  // D5       JP11-6
131
   #define LCD_PINS_D7                          4  // D4       JP11-5
131
   #define LCD_PINS_D7                          4  // D4       JP11-5
132
 
132
 
133
-  #if ANY(VIKI2, miniVIKI)
133
+  #if EITHER(VIKI2, miniVIKI)
134
     #define BEEPER_PIN                         8  // E0       JP11-10
134
     #define BEEPER_PIN                         8  // E0       JP11-10
135
 
135
 
136
     #define DOGLCD_A0                         40  // F2       JP2-2
136
     #define DOGLCD_A0                         40  // F2       JP2-2

+ 1
- 1
Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h View File

207
   #define LCD_PINS_D6                          5  // D5       JP11-6
207
   #define LCD_PINS_D6                          5  // D5       JP11-6
208
   #define LCD_PINS_D7                          4  // D4       JP11-5
208
   #define LCD_PINS_D7                          4  // D4       JP11-5
209
 
209
 
210
-  #if ANY(VIKI2, miniVIKI)
210
+  #if EITHER(VIKI2, miniVIKI)
211
 
211
 
212
     #define BEEPER_PIN                         8  // E0       JP11-10
212
     #define BEEPER_PIN                         8  // E0       JP11-10
213
     #define DOGLCD_A0                         40  // F2       JP2-2
213
     #define DOGLCD_A0                         40  // F2       JP2-2

Loading…
Cancel
Save