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

Wrap usb events in ifdef to reduce cpu usage

Browse source
This commit is contained in:
Daniel 2024-03-27 21:18:12 +02:00
parent 49fca8e0e0
commit 0c984d906e
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,12 +105,16 @@ void init_events(void) {
// Push changes to eeprom // Push changes to eeprom
EEPROM.commit(); EEPROM.commit();
#ifdef DEBUG_VIA_USB
Serial.println("EEPROM wasn't ready"); Serial.println("EEPROM wasn't ready");
#endif
} else { } else {
events.event_log_head_index = EEPROM.readUShort(EE_EVENT_LOG_HEAD_INDEX_ADDRESS); events.event_log_head_index = EEPROM.readUShort(EE_EVENT_LOG_HEAD_INDEX_ADDRESS);
events.event_log_tail_index = EEPROM.readUShort(EE_EVENT_LOG_TAIL_INDEX_ADDRESS); events.event_log_tail_index = EEPROM.readUShort(EE_EVENT_LOG_TAIL_INDEX_ADDRESS);
#ifdef DEBUG_VIA_USB
Serial.println("EEPROM was initialized for event logging"); Serial.println("EEPROM was initialized for event logging");
Serial.println("head: " + String(events.event_log_head_index) + ", tail: " + String(events.event_log_tail_index)); Serial.println("head: " + String(events.event_log_head_index) + ", tail: " + String(events.event_log_tail_index));
#endif
print_event_log(); print_event_log();
} }
@ -121,6 +125,7 @@ void init_events(void) {
events.entries[i].log = true; events.entries[i].log = true;
} }
events.entries[EVENT_CAN_OVERRUN].level = EVENT_LEVEL_INFO;
events.entries[EVENT_CAN_RX_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_CAN_RX_FAILURE].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_CAN_RX_WARNING].level = EVENT_LEVEL_WARNING; events.entries[EVENT_CAN_RX_WARNING].level = EVENT_LEVEL_WARNING;
events.entries[EVENT_CAN_TX_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_CAN_TX_FAILURE].level = EVENT_LEVEL_ERROR;
@ -178,6 +183,8 @@ void clear_event(EVENTS_ENUM_TYPE event) {
const char* get_event_message_string(EVENTS_ENUM_TYPE event) { const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
switch (event) { switch (event) {
case EVENT_CAN_OVERRUN:
return "CAN message failed to send within defined time. Contact developers, CPU load might be too high.";
case EVENT_CAN_RX_FAILURE: case EVENT_CAN_RX_FAILURE:
return "No CAN communication detected for 60s. Shutting down battery control."; return "No CAN communication detected for 60s. Shutting down battery control.";
case EVENT_CAN_RX_WARNING: case EVENT_CAN_RX_WARNING:
@ -365,7 +372,9 @@ static void log_event(EVENTS_ENUM_TYPE event, uint8_t data) {
static void print_event_log(void) { static void print_event_log(void) {
// If the head actually points to the tail, the log is probably blank // If the head actually points to the tail, the log is probably blank
if (events.event_log_head_index == events.event_log_tail_index) { if (events.event_log_head_index == events.event_log_tail_index) {
#ifdef DEBUG_VIA_USB
Serial.println("No events in log"); Serial.println("No events in log");
#endif
return; return;
} }
EVENT_LOG_ENTRY_TYPE entry; EVENT_LOG_ENTRY_TYPE entry;
@ -380,9 +389,10 @@ static void print_event_log(void) {
// The entry is a blank that has been left behind somehow // The entry is a blank that has been left behind somehow
continue; continue;
} }
#ifdef DEBUG_VIA_USB
Serial.println("Event: " + String(get_event_enum_string(entry.event)) + ", data: " + String(entry.data) + Serial.println("Event: " + String(get_event_enum_string(entry.event)) + ", data: " + String(entry.data) +
", time: " + String(entry.timestamp)); ", time: " + String(entry.timestamp));
#endif
if (index == events.event_log_head_index) { if (index == events.event_log_head_index) {
break; break;
} }

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

@ -28,6 +28,7 @@
*/ */
#define EVENTS_ENUM_TYPE(XX) \ #define EVENTS_ENUM_TYPE(XX) \
XX(EVENT_CAN_OVERRUN) \
XX(EVENT_CAN_RX_FAILURE) \ XX(EVENT_CAN_RX_FAILURE) \
XX(EVENT_CAN_RX_WARNING) \ XX(EVENT_CAN_RX_WARNING) \
XX(EVENT_CAN_TX_FAILURE) \ XX(EVENT_CAN_TX_FAILURE) \

2
Software/src/devboard/webserver/events_html.cpp
View file

@ -22,10 +22,12 @@ String events_processor(const String& var) {
for (int i = 0; i < EVENT_NOF_EVENTS; i++) { for (int i = 0; i < EVENT_NOF_EVENTS; i++) {
event_pointer = get_event_pointer((EVENTS_ENUM_TYPE)i); event_pointer = get_event_pointer((EVENTS_ENUM_TYPE)i);
EVENTS_ENUM_TYPE event_handle = static_cast<EVENTS_ENUM_TYPE>(i); EVENTS_ENUM_TYPE event_handle = static_cast<EVENTS_ENUM_TYPE>(i);
#ifdef DEBUG_VIA_USB
Serial.println("Event: " + String(get_event_enum_string(event_handle)) + Serial.println("Event: " + String(get_event_enum_string(event_handle)) +
" count: " + String(event_pointer->occurences) + " seconds: " + String(event_pointer->timestamp) + " count: " + String(event_pointer->occurences) + " seconds: " + String(event_pointer->timestamp) +
" data: " + String(event_pointer->data) + " data: " + String(event_pointer->data) +
" level: " + String(get_event_level_string(event_handle))); " level: " + String(get_event_level_string(event_handle)));
#endif
if (event_pointer->occurences > 0) { if (event_pointer->occurences > 0) {
content.concat("<div class='event'>"); content.concat("<div class='event'>");
content.concat("<div>" + String(get_event_enum_string(event_handle)) + "</div>"); content.concat("<div>" + String(get_event_enum_string(event_handle)) + "</div>");