Refactored code to improve readability (merge dev PR)

Refactored code to improve readability Fixed non-2-char indentations
vehar · Nov 9, 2018 · a3bef49 · a3bef49
2 parents 640188f + a5cf553
commit a3bef49
Show file tree

Hide file tree

Showing 16 changed files with 1,110 additions and 1,098 deletions.
diff --git a/wled00/NpbWrapper.h b/wled00/NpbWrapper.h
@@ -10,33 +10,34 @@
 //uncomment this if red and green are swapped
 //#define SWAPRG
 
+
 //automatically uses the right driver method for each platform
 #ifdef ARDUINO_ARCH_ESP32
-  #ifdef WORKAROUND_ESP32_BITBANG
-    #define PIXELMETHOD NeoEsp32BitBangWs2813Method
-    #pragma message "Software BitBang is used because of your NeoPixelBus version. Look in NpbWrapper.h for instructions on how to mitigate flickering."
-  #else
-    #define PIXELMETHOD NeoEsp32RmtWS2813_V3Method
-  #endif
+ #ifdef WORKAROUND_ESP32_BITBANG
+  #define PIXELMETHOD NeoEsp32BitBangWs2813Method
+  #pragma message "Software BitBang is used because of your NeoPixelBus version. Look in NpbWrapper.h for instructions on how to mitigate flickering."
+ #else
+  #define PIXELMETHOD NeoEsp32RmtWS2813_V3Method
+ #endif
 #else //esp8266
-  //autoselect the right method depending on strip pin
-  #if LEDPIN == 2
-    #define PIXELMETHOD NeoEsp8266Uart800KbpsMethod
-  #elif LEDPIN == 3
-    #define PIXELMETHOD NeoEsp8266Dma800KbpsMethod
-  #else
-    #define PIXELMETHOD NeoEsp8266BitBang800KbpsMethod
-    #pragma message "Software BitBang will be used because of your selected LED pin. This may cause flicker. Use GPIO 2 or 3 for best results."
-  #endif
+ //autoselect the right method depending on strip pin
+ #if LEDPIN == 2
+  #define PIXELMETHOD NeoEsp8266Uart800KbpsMethod
+ #elif LEDPIN == 3
+  #define PIXELMETHOD NeoEsp8266Dma800KbpsMethod
+ #else
+  #define PIXELMETHOD NeoEsp8266BitBang800KbpsMethod
+  #pragma message "Software BitBang will be used because of your selected LED pin. This may cause flicker. Use GPIO 2 or 3 for best results."
+ #endif
 #endif
 
 //handle swapping Red and Green automatically
 #ifdef SWAPRG
-#define PIXELFEATURE3 NeoRgbFeature
-#define PIXELFEATURE4 NeoRgbwFeature
+ #define PIXELFEATURE3 NeoRgbFeature
+ #define PIXELFEATURE4 NeoRgbwFeature
 #else
-#define PIXELFEATURE3 NeoGrbFeature
-#define PIXELFEATURE4 NeoGrbwFeature
+ #define PIXELFEATURE3 NeoGrbFeature
+ #define PIXELFEATURE4 NeoGrbwFeature
 #endif
 
 #include <NeoPixelBrightnessBus.h>
