From e45c527ceeab8dc2bbc103e4fcdd6fcc54146bff Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Mon, 18 Jun 2018 23:01:06 +1200
Subject: [PATCH] Remove up call from drivers in 'light_ws2811strip.h'.

---
 src/main/drivers/light_ws2811strip.c           |  4 +++-
 src/main/drivers/light_ws2811strip.h           |  7 ++++++-
 src/main/drivers/light_ws2811strip_hal.c       | 12 +++++++-----
 src/main/drivers/light_ws2811strip_stdperiph.c |  9 +++++----
 src/main/io/ledstrip.h                         | 11 ++++-------
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/drivers/light_ws2811strip.c b/src/main/drivers/light_ws2811strip.c
index a8b681ad89..36005fc4ce 100644
--- a/src/main/drivers/light_ws2811strip.c
+++ b/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)
diff --git a/src/main/drivers/light_ws2811strip.h b/src/main/drivers/light_ws2811strip.h
index 0044222e8e..6dfc367749 100644
--- a/src/main/drivers/light_ws2811strip.h
+++ b/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);
diff --git a/src/main/drivers/light_ws2811strip_hal.c b/src/main/drivers/light_ws2811strip_hal.c
index f3bbfd3ec7..f615baa76d 100644
--- a/src/main/drivers/light_ws2811strip_hal.c
+++ b/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;
diff --git a/src/main/drivers/light_ws2811strip_stdperiph.c b/src/main/drivers/light_ws2811strip_stdperiph.c
index 9c7951d7a3..627aebefeb 100644
--- a/src/main/drivers/light_ws2811strip_stdperiph.c
+++ b/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;
diff --git a/src/main/io/ledstrip.h b/src/main/io/ledstrip.h
index a3d82ec717..3f4d3b9840 100644
--- a/src/main/io/ledstrip.h
+++ b/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;