yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 09:49:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixing typo and removing unused led_color enum

Browse source
This commit is contained in:
Matt Holmes 2025-08-21 18:13:17 +01:00
parent d4f0e188fe
commit cd7e0b51ea
6 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Software/src/devboard/mqtt/mqtt.cpp
View file

@ -315,7 +315,7 @@ static bool publish_common_info(void) {
} }
doc["event_level"] = get_event_level_string(get_event_level()); 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); serializeJson(doc, mqtt_msg);
if (mqtt_publish(state_topic.c_str(), mqtt_msg, false) == false) { if (mqtt_publish(state_topic.c_str(), mqtt_msg, false) == false) {

2
Software/src/devboard/utils/events.cpp
View file

@ -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 the status string but skip "STATUS_" that should always be first
return EMULATOR_STATUS_STRING[status] + 7; return EMULATOR_STATUS_STRING[status] + 7;
} }

2
Software/src/devboard/utils/events.h
View file

@ -163,7 +163,7 @@ const char* get_event_level_string(EVENTS_LEVEL_TYPE event_level);
EVENTS_LEVEL_TYPE get_event_level(void); EVENTS_LEVEL_TYPE get_event_level(void);
EMULATOR_STATUS get_emulator_status(); 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 init_events(void);
void set_event_latched(EVENTS_ENUM_TYPE event, uint8_t data); void set_event_latched(EVENTS_ENUM_TYPE event, uint8_t data);

8
Software/src/devboard/utils/led_handler.cpp
View file

@ -32,10 +32,6 @@ void led_exe(void) {
led->exe(); led->exe();
} }
led_color led_get_color() {
return led->color;
}
void LED::exe(void) { void LED::exe(void) {
// Update brightness // Update brightness
@ -55,19 +51,15 @@ void LED::exe(void) {
// Set color // Set color
switch (get_emulator_status()) { switch (get_emulator_status()) {
case EMULATOR_STATUS::STATUS_OK: case EMULATOR_STATUS::STATUS_OK:
color = led_color::GREEN;
pixels.setPixelColor(COLOR_GREEN(brightness)); // Green pulsing LED pixels.setPixelColor(COLOR_GREEN(brightness)); // Green pulsing LED
break; break;
case EMULATOR_STATUS::STATUS_WARNING: case EMULATOR_STATUS::STATUS_WARNING:
color = led_color::YELLOW;
pixels.setPixelColor(COLOR_YELLOW(brightness)); // Yellow pulsing LED pixels.setPixelColor(COLOR_YELLOW(brightness)); // Yellow pulsing LED
break; break;
case EMULATOR_STATUS::STATUS_ERROR: case EMULATOR_STATUS::STATUS_ERROR:
color = led_color::RED;
pixels.setPixelColor(COLOR_RED(esp32hal->LED_MAX_BRIGHTNESS())); // Red LED full brightness pixels.setPixelColor(COLOR_RED(esp32hal->LED_MAX_BRIGHTNESS())); // Red LED full brightness
break; break;
case EMULATOR_STATUS::STATUS_UPDATING: case EMULATOR_STATUS::STATUS_UPDATING:
color = led_color::BLUE;
pixels.setPixelColor(COLOR_BLUE(brightness)); // Blue pulsing LED pixels.setPixelColor(COLOR_BLUE(brightness)); // Blue pulsing LED
break; break;
} }

2
Software/src/devboard/utils/led_handler.h
View file

@ -6,7 +6,6 @@
class LED { class LED {
public: public:
led_color color = led_color::GREEN;
LED(gpio_num_t pin, uint8_t maxBrightness) LED(gpio_num_t pin, uint8_t maxBrightness)
: pixels(pin), max_brightness(maxBrightness), brightness(maxBrightness), mode(led_mode_enum::CLASSIC) {} : pixels(pin), max_brightness(maxBrightness), brightness(maxBrightness), mode(led_mode_enum::CLASSIC) {}
@ -31,6 +30,5 @@ class LED {
bool led_init(void); bool led_init(void);
void led_exe(void); void led_exe(void);
led_color led_get_color(void);
#endif // LED_H_ #endif // LED_H_

1
Software/src/devboard/utils/types.h
View file

@ -21,7 +21,6 @@ enum class comm_interface {
Highest Highest
}; };
enum led_color { GREEN, YELLOW, RED, BLUE };
enum led_mode_enum { CLASSIC, FLOW, HEARTBEAT }; enum led_mode_enum { CLASSIC, FLOW, HEARTBEAT };
enum PrechargeState { enum PrechargeState {
AUTO_PRECHARGE_IDLE, AUTO_PRECHARGE_IDLE,