@@ -53,10 +54,10 @@ class NeoPixelWrapper
 {
 public:
   NeoPixelWrapper() :
-      // initialize each member to null
-      _pGrb(NULL),
-      _pGrbw(NULL),
-      _type(NeoPixelType_None)
+    // initialize each member to null
+    _pGrb(NULL),
+    _pGrbw(NULL),
+    _type(NeoPixelType_None)
   {
 
   }
@@ -71,8 +72,8 @@ class NeoPixelWrapper
     cleanup();
     _type = type;
 
-    switch (_type) {
-
+    switch (_type)
+    {
       case NeoPixelType_Grb:
         _pGrb = new NeoPixelBrightnessBus<PIXELFEATURE3,PIXELMETHOD>(countPixels, LEDPIN);
         _pGrb->Begin();
@@ -88,23 +89,25 @@ class NeoPixelWrapper
   void Show()
   {
     #ifdef ARDUINO_ARCH_ESP32
-    #ifdef WORKAROUND_ESP32_BITBANG
-    delay(1);
-    portDISABLE_INTERRUPTS(); //this is a workaround to prevent flickering (see https://github.com/adafruit/Adafruit_NeoPixel/issues/139)
-    #endif
+     #ifdef WORKAROUND_ESP32_BITBANG
+      delay(1);
+      portDISABLE_INTERRUPTS(); //this is a workaround to prevent flickering (see https://github.com/adafruit/Adafruit_NeoPixel/issues/139)
+     #endif
     #endif
 
-    switch (_type) {
+    switch (_type)
+    {
       case NeoPixelType_Grb:  _pGrb->Show();   break;
       case NeoPixelType_Grbw: _pGrbw->Show();  break;
     }
 
     #ifdef ARDUINO_ARCH_ESP32
-    #ifdef WORKAROUND_ESP32_BITBANG
-    portENABLE_INTERRUPTS();
-    #endif
+     #ifdef WORKAROUND_ESP32_BITBANG
+      portENABLE_INTERRUPTS();
+     #endif
     #endif
   }
+
   bool CanShow() const
   {
     switch (_type) {
@@ -113,65 +116,65 @@ class NeoPixelWrapper
     }
   }
 
-    void SetPixelColor(uint16_t indexPixel, RgbColor color)
-    {
-      switch (_type) {
-        case NeoPixelType_Grb: _pGrb->SetPixelColor(indexPixel, color);   break;
-        case NeoPixelType_Grbw:_pGrbw->SetPixelColor(indexPixel, color);  break;
-      }
+  void SetPixelColor(uint16_t indexPixel, RgbColor color)
+  {
+    switch (_type) {
+      case NeoPixelType_Grb: _pGrb->SetPixelColor(indexPixel, color);   break;
+      case NeoPixelType_Grbw:_pGrbw->SetPixelColor(indexPixel, color);  break;
     }
+  }
 
-    void SetPixelColor(uint16_t indexPixel, RgbwColor color)
-    {
-      switch (_type) {
-        case NeoPixelType_Grb:  _pGrb->SetPixelColor(indexPixel, RgbColor(color.R,color.G,color.B));   break;
-        case NeoPixelType_Grbw: _pGrbw->SetPixelColor(indexPixel, color);   break;
-      }
+  void SetPixelColor(uint16_t indexPixel, RgbwColor color)
+  {
+    switch (_type) {
+      case NeoPixelType_Grb:  _pGrb->SetPixelColor(indexPixel, RgbColor(color.R,color.G,color.B));   break;
+      case NeoPixelType_Grbw: _pGrbw->SetPixelColor(indexPixel, color);   break;
     }
+  }
 
-    void SetBrightness(byte b)
-    {
-      switch (_type) {
-        case NeoPixelType_Grb: _pGrb->SetBrightness(b);   break;
-        case NeoPixelType_Grbw:_pGrbw->SetBrightness(b);  break;
-      }
+  void SetBrightness(byte b)
+  {
+    switch (_type) {
+      case NeoPixelType_Grb: _pGrb->SetBrightness(b);   break;
+      case NeoPixelType_Grbw:_pGrbw->SetBrightness(b);  break;
     }
+  }
 
-    RgbColor GetPixelColor(uint16_t indexPixel) const
-    {
-      switch (_type) {
-        case NeoPixelType_Grb:  return _pGrb->GetPixelColor(indexPixel);     break;
-        case NeoPixelType_Grbw: /*doesn't support it so we don't return it*/ break;
-      }
-      return 0;
+  RgbColor GetPixelColor(uint16_t indexPixel) const
+  {
+    switch (_type) {
+      case NeoPixelType_Grb:  return _pGrb->GetPixelColor(indexPixel);     break;
+      case NeoPixelType_Grbw: /*doesn't support it so we don't return it*/ break;
     }
+    return 0;
+  }
 
-// NOTE:  Due to feature differences, some support RGBW but the method name
-// here needs to be unique, thus GetPixeColorRgbw
-    RgbwColor GetPixelColorRgbw(uint16_t indexPixel) const
-    {
-      switch (_type) {
-        case NeoPixelType_Grb:  return _pGrb->GetPixelColor(indexPixel);  break;
-        case NeoPixelType_Grbw: return _pGrbw->GetPixelColor(indexPixel); break;
-      }
-      return 0;
+  // NOTE:  Due to feature differences, some support RGBW but the method name
+  // here needs to be unique, thus GetPixeColorRgbw
+  RgbwColor GetPixelColorRgbw(uint16_t indexPixel) const
+  {
+    switch (_type) {
+      case NeoPixelType_Grb:  return _pGrb->GetPixelColor(indexPixel);  break;
+      case NeoPixelType_Grbw: return _pGrbw->GetPixelColor(indexPixel); break;
     }
+    return 0;
+  }
 
-    void ClearTo(RgbColor color)
-    {
-      switch (_type) {
-        case NeoPixelType_Grb: _pGrb->ClearTo(color);   break;
-        case NeoPixelType_Grbw:_pGrbw->ClearTo(color);  break;
-      }
+  void ClearTo(RgbColor color)
+  {
+    switch (_type) {
+      case NeoPixelType_Grb: _pGrb->ClearTo(color);   break;
+      case NeoPixelType_Grbw:_pGrbw->ClearTo(color);  break;
     }
+  }
 
-    void ClearTo(RgbwColor color)
-    {
-      switch (_type) {
-        case NeoPixelType_Grb:    break;
-        case NeoPixelType_Grbw:_pGrbw->ClearTo(color);  break;
-      }
+  void ClearTo(RgbwColor color)
+  {
+    switch (_type) {
+      case NeoPixelType_Grb:    break;
+      case NeoPixelType_Grbw:_pGrbw->ClearTo(color);  break;
     }
+  }
 
 private:
   NeoPixelType _type;

diff --git a/wled00/WS2812FX.cpp b/wled00/WS2812FX.cpp
@@ -67,9 +67,11 @@ void WS2812FX::service() {
   if(_running || _triggered) {
     unsigned long now = millis(); // Be aware, millis() rolls over every 49 days
     bool doShow = false;
-    for(uint8_t i=0; i < _num_segments; i++) {
+    for(uint8_t i=0; i < _num_segments; i++)
+    {
       _segment_index = i;
-      if(now > SEGMENT_RUNTIME.next_time || _triggered) {
+      if(now > SEGMENT_RUNTIME.next_time || _triggered)
+      {
         doShow = true;
         handle_palette();
         uint16_t delay = (this->*_mode[SEGMENT.mode])();

diff --git a/wled00/WS2812FX.h b/wled00/WS2812FX.h
@@ -40,6 +40,8 @@
 #define WS2812FX_h
 
 #include "NpbWrapper.h"
+
+#define FASTLED_INTERNAL //remove annoying pragma messages
 #include "FastLED.h"
 
 #define DEFAULT_BRIGHTNESS (uint8_t)50