Diff: neopixel.cpp

Revision:

8:82727add54ce

Parent:

7:4ad54efe2fdd

Child:

11:eaf2e3166d20

--- a/neopixel.cpp	Sun Dec 06 08:09:01 2020 +0000
+++ b/neopixel.cpp	Wed Feb 24 12:34:27 2021 +0000
@@ -55,10 +55,9 @@
 }
 
 void NeoPixelOut::setPixelColor(uint32_t i,uint32_t color){
-    if(i >= num_pixels_){
-        return;
+    if(i < num_pixels_){
+        strip_[i].hex = color;
     }
-    strip_[i].hex = color;
 }
     
 void NeoPixelOut::show(){
@@ -158,8 +157,8 @@
     if (flipwait) flip();
 }
 
-uint32_t NeoPixelOut::color(uint32_t b,uint32_t g,uint32_t r){
-    return b + (g << 8) + (r << 16);
+uint32_t NeoPixelOut::color(uint8_t b,uint8_t g,uint8_t r){
+    return (uint32_t)b + ((uint32_t)g << 8) + ((uint32_t)r << 16);
 }
  
 int NeoPixelOut::numPixels(){
@@ -167,7 +166,7 @@
 }
 
 void NeoPixelOut::off(bool flag){
-    for(int i = 0;i < strip_.size();i++){
+    for(int i = 0;i < num_pixels_;i++){
         strip_[i].hex = 0;
     }
     if(flag){