Optimization & fix conditional check

awawa-dev · May 24, 2021 · 852ea59 · 852ea59
1 parent 4777a56
commit 852ea59
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/HyperSerialEsp8266.ino b/HyperSerialEsp8266.ino
@@ -73,9 +73,9 @@ uint16_t          stat_final_good = 0;
 uint16_t          stat_final_frames  = 0;
 bool              wantShow = false;
 
-void ShowMe()
+inline void ShowMe()
 {
-    if (wantShow = true && strip->CanShow())
+    if (wantShow == true && strip->CanShow())
     {
         stat_good++;;
         wantShow = false;
@@ -95,7 +95,7 @@ void readSerialData()
     // stats
     if (internalIndex > 0 && curTime - stat_start > 1000)
     {
-       if (stat_frames > 0)
+       if (stat_frames > 0 && stat_frames >= stat_good )
        {
           stat_final_good = stat_good;
           stat_final_frames = stat_frames;
@@ -111,7 +111,7 @@ void readSerialData()
        stat_good   = 0;
        stat_frames = 0;
 
-       Serial.write("Stats for the last full frame.\r\n");
+       Serial.write("HyperSerialEsp8266 version 4.\r\nStatistics for the last full 1 second cycle.\r\n");
        Serial.write("Frames per second: ");
        Serial.print(stat_final_frames);     
        Serial.write("\r\nGood frames: ");
@@ -233,15 +233,15 @@ void readSerialData()
 }
 
 #ifdef THIS_IS_RGBW
-void setStripPixel(uint16_t pix, RgbwColor& inputColor)
+inline void setStripPixel(uint16_t pix, RgbwColor& inputColor)
 {
     if (pix < pixelCount)
     {
         strip->SetPixelColor(pix, inputColor);
     }
 }
 #else
-void setStripPixel(uint16_t pix, RgbColor& inputColor)
+inline void setStripPixel(uint16_t pix, RgbColor& inputColor)
 {
     if (pix < pixelCount)
     {
@@ -275,8 +275,8 @@ void setup()
 
     // Prepare calibration for RGBW
     #ifdef THIS_IS_RGBW
-        // prepare 
-        for (int i = 0; i < 256; i++)
+        // prepare LUT calibration table, neutral white is in fact yellow
+        for (uint32_t i = 0; i < 256; i++)
         {
             // color calibration
             uint32_t rCorrection = 0xB0 * (uint32_t)i; // adjust red   -> white in 0-0xFF range
@@ -293,7 +293,7 @@ void setup()
         }
     #endif  
 
-    // Say ambilight like "Hello" to the world
+    // Say "Hello" to the world using first led
     for (int i = 0; i < 9; i++)
     {
         if (i < 3)

diff --git a/...6812 cold white/HyperSerialEsp8266_SK6812ColdWhite/HyperSerialEsp8266_SK6812ColdWhite.ino b/...6812 cold white/HyperSerialEsp8266_SK6812ColdWhite/HyperSerialEsp8266_SK6812ColdWhite.ino
@@ -73,9 +73,9 @@ uint16_t          stat_final_good = 0;
 uint16_t          stat_final_frames  = 0;
 bool              wantShow = false;
 
-void ShowMe()
+inline void ShowMe()
 {
-    if (wantShow = true && strip->CanShow())
+    if (wantShow == true && strip->CanShow())
     {
         stat_good++;;
         wantShow = false;
@@ -95,7 +95,7 @@ void readSerialData()
     // stats
     if (internalIndex > 0 && curTime - stat_start > 1000)
     {
-       if (stat_frames > 0)
+       if (stat_frames > 0 && stat_frames >= stat_good )
        {
           stat_final_good = stat_good;
           stat_final_frames = stat_frames;
@@ -111,7 +111,7 @@ void readSerialData()
        stat_good   = 0;
        stat_frames = 0;
 
-       Serial.write("Stats for the last full frame.\r\n");
+       Serial.write("HyperSerialEsp8266 version 4.\r\nStatistics for the last full 1 second cycle.\r\n");
        Serial.write("Frames per second: ");
        Serial.print(stat_final_frames);     
        Serial.write("\r\nGood frames: ");
@@ -233,15 +233,15 @@ void readSerialData()
 }
 
 #ifdef THIS_IS_RGBW
-void setStripPixel(uint16_t pix, RgbwColor& inputColor)
+inline void setStripPixel(uint16_t pix, RgbwColor& inputColor)
 {
     if (pix < pixelCount)
     {
         strip->SetPixelColor(pix, inputColor);
     }
 }
 #else
-void setStripPixel(uint16_t pix, RgbColor& inputColor)
+inline void setStripPixel(uint16_t pix, RgbColor& inputColor)
 {
     if (pix < pixelCount)
     {
@@ -275,8 +275,8 @@ void setup()
 
     // Prepare calibration for RGBW
     #ifdef THIS_IS_RGBW
-        // prepare 
-        for (int i = 0; i < 256; i++)
+        // prepare LUT calibration table, cold white is much better than "neutral" white
+        for (uint32_t i = 0; i < 256; i++)
         {
             // color calibration
             uint32_t rCorrection = 0xA0 * (uint32_t)i; // adjust red   -> white in 0-0xFF range
@@ -293,7 +293,7 @@ void setup()
         }
     #endif  
 
-    // Say ambilight like "Hello" to the world
+    // Say "Hello" to the world using first led
     for (int i = 0; i < 9; i++)
     {
         if (i < 3)

diff --git a/version for SPI led strip (APA102 WS2801)/HyperSerialEsp8266_SPI/HyperSerialEsp8266_SPI.ino b/version for SPI led strip (APA102 WS2801)/HyperSerialEsp8266_SPI/HyperSerialEsp8266_SPI.ino
@@ -72,9 +72,9 @@ uint16_t          stat_final_good = 0;
 uint16_t          stat_final_frames  = 0;
 bool              wantShow = false;
 
-void ShowMe()
+inline void ShowMe()
 {
-    if (wantShow = true && strip->CanShow())
+    if (wantShow == true && strip->CanShow())
     {
         stat_good++;;
         wantShow = false;
@@ -94,7 +94,7 @@ void readSerialData()
     // stats
     if (internalIndex > 0 && curTime - stat_start > 1000)
     {
-       if (stat_frames > 0)
+       if (stat_frames > 0 && stat_frames >= stat_good )
        {
           stat_final_good = stat_good;
           stat_final_frames = stat_frames;
@@ -110,7 +110,7 @@ void readSerialData()
        stat_good   = 0;
        stat_frames = 0;
 
-       Serial.write("Stats for the last full frame.\r\n");
+       Serial.write("HyperSerialEsp8266 version 4.\r\nStatistics for the last full 1 second cycle.\r\n");
        Serial.write("Frames per second: ");
        Serial.print(stat_final_frames);     
        Serial.write("\r\nGood frames: ");
@@ -232,15 +232,15 @@ void readSerialData()
 }
 
 #ifdef THIS_IS_RGBW
-void setStripPixel(uint16_t pix, RgbwColor& inputColor)
+inline void setStripPixel(uint16_t pix, RgbwColor& inputColor)
 {
     if (pix < pixelCount)
     {
         strip->SetPixelColor(pix, inputColor);
     }
 }
 #else
-void setStripPixel(uint16_t pix, RgbColor& inputColor)
+inline void setStripPixel(uint16_t pix, RgbColor& inputColor)
 {
     if (pix < pixelCount)
     {
@@ -274,8 +274,8 @@ void setup()
 
     // Prepare calibration for RGBW
     #ifdef THIS_IS_RGBW
-        // prepare 
-        for (int i = 0; i < 256; i++)
+        // prepare LUT calibration table
+        for (uint32_t i = 0; i < 256; i++)
         {
             // color calibration
             uint32_t rCorrection = 0 * (uint32_t)i; // adjust red   -> white in 0-0xFF range
@@ -292,7 +292,7 @@ void setup()
         }
     #endif  
 
-    // Say ambilight like "Hello" to the world
+    // Say "Hello" to the world using first led
     for (int i = 0; i < 9; i++)
     {
         if (i < 3)