From 4b6efb76266d610fbdb10a162d3d2e7865a64cd2 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Mon, 15 May 2023 21:07:43 +0200 Subject: [PATCH] fixed builds for non-rgb-led-equipped boards --- ESP32_AP-Flasher/src/leds.cpp | 34 +++++++++++++++++----------------- ESP32_AP-Flasher/src/main.cpp | 4 +++- ESP32_AP-Flasher/src/web.cpp | 4 +++- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/ESP32_AP-Flasher/src/leds.cpp b/ESP32_AP-Flasher/src/leds.cpp index b351fe3d..b487ff79 100644 --- a/ESP32_AP-Flasher/src/leds.cpp +++ b/ESP32_AP-Flasher/src/leds.cpp @@ -190,6 +190,23 @@ void rgbIdleStep() { showRGB(); } } + +void setBrightness(int brightness) { + maxledbrightness = brightness; +#ifdef HAS_RGB_LED + FastLED.setBrightness(maxledbrightness); +#endif +} + +void updateBrightnessFromConfig() { + if (APconfig["ledbrightness"].as() != 0) { + int newbrightness = APconfig["ledbrightness"].as(); + if (newbrightness < 0) newbrightness = 0; + if (newbrightness != maxledbrightness) { + setBrightness(newbrightness); + } + } +} #endif void addToMonoQueue(struct ledInstruction* mono) { @@ -237,23 +254,6 @@ void monoIdleStep() { } } -void setBrightness(int brightness) { - maxledbrightness = brightness; -#ifdef HAS_RGB_LED - FastLED.setBrightness(maxledbrightness); -#endif -} - -void updateBrightnessFromConfig() { - if (APconfig["ledbrightness"].as() != 0) { - int newbrightness = APconfig["ledbrightness"].as(); - if (newbrightness < 0) newbrightness = 0; - if (newbrightness != maxledbrightness) { - setBrightness(newbrightness); - } - } -} - void ledTask(void* parameter) { #ifdef HAS_RGB_LED FastLED.addLeds(leds, 1); // GRB ordering is typical diff --git a/ESP32_AP-Flasher/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp index 30dfac9d..f7dbb5e0 100644 --- a/ESP32_AP-Flasher/src/main.cpp +++ b/ESP32_AP-Flasher/src/main.cpp @@ -41,7 +41,7 @@ void setup() { // starts the led task/state machine xTaskCreate(ledTask, "ledhandler", 2000, NULL, 2, NULL); vTaskDelay(10/portTICK_PERIOD_MS); - + // show a nice pattern to indicate the AP is booting / waiting for WiFi setup #ifdef HAS_RGB_LED showColorPattern(CRGB::Aqua, CRGB::Green, CRGB::Blue); @@ -109,7 +109,9 @@ void setup() { initAPconfig(); +#ifdef HAS_RGB_LED updateBrightnessFromConfig(); +#endif init_web(); init_udp(); diff --git a/ESP32_AP-Flasher/src/web.cpp b/ESP32_AP-Flasher/src/web.cpp index e522fb33..3ccb72f6 100644 --- a/ESP32_AP-Flasher/src/web.cpp +++ b/ESP32_AP-Flasher/src/web.cpp @@ -169,7 +169,7 @@ void wsSendTaginfo(uint8_t mac[6]) { xSemaphoreGive(wsMutex); } -void wsSendAPitem(struct APlist* apitem) { +void wsSendAPitem(struct APlist *apitem) { DynamicJsonDocument doc(250); JsonObject ap = doc.createNestedObject("apitem"); @@ -313,7 +313,9 @@ void init_web() { APconfig["alias"] = request->getParam("alias", true)->value(); APconfig["channel"] = request->getParam("channel", true)->value(); APconfig["ledbrightness"] = request->getParam("ledbrightness", true)->value(); +#ifdef HAS_RGB_LED updateBrightnessFromConfig(); +#endif saveAPconfig(); setAPchannel(); }