Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 06:45:16 +03:00
Code Issues Wiki Activity

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

Browse source
This commit is contained in:
mikeller 2018-06-18 23:01:06 +12:00
parent babebe32f2
commit e45c527cee
5 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/light_ws2811strip.c
View file

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

7
src/main/drivers/light_ws2811strip.h
View file

@ -21,7 +21,6 @@
#pragma once #pragma once
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "io/ledstrip.h"
#define WS2811_LED_STRIP_LENGTH 32 #define WS2811_LED_STRIP_LENGTH 32
#define WS2811_BITS_PER_LED 24 #define WS2811_BITS_PER_LED 24
@ -35,6 +34,12 @@
#define WS2811_TIMER_MHZ 48 #define WS2811_TIMER_MHZ 48
#define WS2811_CARRIER_HZ 800000 #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 ws2811LedStripInit(ioTag_t ioTag);
void ws2811LedStripHardwareInit(ioTag_t ioTag); void ws2811LedStripHardwareInit(ioTag_t ioTag);

12
src/main/drivers/light_ws2811strip_hal.c
View file

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

9
src/main/drivers/light_ws2811strip_stdperiph.c
View file

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

11
src/main/io/ledstrip.h
View file

@ -22,8 +22,11 @@
#include "common/color.h" #include "common/color.h"
#include "common/time.h" #include "common/time.h"
#include "pg/pg.h"
#include "drivers/io_types.h" #include "drivers/io_types.h"
#include "drivers/light_ws2811strip.h"
#include "pg/pg.h"
#define LED_MAX_STRIP_LENGTH 32 #define LED_MAX_STRIP_LENGTH 32
#define LED_CONFIGURABLE_COLOR_COUNT 16 #define LED_CONFIGURABLE_COLOR_COUNT 16
@ -124,12 +127,6 @@ typedef enum {
LED_OVERLAY_WARNING LED_OVERLAY_WARNING
} ledOverlayId_e; } 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 { typedef struct modeColorIndexes_s {
uint8_t color[LED_DIRECTION_COUNT]; uint8_t color[LED_DIRECTION_COUNT];
} modeColorIndexes_t; } modeColorIndexes_t;