Browse Source

Small LED code reorganization (#12929)

Giuliano Zaro 6 years ago
parent
commit
7bb5d4bfe8
3 changed files with 11 additions and 10 deletions
  1. 3
    9
      Marlin/src/Marlin.cpp
  2. 0
    1
      Marlin/src/feature/caselight.cpp
  3. 8
    0
      Marlin/src/feature/leds/leds.cpp

+ 3
- 9
Marlin/src/Marlin.cpp View File

@@ -860,16 +860,10 @@ void setup() {
860 860
     leds.setup();
861 861
   #endif
862 862
 
863
-  #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
864
-    SET_OUTPUT(RGB_LED_R_PIN);
865
-    SET_OUTPUT(RGB_LED_G_PIN);
866
-    SET_OUTPUT(RGB_LED_B_PIN);
867
-    #if ENABLED(RGBW_LED)
868
-      SET_OUTPUT(RGB_LED_W_PIN);
869
-    #endif
870
-  #endif
871
-
872 863
   #if HAS_CASE_LIGHT
864
+    #if DISABLED(CASE_LIGHT_USE_NEOPIXEL)
865
+      SET_OUTPUT(CASE_LIGHT_PIN);
866
+    #endif
873 867
     update_case_light();
874 868
   #endif
875 869
 

+ 0
- 1
Marlin/src/feature/caselight.cpp View File

@@ -69,7 +69,6 @@ void update_case_light() {
69 69
 
70 70
   #else // !CASE_LIGHT_USE_NEOPIXEL
71 71
 
72
-    SET_OUTPUT(CASE_LIGHT_PIN);
73 72
     if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN))
74 73
       analogWrite(CASE_LIGHT_PIN, n10ct);
75 74
     else {

+ 8
- 0
Marlin/src/feature/leds/leds.cpp View File

@@ -60,6 +60,14 @@
60 60
 LEDLights leds;
61 61
 
62 62
 void LEDLights::setup() {
63
+  #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
64
+    SET_OUTPUT(RGB_LED_R_PIN);
65
+    SET_OUTPUT(RGB_LED_G_PIN);
66
+    SET_OUTPUT(RGB_LED_B_PIN);
67
+    #if ENABLED(RGBW_LED)
68
+      SET_OUTPUT(RGB_LED_W_PIN);
69
+    #endif
70
+  #endif
63 71
   #if ENABLED(NEOPIXEL_LED)
64 72
     setup_neopixel();
65 73
   #endif

Loading…
Cancel
Save