From 7b70abd118a7b72e699bd097c0cea479a3f59f30 Mon Sep 17 00:00:00 2001 From: Ivan Efimov Date: Fri, 23 Dec 2022 17:02:21 -0600 Subject: [PATCH] Cloud build option for 64 leds (#12064) Build option for 64 leds --- src/main/drivers/light_ws2811strip.h | 2 +- src/main/io/ledstrip.h | 1 - src/main/target/common_pre.h | 8 ++++++++ src/test/unit/platform.h | 8 ++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/drivers/light_ws2811strip.h b/src/main/drivers/light_ws2811strip.h index e98e3137d7..9bdd47be3d 100644 --- a/src/main/drivers/light_ws2811strip.h +++ b/src/main/drivers/light_ws2811strip.h @@ -24,7 +24,7 @@ #include "drivers/io_types.h" -#define WS2811_LED_STRIP_LENGTH 32 +#define WS2811_LED_STRIP_LENGTH LED_MAX_STRIP_LENGTH #define WS2811_BITS_PER_LED_MAX 32 diff --git a/src/main/io/ledstrip.h b/src/main/io/ledstrip.h index e84b198dda..afa0a4c83e 100644 --- a/src/main/io/ledstrip.h +++ b/src/main/io/ledstrip.h @@ -28,7 +28,6 @@ #include "pg/pg.h" -#define LED_MAX_STRIP_LENGTH 32 #define LED_CONFIGURABLE_COLOR_COUNT 16 #define LED_MODE_COUNT 6 #define LED_DIRECTION_COUNT 6 diff --git a/src/main/target/common_pre.h b/src/main/target/common_pre.h index b0c8eed1ed..c10bfba7f6 100644 --- a/src/main/target/common_pre.h +++ b/src/main/target/common_pre.h @@ -349,6 +349,14 @@ extern uint8_t _dmaram_end__; #endif // !defined(CLOUD_BUILD) +#ifndef LED_MAX_STRIP_LENGTH + #ifdef USE_LEDSTRIP_64 + #define LED_MAX_STRIP_LENGTH 64 + #else + #define LED_MAX_STRIP_LENGTH 32 + #endif +#endif // #ifndef LED_MAX_STRIP_LENGTH + #if defined(USE_SDCARD) #define USE_SDCARD_SPI #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) diff --git a/src/test/unit/platform.h b/src/test/unit/platform.h index dec45fa176..2a01524310 100644 --- a/src/test/unit/platform.h +++ b/src/test/unit/platform.h @@ -43,6 +43,14 @@ #define USE_SERVOS #define USE_TRANSPONDER +#ifndef LED_MAX_STRIP_LENGTH + #ifdef USE_LEDSTRIP_64 + #define LED_MAX_STRIP_LENGTH 64 + #else + #define LED_MAX_STRIP_LENGTH 32 + #endif +#endif // #ifndef LED_MAX_STRIP_LENGTH + typedef enum { Mode_TEST = 0x0,