Browse Source

Separate Neopixels followup (#19179)

Zachary Annand 4 years ago
parent
commit
41c7ae5d54
No account linked to committer's email address
2 changed files with 6 additions and 8 deletions
  1. 6
    3
      Marlin/src/feature/leds/neopixel.h
  2. 0
    5
      Marlin/src/inc/Conditionals_LCD.h

+ 6
- 3
Marlin/src/feature/leds/neopixel.h View File

@@ -110,7 +110,7 @@ public:
110 110
       #if CONJOINED_NEOPIXEL
111 111
         adaneo2.show();
112 112
       #else
113
-        adaneo1.setPin(NEOPIXEL2_PIN);
113
+        TERN_(NEOPIXEL2_SEPARATE,,adaneo1.setPin(NEOPIXEL2_PIN));
114 114
         adaneo1.show();
115 115
         adaneo1.setPin(NEOPIXEL_PIN);
116 116
       #endif
@@ -133,7 +133,7 @@ extern Marlin_NeoPixel neo;
133 133
 
134 134
 // Neo pixel channel 2
135 135
 #if ENABLED(NEOPIXEL2_SEPARATE)
136
-  
136
+
137 137
   #if NEOPIXEL2_TYPE == NEO_RGB || NEOPIXEL2_TYPE == NEO_RBG || NEOPIXEL2_TYPE == NEO_GRB || NEOPIXEL2_TYPE == NEO_GBR || NEOPIXEL2_TYPE == NEO_BRG || NEOPIXEL2_TYPE == NEO_BGR
138 138
     #define NEOPIXEL2_IS_RGB 1
139 139
   #else
@@ -161,7 +161,10 @@ extern Marlin_NeoPixel neo;
161 161
     static inline void begin() { adaneo.begin(); }
162 162
     static inline void set_pixel_color(const uint16_t n, const uint32_t c) { adaneo.setPixelColor(n, c); }
163 163
     static inline void set_brightness(const uint8_t b) { adaneo.setBrightness(b); }
164
-    static inline void show() { adaneo.show(); }
164
+    static inline void show() {
165
+      adaneo.show();
166
+      adaneo.setPin(NEOPIXEL2_PIN);
167
+    }
165 168
 
166 169
     // Accessors
167 170
     static inline uint16_t pixels() { return adaneo.numPixels();}

+ 0
- 5
Marlin/src/inc/Conditionals_LCD.h View File

@@ -780,8 +780,3 @@
780 780
 #ifndef EXTRUDE_MINTEMP
781 781
   #define EXTRUDE_MINTEMP 170
782 782
 #endif
783
-
784
-// This flag indicates if Neopixel pins are shared or separated  
785
-#if EITHER(MULTIPLE_NEOPIXEL_TYPES, NEOPIXEL2_INSERIES)
786
-  #define CONJOINED_NEOPIXEL 1
787
-#endif

Loading…
Cancel
Save