From cd7e0b51ea73c74dbda610a06f0502e8c6d9c290 Mon Sep 17 00:00:00 2001 From: Matt Holmes Date: Thu, 21 Aug 2025 18:13:17 +0100 Subject: [PATCH] Fixing typo and removing unused led_color enum --- Software/src/devboard/mqtt/mqtt.cpp | 2 +- Software/src/devboard/utils/events.cpp | 2 +- Software/src/devboard/utils/events.h | 2 +- Software/src/devboard/utils/led_handler.cpp | 8 -------- Software/src/devboard/utils/led_handler.h | 2 -- Software/src/devboard/utils/types.h | 1 - 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Software/src/devboard/mqtt/mqtt.cpp b/Software/src/devboard/mqtt/mqtt.cpp index 0f7ca0b3..067c2b6c 100644 --- a/Software/src/devboard/mqtt/mqtt.cpp +++ b/Software/src/devboard/mqtt/mqtt.cpp @@ -315,7 +315,7 @@ static bool publish_common_info(void) { } doc["event_level"] = get_event_level_string(get_event_level()); - doc["emulator_status"] = get_emulator_staus_string(get_emulator_status()); + doc["emulator_status"] = get_emulator_status_string(get_emulator_status()); serializeJson(doc, mqtt_msg); if (mqtt_publish(state_topic.c_str(), mqtt_msg, false) == false) { diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp index 2838cda0..92540492 100644 --- a/Software/src/devboard/utils/events.cpp +++ b/Software/src/devboard/utils/events.cpp @@ -423,7 +423,7 @@ EMULATOR_STATUS get_emulator_status() { } } -const char* get_emulator_staus_string(EMULATOR_STATUS status) { +const char* get_emulator_status_string(EMULATOR_STATUS status) { // Return the status string but skip "STATUS_" that should always be first return EMULATOR_STATUS_STRING[status] + 7; } diff --git a/Software/src/devboard/utils/events.h b/Software/src/devboard/utils/events.h index 0a9d41d5..6cfd3239 100644 --- a/Software/src/devboard/utils/events.h +++ b/Software/src/devboard/utils/events.h @@ -163,7 +163,7 @@ const char* get_event_level_string(EVENTS_LEVEL_TYPE event_level); EVENTS_LEVEL_TYPE get_event_level(void); EMULATOR_STATUS get_emulator_status(); -const char* get_emulator_staus_string(EMULATOR_STATUS status); +const char* get_emulator_status_string(EMULATOR_STATUS status); void init_events(void); void set_event_latched(EVENTS_ENUM_TYPE event, uint8_t data); diff --git a/Software/src/devboard/utils/led_handler.cpp b/Software/src/devboard/utils/led_handler.cpp index 0440723e..3bf4f765 100644 --- a/Software/src/devboard/utils/led_handler.cpp +++ b/Software/src/devboard/utils/led_handler.cpp @@ -32,10 +32,6 @@ void led_exe(void) { led->exe(); } -led_color led_get_color() { - return led->color; -} - void LED::exe(void) { // Update brightness @@ -55,19 +51,15 @@ void LED::exe(void) { // Set color switch (get_emulator_status()) { case EMULATOR_STATUS::STATUS_OK: - color = led_color::GREEN; pixels.setPixelColor(COLOR_GREEN(brightness)); // Green pulsing LED break; case EMULATOR_STATUS::STATUS_WARNING: - color = led_color::YELLOW; pixels.setPixelColor(COLOR_YELLOW(brightness)); // Yellow pulsing LED break; case EMULATOR_STATUS::STATUS_ERROR: - color = led_color::RED; pixels.setPixelColor(COLOR_RED(esp32hal->LED_MAX_BRIGHTNESS())); // Red LED full brightness break; case EMULATOR_STATUS::STATUS_UPDATING: - color = led_color::BLUE; pixels.setPixelColor(COLOR_BLUE(brightness)); // Blue pulsing LED break; } diff --git a/Software/src/devboard/utils/led_handler.h b/Software/src/devboard/utils/led_handler.h index 4d8e01ee..a28bb3a5 100644 --- a/Software/src/devboard/utils/led_handler.h +++ b/Software/src/devboard/utils/led_handler.h @@ -6,7 +6,6 @@ class LED { public: - led_color color = led_color::GREEN; LED(gpio_num_t pin, uint8_t maxBrightness) : pixels(pin), max_brightness(maxBrightness), brightness(maxBrightness), mode(led_mode_enum::CLASSIC) {} @@ -31,6 +30,5 @@ class LED { bool led_init(void); void led_exe(void); -led_color led_get_color(void); #endif // LED_H_ diff --git a/Software/src/devboard/utils/types.h b/Software/src/devboard/utils/types.h index d1e15340..45ec6034 100644 --- a/Software/src/devboard/utils/types.h +++ b/Software/src/devboard/utils/types.h @@ -21,7 +21,6 @@ enum class comm_interface { Highest }; -enum led_color { GREEN, YELLOW, RED, BLUE }; enum led_mode_enum { CLASSIC, FLOW, HEARTBEAT }; enum PrechargeState { AUTO_PRECHARGE_IDLE,