Fixed RBG and BGR getPixelColor (#825)

Improved formatting

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### Development versions after 0.9.1 release
 
+#### Build 2004061
+
+-   Fixed RBG and BGR getPixelColor (#825)
+-   Improved formatting
+
 #### Build 2004060
 
 -   Consolidated global variables in wled.h

wled00/FX_fcn.cpp

@@ -412,8 +412,8 @@ uint32_t WS2812FX::getPixelColor(uint16_t i)
     case  0: return ((col.W << 24) | (col.G << 8) | (col.R << 16) | (col.B)); //0 = GRB, default
     case  1: return ((col.W << 24) | (col.R << 8) | (col.G << 16) | (col.B)); //1 = RGB, common for WS2811
     case  2: return ((col.W << 24) | (col.B << 8) | (col.R << 16) | (col.G)); //2 = BRG
-    case  3: return ((col.W << 24) | (col.R << 8) | (col.B << 16) | (col.G)); //3 = RBG
+    case  3: return ((col.W << 24) | (col.B << 8) | (col.G << 16) | (col.R)); //3 = RBG
-    case  4: return ((col.W << 24) | (col.B << 8) | (col.G << 16) | (col.R)); //4 = BGR
+    case  4: return ((col.W << 24) | (col.R << 8) | (col.B << 16) | (col.G)); //4 = BGR
     case  5: return ((col.W << 24) | (col.G << 8) | (col.B << 16) | (col.R)); //5 = GBR
   }
   return 0;

wled00/const.h

@@ -1,6 +1,10 @@
 #ifndef WLED_CONST_H
 #define WLED_CONST_H
 
+/*
+ * Readability defines and their associated numerical values + compile-time constants
+ */
+
 //Defaults
 #define DEFAULT_CLIENT_SSID "Your_Network"
 #define DEFAULT_AP_PASS     "wled1234"

wled00/fcn_declare.h

@@ -1,5 +1,5 @@
-#ifndef WLED_FUNC_DECLARE_H
+#ifndef WLED_FCN_DECLARE_H
-#define WLED_FUNC_DECLARE_H
+#define WLED_FCN_DECLARE_H
 #include <Arduino.h>
 #include "src/dependencies/espalexa/EspalexaDevice.h"
 #include "src/dependencies/e131/ESPAsyncE131.h"

wled00/html_other.h

@@ -1,5 +1,5 @@
 /*
- * Various pages
+ * Various web pages
  */
 
 //USER HTML HERE (/u subpage)

wled00/html_settings.h

@@ -1,5 +1,5 @@
 /*
-   Settings html
+ *  Settings html
  */
 
 //common CSS of settings pages

wled00/wled.cpp

@@ -2,6 +2,10 @@
 #include "wled.h"
 #include <Arduino.h>
 
+/*
+ * Main WLED class implementation. Mostly initialization and connection logic
+ */
+
 WLED::WLED()
 {
 }

wled00/wled.h

@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2004060
+#define VERSION 2004061
 
 // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).
 
@@ -81,7 +81,7 @@
 #include "src/dependencies/json/AsyncJson-v6.h"
 #include "src/dependencies/json/ArduinoJson-v6.h"
 
-#include "func_declare.h"
+#include "fcn_declare.h"
 #include "html_ui.h"
 #include "html_settings.h"
 #include "html_other.h"
@@ -128,6 +128,12 @@
   #define DEBUG_PRINTF(x)
 #endif
 
+// GLOBAL VARIABLES
+// both declared and defined in header (solution from http://www.keil.com/support/docs/1868.htm)
+//
+//e.g. byte test = 2 becomes WLED_GLOBAL byte test _INIT(2);
+//     int arr[]{0,1,2} becomes WLED_GLOBAL int arr[] _INIT_N(({0,1,2}));
+
 #ifndef WLED_DEFINE_GLOBAL_VARS
 # define WLED_GLOBAL extern
 # define _INIT(x)
@@ -278,7 +284,7 @@ WLED_GLOBAL bool otaLock _INIT(false);           // prevents OTA firmware update
 WLED_GLOBAL bool wifiLock    _INIT(false);  // prevents access to WiFi settings when OTA lock is enabled
 WLED_GLOBAL bool aOtaEnabled _INIT(true);   // ArduinoOTA allows easy updates directly from the IDE. Careful, it does not auto-disable when OTA lock is on
 
-WLED_GLOBAL uint16_t userVar0 _INIT(0), userVar1 _INIT(0);
+WLED_GLOBAL uint16_t userVar0 _INIT(0), userVar1 _INIT(0); //available for use in usermod
 
 #ifdef WLED_ENABLE_DMX
   // dmx CONFIG

wled00/wled00.ino

@@ -1,5 +1,14 @@
 /*
- * Arduino IDE compatibility file.
+ * WLED Arduino IDE compatibility file.
+ * 
+ * Where has everything gone?
+ * 
+ * In April 2020, the project's structure underwent a major change. 
+ * Global variables are now found in file "wled.h"
+ * Global function declarations are found in "fcn_declare.h"
+ * 
+ * Usermod compatibility: Existing wled06_usermod.ino mods should continue to work. Delete usermod.cpp.
+ * New usermods should use usermod.cpp instead.
  */
 #include "wled.h"