Skip to content

Commit 3bcbd32

Browse files
authored
🔧 Mini LCD followup (MarlinFirmware#24111)
1 parent 60f8287 commit 3bcbd32

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

Marlin/src/inc/SanityCheck.h

+8-10
Original file line numberDiff line numberDiff line change
@@ -2443,23 +2443,21 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
24432443
#endif
24442444

24452445
/**
2446-
* FYSETC LCD Requirements
2446+
* FYSETC/MKS/BTT Mini Panel Requirements
24472447
*/
24482448
#if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1)
2449-
#ifndef NEO_GRB
2450-
#define NEO_GRB 123
2451-
#define FAUX_RGB 1
2449+
#ifndef NEO_RGB
2450+
#define NEO_RGB 123
24522451
#endif
2453-
#if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_GRB
2454-
#error "Your FYSETC Mini Panel requires NEOPIXEL_TYPE to be NEO_GRB."
2452+
#if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_RGB
2453+
#error "Your FYSETC/MKS/BTT Mini Panel requires NEOPIXEL_TYPE to be NEO_RGB."
24552454
#elif defined(NEOPIXEL_PIXELS) && NEOPIXEL_PIXELS < 3
2456-
#error "Your FYSETC Mini Panel requires NEOPIXEL_PIXELS >= 3."
2455+
#error "Your FYSETC/MKS/BTT Mini Panel requires NEOPIXEL_PIXELS >= 3."
24572456
#endif
24582457
#if FAUX_RGB
2459-
#undef NEO_GRB
2460-
#undef FAUX_RGB
2458+
#undef NEO_RGB
24612459
#endif
2462-
#elif EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && !DISABLED(RGB_LED)
2460+
#elif EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
24632461
#error "Your FYSETC Mini Panel requires RGB_LED."
24642462
#endif
24652463

Marlin/src/inc/Warnings.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -740,10 +740,10 @@
740740
#endif
741741

742742
/**
743-
* FYSETC backlighting
743+
* FYSETC/MKS/BTT Mini Panel backlighting
744744
*/
745745
#if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1) && !ALL(NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, LED_COLOR_PRESETS)
746-
#warning "Your FYSETC Mini Panel works best with NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, and LED_COLOR_PRESETS."
746+
#warning "Your FYSETC/MKS/BTT Mini Panel works best with NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, and LED_COLOR_PRESETS."
747747
#endif
748748

749749
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)

buildroot/tests/LPC1768

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set -e
1515

1616
restore_configs
1717
opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB SERIAL_PORT_3 3 \
18-
NEOPIXEL_TYPE NEO_GRB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
18+
NEOPIXEL_TYPE NEO_RGB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
1919
opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED E_DUAL_STEPPER_DRIVERS \
2020
NEOPIXEL_LED NEOPIXEL_IS_SEQUENTIAL NEOPIXEL_STARTUP_TEST NEOPIXEL_BKGD_INDEX_FIRST NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_COLOR NEOPIXEL_BKGD_ALWAYS_ON
2121
exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"

0 commit comments

Comments
 (0)