Przeglądaj źródła

🔧 Mini LCD followup (#24111)

Keith Bennett 2 lat temu
rodzic
commit
3bcbd3259f
No account linked to committer's email address

+ 8
- 10
Marlin/src/inc/SanityCheck.h Wyświetl plik

@@ -2443,23 +2443,21 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2443 2443
 #endif
2444 2444
 
2445 2445
 /**
2446
- * FYSETC LCD Requirements
2446
+ * FYSETC/MKS/BTT Mini Panel Requirements
2447 2447
  */
2448 2448
 #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
2452 2451
   #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."
2455 2454
   #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."
2457 2456
   #endif
2458 2457
   #if FAUX_RGB
2459
-    #undef NEO_GRB
2460
-    #undef FAUX_RGB
2458
+    #undef NEO_RGB
2461 2459
   #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)
2463 2461
   #error "Your FYSETC Mini Panel requires RGB_LED."
2464 2462
 #endif
2465 2463
 

+ 2
- 2
Marlin/src/inc/Warnings.cpp Wyświetl plik

@@ -740,10 +740,10 @@
740 740
 #endif
741 741
 
742 742
 /**
743
- * FYSETC backlighting
743
+ * FYSETC/MKS/BTT Mini Panel backlighting
744 744
  */
745 745
 #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."
747 747
 #endif
748 748
 
749 749
 #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)

+ 1
- 1
buildroot/tests/LPC1768 Wyświetl plik

@@ -15,7 +15,7 @@ set -e
15 15
 
16 16
 restore_configs
17 17
 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
19 19
 opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED E_DUAL_STEPPER_DRIVERS \
20 20
            NEOPIXEL_LED NEOPIXEL_IS_SEQUENTIAL NEOPIXEL_STARTUP_TEST NEOPIXEL_BKGD_INDEX_FIRST NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_COLOR NEOPIXEL_BKGD_ALWAYS_ON
21 21
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"

Ładowanie…
Anuluj
Zapisz