Merge pull request #108 from MatejKocourek/attribute_fix

Added packed attributes to cRGB structs
cpldcpu · Sep 11, 2024 · 0a44f05 · 0a44f05
2 parents b300eda + bea241c
commit 0a44f05
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/light_apa102_AVR/Light_apa102/light_apa102.h b/light_apa102_AVR/Light_apa102/light_apa102.h
@@ -37,9 +37,9 @@
 ///////////////////////////////////////////////////////////////////////
 
 #if defined(APA102_BYTE_ORDER_GBR)
-struct cRGB { uint8_t g; uint8_t b; uint8_t r; };   // GBR
+struct __attribute__ ((__packed__)) cRGB { uint8_t g; uint8_t b; uint8_t r; };   // GBR
 #else
-struct cRGB { uint8_t b; uint8_t g; uint8_t r; };   // BGR (APA102 Standard)
+struct __attribute__ ((__packed__)) cRGB { uint8_t b; uint8_t g; uint8_t r; };   // BGR (APA102 Standard)
 #endif
 
 /* User Interface

diff --git a/light_apa102_AVR/apa102_config.h b/light_apa102_AVR/apa102_config.h
@@ -24,8 +24,8 @@
 // Define color byte order
 ///////////////////////////////////////////////////////////////////////
 
-struct cRGB { uint8_t b; uint8_t g; uint8_t r; };   // BGR (APA102 Standard)
-//struct cRGB { uint8_t g; uint8_t b; uint8_t r; };   // GBR 
+struct __attribute__ ((__packed__)) cRGB { uint8_t b; uint8_t g; uint8_t r; };   // BGR (APA102 Standard)
+//struct __attribute__ ((__packed__)) cRGB { uint8_t g; uint8_t b; uint8_t r; };   // GBR 
 
 
 

diff --git a/light_ws2812_AVR/Light_WS2812/light_ws2812.h b/light_ws2812_AVR/Light_WS2812/light_ws2812.h
@@ -48,8 +48,8 @@
  * cRGBW:    RGBW for SK6812RGBW
  */
 
-struct cRGB  { uint8_t g; uint8_t r; uint8_t b; };
-struct cRGBW { uint8_t g; uint8_t r; uint8_t b; uint8_t w;};
+struct __attribute__ ((__packed__)) cRGB  { uint8_t g; uint8_t r; uint8_t b; };
+struct __attribute__ ((__packed__)) cRGBW { uint8_t g; uint8_t r; uint8_t b; uint8_t w;};
 
 
 

diff --git a/light_ws2812_Arduino/light_WS2812.zip b/light_ws2812_Arduino/light_WS2812.zip
diff --git a/light_ws2812_Arduino/light_WS2812/cRGB.h b/light_ws2812_Arduino/light_WS2812/cRGB.h
@@ -45,7 +45,7 @@ const byte dim_curve[] = {
 };
 #endif
 
-struct cRGB { 
+struct __attribute__ ((__packed__)) cRGB { 
 	uint8_t g; 
 	uint8_t r; 
 	uint8_t b;