Moving rgb typedefs into a single location (#5978)

Because someone named the define poorly Using full relative path as handwired/promethium has a color.h file
qmk · Jun 4, 2019 · e7711b3 · e7711b3
1 parent 661a915
commit e7711b3
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 57 deletions.
diff --git a/drivers/avr/apa102.h b/drivers/avr/apa102.h
@@ -25,7 +25,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 
-#include "rgblight_types.h"
+#include "color.h"
 
 
 /* User Interface

diff --git a/drivers/avr/ws2812.h b/drivers/avr/ws2812.h
@@ -28,7 +28,7 @@
 //#include "ws2812_config.h"
 //#include "i2cmaster.h"
 
-#include "rgblight_types.h"
+#include "quantum/color.h"
 
 /* User Interface
  *

diff --git a/keyboards/cannonkeys/bluepill/ws2812.h b/keyboards/cannonkeys/bluepill/ws2812.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "hal.h"
-#include "rgblight_types.h"
+#include "color.h"
 
 
 void set_leds_color_rgb(LED_TYPE color);

diff --git a/keyboards/cannonkeys/stm32f072/ws2812.h b/keyboards/cannonkeys/stm32f072/ws2812.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include "hal.h"
-#include "rgblight_types.h"
-
+#include "color.h"
 
 void set_leds_color_rgb(LED_TYPE color);
 void set_led_color_rgb(LED_TYPE color, int pos);

diff --git a/keyboards/handwired/promethium/rgbsps.c b/keyboards/handwired/promethium/rgbsps.c
@@ -1,7 +1,7 @@
 #include "ws2812.h"
 #include "rgbsps.h"
 
-struct cRGB led[RGBSPS_NUM];
+cRGB led[RGBSPS_NUM];
 
 void rgbsps_set(uint8_t index, uint8_t r, uint8_t g, uint8_t b) {
   led[index].r = r;

diff --git a/keyboards/mxss/rgblight.h b/keyboards/mxss/rgblight.h
@@ -73,7 +73,7 @@
 #ifndef RGBLIGHT_CUSTOM_DRIVER
 #include "ws2812.h"
 #endif
-#include "rgblight_types.h"
+#include "color.h"
 #include "rgblight_list.h"
 
 extern LED_TYPE led[RGBLED_NUM];

diff --git a/quantum/color.h b/quantum/color.h
@@ -32,12 +32,30 @@
 #pragma pack( push, 1 )
 #endif
 
+#ifdef RGBW
+  #define LED_TYPE cRGBW
+#else
+  #define LED_TYPE RGB
+#endif
+
+// WS2812 specific layout
 typedef struct PACKED
 {
+	uint8_t g;
 	uint8_t r;
+	uint8_t b;
+} cRGB;
+
+typedef cRGB RGB;
+
+// WS2812 specific layout
+typedef struct PACKED
+{
 	uint8_t g;
+	uint8_t r;
 	uint8_t b;
-} RGB;
+	uint8_t w;
+} cRGBW;
 
 typedef struct PACKED
 {
@@ -50,6 +68,6 @@ typedef struct PACKED
 #pragma pack( pop )
 #endif
 
-RGB hsv_to_rgb( HSV hsv );
+RGB hsv_to_rgb(HSV hsv);
 
 #endif // COLOR_H
diff --git a/quantum/rgblight.h b/quantum/rgblight.h
@@ -132,7 +132,7 @@ enum RGBLIGHT_EFFECT_MODE {
 #ifndef RGBLIGHT_CUSTOM_DRIVER
 #include "ws2812.h"
 #endif
-#include "rgblight_types.h"
+#include "color.h"
 #include "rgblight_list.h"
 
 #if defined(__AVR__)

diff --git a/quantum/rgblight_types.h b/quantum/rgblight_types.h