feat(visual): replace LED managers with LEDC-driven drivers (#435)

hhvrc · web-flow · commit 902487281be7 · 2026-03-26T22:58:32.000+01:00
diff --git a/.changeset/smooth-leds-dance.md b/.changeset/smooth-leds-dance.md
@@ -0,0 +1,5 @@
+---
+'firmware': minor
+---
+
+feat(visual): Replace LED managers with LEDC-driven drivers, enabling hardware PWM brightness control on mono LEDs
diff --git a/include/serial/command_handlers/index.h b/include/serial/command_handlers/index.h
@@ -21,6 +21,7 @@ namespace OpenShock::Serial::CommandHandlers {
   OpenShock::Serial::CommandGroup RawConfigHandler();
   OpenShock::Serial::CommandGroup RfTransmitHandler();
   OpenShock::Serial::CommandGroup FactoryResetHandler();
+  OpenShock::Serial::CommandGroup LedTestHandler();
 
   inline std::vector<OpenShock::Serial::CommandGroup> AllCommandHandlers()
   {
@@ -41,6 +42,7 @@ namespace OpenShock::Serial::CommandHandlers {
       RawConfigHandler(),
       RfTransmitHandler(),
       FactoryResetHandler(),
+      LedTestHandler(),
     };
   }
 }  // namespace OpenShock::Serial::CommandHandlers
diff --git a/include/visual/MonoLedDriver.h b/include/visual/MonoLedDriver.h
@@ -12,19 +12,19 @@
 #include <vector>
 
 namespace OpenShock {
-  class PinPatternManager {
-    DISABLE_DEFAULT(PinPatternManager);
-    DISABLE_COPY(PinPatternManager);
-    DISABLE_MOVE(PinPatternManager);
+  class MonoLedDriver {
+    DISABLE_DEFAULT(MonoLedDriver);
+    DISABLE_COPY(MonoLedDriver);
+    DISABLE_MOVE(MonoLedDriver);
 
   public:
     struct State {
       bool level;
       uint32_t duration;
     };
 
-    PinPatternManager(gpio_num_t gpioPin);
-    ~PinPatternManager();
+    MonoLedDriver(gpio_num_t gpioPin);
+    ~MonoLedDriver();
 
     bool IsValid() const { return m_gpioPin != GPIO_NUM_NC; }
 
@@ -36,11 +36,14 @@ namespace OpenShock {
     }
     void ClearPattern();
 
+    void SetBrightness(uint8_t brightness);
+
   private:
     void ClearPatternInternal();
     void RunPattern();
 
     gpio_num_t m_gpioPin;
+    uint8_t m_brightness;
     std::vector<State> m_pattern;
     TaskHandle_t m_taskHandle;
     SimpleMutex m_taskMutex;
diff --git a/include/visual/RgbLedDriver.h b/include/visual/RgbLedDriver.h
@@ -14,14 +14,14 @@
 #include <vector>
 
 namespace OpenShock {
-  class RGBPatternManager {
-    DISABLE_DEFAULT(RGBPatternManager);
-    DISABLE_COPY(RGBPatternManager);
-    DISABLE_MOVE(RGBPatternManager);
+  class RgbLedDriver {
+    DISABLE_DEFAULT(RgbLedDriver);
+    DISABLE_COPY(RgbLedDriver);
+    DISABLE_MOVE(RgbLedDriver);
 
   public:
-    RGBPatternManager(gpio_num_t gpioPin);
-    ~RGBPatternManager();
+    RgbLedDriver(gpio_num_t gpioPin);
+    ~RgbLedDriver();
 
     bool IsValid() const { return m_gpioPin != GPIO_NUM_NC; }
 
@@ -38,12 +38,13 @@ namespace OpenShock {
     {
       SetPattern(pattern, N);
     }
-    void SetBrightness(uint8_t brightness);
     void ClearPattern();
 
+    void SetBrightness(uint8_t brightness);
+
   private:
     void ClearPatternInternal();
-    static void RunPattern(void* arg);
+    void RunPattern();
 
     gpio_num_t m_gpioPin;
     uint8_t m_brightness;  // 0-255
diff --git a/include/visual/VisualStateManager.h b/include/visual/VisualStateManager.h
@@ -8,4 +8,7 @@ namespace OpenShock::VisualStateManager {
 
   void SetCriticalError();
   void SetScanningStarted();
+
+  /// Cycles through all LED patterns for visual verification. Blocks for ~20s.
+  void RunLedTest();
 }  // namespace OpenShock::VisualStateManager
diff --git a/platformio.ini b/platformio.ini
@@ -105,7 +105,8 @@ custom_openshock.chip = ESP32-S3
 custom_openshock.flash_size = 4MB
 build_flags = ${env.build_flags}
 	-DOPENSHOCK_LED_WS2812B=47
-	-DOPENSHOCK_LED_FLIP_RG_CHANNELS=1
+	-DOPENSHOCK_LED_SWAP_RG_CHANNELS=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
 
 ; https://www.waveshare.com/wiki/ESP32-S3-Zero
 [env:Waveshare_esp32_s3_zero]
@@ -115,7 +116,8 @@ custom_openshock.flash_size = 4MB
 build_flags = ${env.build_flags}
 	-DOPENSHOCK_RF_TX_GPIO=1
 	-DOPENSHOCK_LED_WS2812B=21
-	-DOPENSHOCK_LED_FLIP_RG_CHANNELS=1
+	-DOPENSHOCK_LED_SWAP_RG_CHANNELS=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
 
 [env:Pishock-2023]
 board = Wemos-D1-Mini-ESP32 ; override
diff --git a/schemas b/schemas
@@ -1 +1 @@
-Subproject commit 94ee44ad59c0ec77506a5d17e1603666a5d2e6ff
+Subproject commit 5a234f361c962d42ef215b0a927a117502ba910b
diff --git a/src/GatewayClient.cpp b/src/GatewayClient.cpp
@@ -10,7 +10,7 @@ const char* const TAG = "GatewayClient";
 #include "message_handlers/WebSocket.h"
 #include "OtaUpdateManager.h"
 #include "serialization/WSGateway.h"
-#include "VisualStateManager.h"
+#include "visual/VisualStateManager.h"
 
 using namespace OpenShock;
 
diff --git a/src/GatewayConnectionManager.cpp b/src/GatewayConnectionManager.cpp
@@ -2,7 +2,7 @@
 
 const char* const TAG = "GatewayConnectionManager";
 
-#include "VisualStateManager.h"
+#include "visual/VisualStateManager.h"
 
 #include "captiveportal/Manager.h"
 #include "config/Config.h"
diff --git a/src/PinPatternManager.cpp b/src/PinPatternManager.cpp
diff --git a/src/main.cpp b/src/main.cpp
@@ -13,7 +13,7 @@ const char* const TAG = "main";
 #include "OtaUpdateManager.h"
 #include "serial/SerialInputHandler.h"
 #include "util/TaskUtils.h"
-#include "VisualStateManager.h"
+#include "visual/VisualStateManager.h"
 #include "wifi/WiFiManager.h"
 #include "wifi/WiFiScanManager.h"
 
diff --git a/src/serial/command_handlers/ledtest.cpp b/src/serial/command_handlers/ledtest.cpp
@@ -0,0 +1,24 @@
+#include "serial/command_handlers/common.h"
+
+#include "visual/VisualStateManager.h"
+
+void _handleSerialLedTestCommand(std::string_view arg, bool isAutomated)
+{
+  (void)arg;
+  (void)isAutomated;
+
+  SERPR_RESPONSE("LedTest|Starting LED test (~24s)...");
+
+  OpenShock::VisualStateManager::RunLedTest();
+
+  SERPR_SUCCESS("LedTest|Complete");
+}
+
+OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::LedTestHandler()
+{
+  auto group = OpenShock::Serial::CommandGroup("ledtest"sv);
+
+  group.addCommand("Cycle through all LED patterns for visual verification"sv, _handleSerialLedTestCommand);
+
+  return group;
+}
diff --git a/src/visual/MonoLedDriver.cpp b/src/visual/MonoLedDriver.cpp
diff --git a/src/visual/RgbLedDriver.cpp b/src/visual/RgbLedDriver.cpp
diff --git a/src/visual/VisualStateManager.cpp b/src/visual/VisualStateManager.cpp
diff --git a/src/wifi/WiFiManager.cpp b/src/wifi/WiFiManager.cpp

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'firmware': minor
 +---
++
 +feat(visual): Replace LED managers with LEDC-driven drivers, enabling hardware PWM brightness control on mono LEDs
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ namespace OpenShock::Serial::CommandHandlers {`
`21`	`21`	`OpenShock::Serial::CommandGroup RawConfigHandler();`
`22`	`22`	`OpenShock::Serial::CommandGroup RfTransmitHandler();`
`23`	`23`	`OpenShock::Serial::CommandGroup FactoryResetHandler();`
	`24`	`+ OpenShock::Serial::CommandGroup LedTestHandler();`
`24`	`25`
`25`	`26`	`inline std::vector<OpenShock::Serial::CommandGroup> AllCommandHandlers()`
`26`	`27`	`{`
`@@ -41,6 +42,7 @@ namespace OpenShock::Serial::CommandHandlers {`
`41`	`42`	`RawConfigHandler(),`
`42`	`43`	`RfTransmitHandler(),`
`43`	`44`	`FactoryResetHandler(),`
	`45`	`+ LedTestHandler(),`
`44`	`46`	`};`
`45`	`47`	`}`
`46`	`48`	`} // namespace OpenShock::Serial::CommandHandlers`