Reactive LED fixes (#1116)

Fixed issue with reactive LEDs not using all configurable LEDs. Added 2 extra LED slots bringing the count to 10.
OpenStickCommunity · Aug 14, 2024 · 90a875c · 90a875c
1 parent 362e23e
commit 90a875c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/headers/addons/reactiveleds.h b/headers/addons/reactiveleds.h
@@ -8,7 +8,7 @@
 #endif
 
 #ifndef REACTIVE_LED_COUNT
-#define REACTIVE_LED_COUNT 8
+#define REACTIVE_LED_COUNT 10
 #endif
 
 #ifndef REACTIVE_LED_DELAY

diff --git a/proto/config.proto b/proto/config.proto
@@ -761,7 +761,7 @@ message ReactiveLEDInfo
 message ReactiveLEDOptions
 {
     optional bool enabled = 1;
-    repeated ReactiveLEDInfo leds = 2 [(nanopb).max_count = 8];
+    repeated ReactiveLEDInfo leds = 2 [(nanopb).max_count = 10];
 }
 
 message AddonOptions

diff --git a/src/addons/reactiveleds.cpp b/src/addons/reactiveleds.cpp
@@ -8,7 +8,7 @@
 bool ReactiveLEDAddon::available() {
     bool pinsEnabled = false;
     const ReactiveLEDOptions& options = Storage::getInstance().getAddonOptions().reactiveLEDOptions;
-    for (uint8_t led = 0; led < sizeof(REACTIVE_LED_COUNT); led++) {
+    for (uint8_t led = 0; led < REACTIVE_LED_COUNT; led++) {
         if (isValidPin(options.leds[led].pin)) {
             pinsEnabled = true;
             break;
@@ -20,7 +20,7 @@ bool ReactiveLEDAddon::available() {
 void ReactiveLEDAddon::setup() {
     const ReactiveLEDOptions& options = Storage::getInstance().getAddonOptions().reactiveLEDOptions;
 
-    for (uint8_t led = 0; led < sizeof(REACTIVE_LED_COUNT); led++) {
+    for (uint8_t led = 0; led < REACTIVE_LED_COUNT; led++) {
         ReactiveLEDInfo ledInfo = options.leds[led];
 
         ledPins[led].pinNumber = ledInfo.pin;
@@ -48,7 +48,7 @@ void ReactiveLEDAddon::process() {
 
     uint32_t currUpdate = to_ms_since_boot(get_absolute_time());
 
-    for (uint8_t led = 0; led < sizeof(REACTIVE_LED_COUNT); led++) {
+    for (uint8_t led = 0; led < REACTIVE_LED_COUNT; led++) {
         if (isValidPin(ledPins[led].pinNumber) && ledPins[led].action != GpioAction::NONE) {
             ledPins[led].currUpdate = currUpdate;
             switch (ledPins[led].action) {

diff --git a/src/configs/webconfig.cpp b/src/configs/webconfig.cpp
@@ -1348,7 +1348,7 @@ std::string getReactiveLEDs()
     DynamicJsonDocument doc(LWIP_HTTPD_POST_MAX_PAYLOAD_LEN);
     ReactiveLEDInfo* ledInfo = Storage::getInstance().getAddonOptions().reactiveLEDOptions.leds;
 
-    for (uint16_t led = 0; led < 8; led++) {
+    for (uint16_t led = 0; led < 10; led++) {
         writeDoc(doc, "leds", led, "pin", ledInfo[led].pin);
         writeDoc(doc, "leds", led, "action", ledInfo[led].action);
         writeDoc(doc, "leds", led, "modeDown", ledInfo[led].modeDown);
@@ -1364,13 +1364,13 @@ std::string setReactiveLEDs()
 
     ReactiveLEDInfo* ledInfo = Storage::getInstance().getAddonOptions().reactiveLEDOptions.leds;
 
-    for (uint16_t led = 0; led < 8; led++) {
+    for (uint16_t led = 0; led < 10; led++) {
         ledInfo[led].pin = doc["leds"][led]["pin"];
         ledInfo[led].action = doc["leds"][led]["action"];
         ledInfo[led].modeDown = doc["leds"][led]["modeDown"];
         ledInfo[led].modeUp = doc["leds"][led]["modeUp"];
     }
-    Storage::getInstance().getAddonOptions().reactiveLEDOptions.leds_count = 8;
+    Storage::getInstance().getAddonOptions().reactiveLEDOptions.leds_count = 10;
 
     Storage::getInstance().save();
 

diff --git a/www/server/app.js b/www/server/app.js
@@ -743,6 +743,8 @@ app.get('/api/getReactiveLEDs', (req, res) => {
 			{ pin: -1, action: -10, modeDown: 1, modeUp: 0 },
 			{ pin: -1, action: -10, modeDown: 1, modeUp: 0 },
 			{ pin: -1, action: -10, modeDown: 1, modeUp: 0 },
+			{ pin: -1, action: -10, modeDown: 1, modeUp: 0 },
+			{ pin: -1, action: -10, modeDown: 1, modeUp: 0 },
 		],
 	});
 });