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

trying to be more efficient...

Browse source
This commit is contained in:
Brett Christensen 2024-02-09 11:58:42 +11:00
parent 9f68296f5f
commit a928ed1cea
3 changed files with 53 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,21 @@ static void update_led_color(EVENTS_ENUM_TYPE event) {
total_led_color = (total_led_color == RED) ? RED : entries[event].led_color; total_led_color = (total_led_color == RED) ? RED : entries[event].led_color;
} }
const char* get_led_color_display_text(u_int8_t led_color) {
switch (led_color) {
case RED:
return "RED";
case YELLOW:
return "YELLOW";
case GREEN:
return "GREEN";
case BLUE:
return "BLUE";
default:
return "UNKNOWN";
}
}
const char* get_event_message(EVENTS_ENUM_TYPE event) { const char* get_event_message(EVENTS_ENUM_TYPE event) {
switch (event) { switch (event) {
case EVENT_CAN_FAILURE: case EVENT_CAN_FAILURE:

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

@ -42,6 +42,8 @@ const char* get_event_enum_string(EVENTS_ENUM_TYPE event);
const char* get_event_message(EVENTS_ENUM_TYPE event); const char* get_event_message(EVENTS_ENUM_TYPE event);
const char* get_led_color_display_text(u_int8_t led_color);
void init_events(void); void init_events(void);
void set_event(EVENTS_ENUM_TYPE event, uint8_t data); void set_event(EVENTS_ENUM_TYPE event, uint8_t data);
void update_event_timestamps(void); void update_event_timestamps(void);

66
Software/src/devboard/webserver/webserver.cpp
View file

@ -385,6 +385,7 @@ String processor(const String& var) {
content += "<h4>IP: " + WiFi.localIP().toString() + "</h4>"; content += "<h4>IP: " + WiFi.localIP().toString() + "</h4>";
// Get and display the signal strength (RSSI) // Get and display the signal strength (RSSI)
content += "<h4>Signal Strength: " + String(WiFi.RSSI()) + " dBm</h4>"; content += "<h4>Signal Strength: " + String(WiFi.RSSI()) + " dBm</h4>";
content += "<h4>Channel: " + String(WiFi.channel()) + "</h4>";
} }
// Close the block // Close the block
content += "</div>"; content += "</div>";
@ -941,42 +942,47 @@ String cellmonitor_processor(const String& var) {
return String(); return String();
} }
const char EVENTS_HTML_START[] PROGMEM = R"=====(
<style>
body { background-color: black; color: white; }
table { width: 100%; border-collapse: collapse; }
th, td { border: 1px solid white; padding: 10px; text-align: left; }
</style>
<div style='background-color: #303E47; padding: 10px; margin-bottom: 10px;border-radius: 50px'>
<h4 style='color: white;'>Event log:</h4>
<table>
<tr><th>Event Type</th><th>LED Color</th><th>Last Event (seconds ago)</th><th>Count</th><th>Data</th><th>Message</th></tr>
)=====";
const char EVENTS_HTML_END[] PROGMEM = R"=====(
</table>
</div>
<button onclick='goToMainPage()'>Back to main page</button>
<script>
function goToMainPage() {
window.location.href = '/';
}
</script>
)=====";
String events_processor(const String& var) { String events_processor(const String& var) {
if (var == "PLACEHOLDER") { if (var == "PLACEHOLDER") {
String content = ""; String content = "";
content.reserve(5000);
// Page format // Page format
content += "<style>"; content.concat(FPSTR(EVENTS_HTML_START));
content += "body { background-color: black; color: white; }";
content += "table { width: 100%; border-collapse: collapse; }";
content += "th, td { border: 1px solid white; padding: 10px; text-align: left; }";
content += "</style>";
// Start a new block with a specific background color
content += "<div style='background-color: #303E47; padding: 10px; margin-bottom: 10px;border-radius: 50px'>";
//iterate through entries and display count, time and event
content += "<h4 style='color: white;'>Event log:</h4>";
content += "<table>";
content += "<tr><th>Event Type</th><th>LED Color</th><th>Last Event (seconds ago)</th><th>Count</th><th>Data</th><th>Message</th></tr>";
for(int i = 0; i < EVENT_NOF_EVENTS; i++) { for(int i = 0; i < EVENT_NOF_EVENTS; i++) {
content += "<tr>"; if (entries[i].occurences > 0) {
content += "<td>" + String(get_event_enum_string(static_cast<EVENTS_ENUM_TYPE>(i))) + "</td>"; content.concat("<tr>");
content += "<td>" + String(entries[i].led_color) + "</td>"; content.concat("<td>" + String(get_event_enum_string(static_cast<EVENTS_ENUM_TYPE>(i))) + "</td>");
content += "<td>" + String((millis() / 1000) - entries[i].timestamp) + "</td>"; content.concat("<td>" + String(get_led_color_display_text(entries[i].led_color)) + "</td>");
content += "<td>" + String(entries[i].occurences) + "</td>"; content.concat("<td>" + String((millis() / 1000) - entries[i].timestamp) + "</td>");
content += "<td>" + String(entries[i].data) + "</td>"; content.concat("<td>" + String(entries[i].occurences) + "</td>");
content += "<td>" + String(get_event_message(static_cast<EVENTS_ENUM_TYPE>(i))) + "</td>"; content.concat("<td>" + String(entries[i].data) + "</td>");
content += "</tr>"; content.concat("<td>" + String(get_event_message(static_cast<EVENTS_ENUM_TYPE>(i))) + "</td>");
content.concat("</tr>");
} }
content += "</table>"; }
content.concat(FPSTR(EVENTS_HTML_END));
// Close the block
content += "</div>";
content += "<button onclick='goToMainPage()'>Back to main page</button>";
content += "<script>";
content += "function goToMainPage() { window.location.href = '/'; }";
content += "</script>";
return content; return content;
} }
return String(); return String();