Remove up call from drivers in 'light_ws2811strip.h'.

src/main/drivers/light_ws2811strip.c

@@ -38,8 +38,10 @@
 
 #include "common/color.h"
 #include "common/colorconversion.h"
-#include "dma.h"
+
+#include "drivers/dma.h"
 #include "drivers/io.h"
+
 #include "light_ws2811strip.h"
 
 #if defined(STM32F1) || defined(STM32F3)

src/main/drivers/light_ws2811strip.h

@@ -21,7 +21,6 @@
 #pragma once
 
 #include "drivers/io_types.h"
-#include "io/ledstrip.h"
 
 #define WS2811_LED_STRIP_LENGTH    32
 #define WS2811_BITS_PER_LED        24
@@ -35,6 +34,12 @@
 #define WS2811_TIMER_MHZ           48
 #define WS2811_CARRIER_HZ          800000
 
+// Enumeration to match the string options defined in lookupLedStripFormatRGB in settings.c
+typedef enum {
+    LED_GRB,
+    LED_RGB
+} ledStripFormatRGB_e;
+
 void ws2811LedStripInit(ioTag_t ioTag);
 
 void ws2811LedStripHardwareInit(ioTag_t ioTag);

src/main/drivers/light_ws2811strip_hal.c

@@ -26,13 +26,15 @@
 #ifdef USE_LED_STRIP
 
 #include "common/color.h"
-#include "light_ws2811strip.h"
-#include "drivers/nvic.h"
-#include "dma.h"
+
+#include "drivers/dma.h"
 #include "drivers/io.h"
+#include "drivers/nvic.h"
+#include "drivers/rcc.h"
 #include "drivers/system.h"
-#include "rcc.h"
-#include "timer.h"
+#include "drivers/timer.h"
+
+#include "light_ws2811strip.h"
 
 static IO_t ws2811IO = IO_NONE;
 bool ws2811Initialised = false;

src/main/drivers/light_ws2811strip_stdperiph.c

@@ -27,14 +27,15 @@
 
 #include "build/debug.h"
 
+#include "common/color.h"
+
+#include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
+#include "drivers/rcc.h"
+#include "drivers/timer.h"
 
-#include "common/color.h"
 #include "light_ws2811strip.h"
-#include "dma.h"
-#include "rcc.h"
-#include "timer.h"
 
 static IO_t ws2811IO = IO_NONE;
 bool ws2811Initialised = false;

src/main/io/ledstrip.h

@@ -22,8 +22,11 @@
 
 #include "common/color.h"
 #include "common/time.h"
-#include "pg/pg.h"
+
 #include "drivers/io_types.h"
+#include "drivers/light_ws2811strip.h"
+
+#include "pg/pg.h"
 
 #define LED_MAX_STRIP_LENGTH           32
 #define LED_CONFIGURABLE_COLOR_COUNT   16
@@ -124,12 +127,6 @@ typedef enum {
     LED_OVERLAY_WARNING
 } ledOverlayId_e;
 
-// Enumeration to match the string options defined in lookupLedStripFormatRGB in settings.c
-typedef enum {
-    LED_GRB,
-    LED_RGB
-} ledStripFormatRGB_e;
-
 typedef struct modeColorIndexes_s {
     uint8_t color[LED_DIRECTION_COUNT];
 } modeColorIndexes_t;