ソースを参照

Fix RGB / Neopixel white color bug

See #16752
Scott Lahteine 4年前
コミット
7a4758a6a2

+ 1
- 1
Marlin/src/feature/caselight.cpp ファイルの表示

58
   if (case_light_arg_flag && case_light_on)
58
   if (case_light_arg_flag && case_light_on)
59
     case_light_brightness = case_light_brightness_sav;  // restore last brightens if this is an S1 argument
59
     case_light_brightness = case_light_brightness_sav;  // restore last brightens if this is an S1 argument
60
 
60
 
61
-  #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) || NONE(CASE_LIGHT_USE_NEOPIXEL, CASE_LIGHT_NO_BRIGHTNESS)
61
+  #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) || DISABLED(CASE_LIGHT_NO_BRIGHTNESS)
62
     const uint8_t i = case_light_on ? case_light_brightness : 0, n10ct = INVERT_CASE_LIGHT ? 255 - i : i;
62
     const uint8_t i = case_light_on ? case_light_brightness : 0, n10ct = INVERT_CASE_LIGHT ? 255 - i : i;
63
   #endif
63
   #endif
64
 
64
 

+ 2
- 1
Marlin/src/feature/leds/leds.h ファイルの表示

33
   #include "neopixel.h"
33
   #include "neopixel.h"
34
 #endif
34
 #endif
35
 
35
 
36
+// A white component can be passed
36
 #define HAS_WHITE_LED EITHER(RGBW_LED, NEOPIXEL_LED)
37
 #define HAS_WHITE_LED EITHER(RGBW_LED, NEOPIXEL_LED)
37
 
38
 
38
 /**
39
 /**
137
 #define LEDColorBlue()            LEDColor(  0,   0, 255)
138
 #define LEDColorBlue()            LEDColor(  0,   0, 255)
138
 #define LEDColorIndigo()          LEDColor(  0, 255, 255)
139
 #define LEDColorIndigo()          LEDColor(  0, 255, 255)
139
 #define LEDColorViolet()          LEDColor(255,   0, 255)
140
 #define LEDColorViolet()          LEDColor(255,   0, 255)
140
-#if HAS_WHITE_LED
141
+#if HAS_WHITE_LED && DISABLED(RGB_LED)
141
   #define LEDColorWhite()         LEDColor(  0,   0,   0, 255)
142
   #define LEDColorWhite()         LEDColor(  0,   0,   0, 255)
142
 #else
143
 #else
143
   #define LEDColorWhite()         LEDColor(255, 255, 255)
144
   #define LEDColorWhite()         LEDColor(255, 255, 255)

+ 1
- 1
Marlin/src/feature/leds/printer_event_leds.h ファイルの表示

56
   #endif
56
   #endif
57
 
57
 
58
   #if HAS_TEMP_HOTEND || HAS_HEATED_BED
58
   #if HAS_TEMP_HOTEND || HAS_HEATED_BED
59
-    static inline void onHeatingDone() { leds.set_color(LEDColorWhite()); }
59
+    static inline void onHeatingDone() { leds.set_white(); }
60
     static inline void onPidTuningDone(LEDColor c) { leds.set_color(c); }
60
     static inline void onPidTuningDone(LEDColor c) { leds.set_color(c); }
61
   #endif
61
   #endif
62
 
62
 

+ 3
- 2
buildroot/share/tests/megaatmega2560-tests ファイルの表示

31
 opt_set FANMUX0_PIN 53
31
 opt_set FANMUX0_PIN 53
32
 opt_disable USE_WATCHDOG
32
 opt_disable USE_WATCHDOG
33
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
33
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
34
-           PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
34
+           FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \
35
+           PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
35
            EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
36
            EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
36
            BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
37
            BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
37
            NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
38
            NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
44
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
45
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
45
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
46
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
46
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
47
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
47
-           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE \
48
+          SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE \
48
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
49
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
49
 exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
50
 exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
50
 
51
 

読み込み中…
キャンセル
保存