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

Merge branch 'main' into cleanup/remove-luna

Browse source
This commit is contained in:
Daniel Öster 2024-08-31 15:03:38 +03:00 • committed by GitHub
commit c6e2ca16a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 103 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Software/Software.ino
View file

@ -26,9 +26,15 @@
#include "src/datalayer/datalayer.h" #include "src/datalayer/datalayer.h"
#ifdef WEBSERVER #ifdef WEBSERVER
#include <ESPmDNS.h>
#include "src/devboard/webserver/webserver.h" #include "src/devboard/webserver/webserver.h"
#endif #ifdef MDNSRESPONDER
#include <ESPmDNS.h>
#endif // MDNSRESONDER
#else // WEBSERVER
#ifdef MDNSRESPONDER
#error WEBSERVER needs to be enabled for MDNSRESPONDER!
#endif // MDNSRSPONDER
#endif // WEBSERVER
Preferences settings; // Store user settings Preferences settings; // Store user settings
// The current software version, shown on webserver // The current software version, shown on webserver
@ -167,7 +173,9 @@ void loop() {
void connectivity_loop(void* task_time_us) { void connectivity_loop(void* task_time_us) {
// Init // Init
init_webserver(); init_webserver();
#ifdef MDNSRESPONDER
init_mDNS(); init_mDNS();
#endif
#ifdef MQTT #ifdef MQTT
init_mqtt(); init_mqtt();
#endif #endif
@ -284,7 +292,7 @@ void core_loop(void* task_time_us) {
} }
} }
#ifdef WEBSERVER #ifdef MDNSRESPONDER
// Initialise mDNS // Initialise mDNS
void init_mDNS() { void init_mDNS() {
@ -303,7 +311,7 @@ void init_mDNS() {
MDNS.addService("battery_emulator", "tcp", 80); MDNS.addService("battery_emulator", "tcp", 80);
} }
} }
#endif #endif // MDNSRESPONDER
// Initialization functions // Initialization functions
void init_serial() { void init_serial() {

10
Software/USER_SETTINGS.cpp
View file

@ -22,15 +22,15 @@ volatile CAN_Configuration can_config = {
volatile uint8_t AccessPointEnabled = true; //Set to either true/false to enable direct wifi access point volatile uint8_t AccessPointEnabled = true; //Set to either true/false to enable direct wifi access point
std::string ssid = "REPLACE_WITH_YOUR_SSID"; // Maximum of 63 characters; std::string ssid = "REPLACE_WITH_YOUR_SSID"; // Maximum of 63 characters;
std::string password = "REPLACE_WITH_YOUR_PASSWORD"; // Minimum of 8 characters; std::string password = "REPLACE_WITH_YOUR_PASSWORD"; // Minimum of 8 characters;
const char* ssidAP = "Battery Emulator"; // Maximum of 63 characters; const char* ssidAP = "Battery Emulator"; // Maximum of 63 characters, also used for device name on web interface
const char* passwordAP = "123456789"; // Minimum of 8 characters; set to NULL if you want the access point to be open const char* passwordAP = "123456789"; // Minimum of 8 characters; set to NULL if you want the access point to be open
const uint8_t wifi_channel = 0; // Set to 0 for automatic channel selection const uint8_t wifi_channel = 0; // Set to 0 for automatic channel selection
// MQTT // MQTT
#ifdef MQTT #ifdef MQTT
const char* mqtt_user = "REDACTED"; const char* mqtt_user = "REDACTED"; // Set NULL for no username
const char* mqtt_password = "REDACTED"; const char* mqtt_password = "REDACTED"; // Set NULL for no password
#endif // USE_MQTT #endif // USE_MQTT
#endif // WEBSERVER #endif // WEBSERVER
/* Charger settings (Optional, when using generator charging) */ /* Charger settings (Optional, when using generator charging) */
volatile float CHARGER_SET_HV = 384; // Reasonably appropriate 4.0v per cell charging of a 96s pack volatile float CHARGER_SET_HV = 384; // Reasonably appropriate 4.0v per cell charging of a 96s pack

5
Software/USER_SETTINGS.h
View file

@ -54,6 +54,8 @@
//#define SERIAL_LINK_RECEIVER //Enable this line to receive battery data over RS485 pins from another Lilygo (This LilyGo interfaces with inverter) //#define SERIAL_LINK_RECEIVER //Enable this line to receive battery data over RS485 pins from another Lilygo (This LilyGo interfaces with inverter)
//#define SERIAL_LINK_TRANSMITTER //Enable this line to send battery data over RS485 pins to another Lilygo (This LilyGo interfaces with battery) //#define SERIAL_LINK_TRANSMITTER //Enable this line to send battery data over RS485 pins to another Lilygo (This LilyGo interfaces with battery)
#define WEBSERVER //Enable this line to enable WiFi, and to run the webserver. See USER_SETTINGS.cpp for the Wifi settings. #define WEBSERVER //Enable this line to enable WiFi, and to run the webserver. See USER_SETTINGS.cpp for the Wifi settings.
#define WIFIAP //Disable this line to permanently disable WIFI AP mode (make sure to hardcode ssid and password of you home wifi network). When enabled WIFI AP can still be disabled by a setting in the future.
#define MDNSRESPONDER //Enable this line to enable MDNS, allows battery monitor te be found by .local address. Requires WEBSERVER to be enabled.
#define LOAD_SAVED_SETTINGS_ON_BOOT //Enable this line to read settings stored via the webserver on boot (overrides Wifi/battery settings set below) #define LOAD_SAVED_SETTINGS_ON_BOOT //Enable this line to read settings stored via the webserver on boot (overrides Wifi/battery settings set below)
//#define FUNCTION_TIME_MEASUREMENT // Enable this to record execution times and present them in the web UI (WARNING, raises CPU load, do not use for production) //#define FUNCTION_TIME_MEASUREMENT // Enable this to record execution times and present them in the web UI (WARNING, raises CPU load, do not use for production)
@ -62,6 +64,9 @@
#define MQTT_SERVER "192.168.xxx.yyy" #define MQTT_SERVER "192.168.xxx.yyy"
#define MQTT_PORT 1883 #define MQTT_PORT 1883
/* Home Assistant options */
#define HA_AUTODISCOVERY // Enable this line to send Home Assistant autodiscovery messages. If not enabled manual configuration of Home Assitant is required
/* Event options*/ /* Event options*/
#define DUMMY_EVENT_ENABLED false //Enable this line to have a dummy event that gets logged to test the interface #define DUMMY_EVENT_ENABLED false //Enable this line to have a dummy event that gets logged to test the interface

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

@ -12,7 +12,6 @@
WiFiClient espClient; WiFiClient espClient;
PubSubClient client(espClient); PubSubClient client(espClient);
char mqtt_msg[MQTT_MSG_BUFFER_SIZE]; char mqtt_msg[MQTT_MSG_BUFFER_SIZE];
int value = 0;
static unsigned long previousMillisUpdateVal; static unsigned long previousMillisUpdateVal;
MyTimer publish_global_timer(5000); MyTimer publish_global_timer(5000);
@ -25,13 +24,17 @@ static void publish_values(void) {
publish_cell_voltages(); publish_cell_voltages();
} }
#ifdef HA_AUTODISCOVERY
static String generateCellVoltageAutoConfigTopic(int cell_number, const char* hostname) { static String generateCellVoltageAutoConfigTopic(int cell_number, const char* hostname) {
return String("homeassistant/sensor/battery-emulator_") + String(hostname) + "/cell_voltage" + String(cell_number) + return String("homeassistant/sensor/battery-emulator_") + String(hostname) + "/cell_voltage" + String(cell_number) +
"/config"; "/config";
} }
#endif // HA_AUTODISCOVERY
static void publish_cell_voltages(void) { static void publish_cell_voltages(void) {
#ifdef HA_AUTODISCOVERY
static bool mqtt_first_transmission = true; static bool mqtt_first_transmission = true;
#endif // HA_AUTODISCOVERY
static JsonDocument doc; static JsonDocument doc;
static const char* hostname = WiFi.getHostname(); static const char* hostname = WiFi.getHostname();
static String state_topic = String("battery-emulator_") + String(hostname) + "/spec_data"; static String state_topic = String("battery-emulator_") + String(hostname) + "/spec_data";
@ -40,7 +43,7 @@ static void publish_cell_voltages(void) {
if (datalayer.battery.info.number_of_cells == 0u) { if (datalayer.battery.info.number_of_cells == 0u) {
return; return;
} }
#ifdef HA_AUTODISCOVERY
if (mqtt_first_transmission == true) { if (mqtt_first_transmission == true) {
mqtt_first_transmission = false; mqtt_first_transmission = false;
String topic = "homeassistant/sensor/battery-emulator/cell_voltage"; String topic = "homeassistant/sensor/battery-emulator/cell_voltage";
@ -71,6 +74,7 @@ static void publish_cell_voltages(void) {
} }
doc.clear(); // clear after sending autoconfig doc.clear(); // clear after sending autoconfig
} else { } else {
#endif // HA_AUTODISCOVERY
// If cell voltages haven't been populated... // If cell voltages haven't been populated...
if (datalayer.battery.info.number_of_cells == 0u || if (datalayer.battery.info.number_of_cells == 0u ||
datalayer.battery.status.cell_voltages_mV[datalayer.battery.info.number_of_cells - 1] == 0u) { datalayer.battery.status.cell_voltages_mV[datalayer.battery.info.number_of_cells - 1] == 0u) {
@ -87,12 +91,15 @@ static void publish_cell_voltages(void) {
if (!mqtt_publish(state_topic.c_str(), mqtt_msg, false)) { if (!mqtt_publish(state_topic.c_str(), mqtt_msg, false)) {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("Cell voltage MQTT msg could not be sent"); Serial.println("Cell voltage MQTT msg could not be sent");
#endif #endif // DEBUG_VIA_USB
} }
doc.clear(); doc.clear();
#ifdef HA_AUTODISCOVERY
} }
#endif // HA_AUTODISCOVERY
} }
#ifdef HA_AUTODISCOVERY
struct SensorConfig { struct SensorConfig {
const char* object_id; const char* object_id;
const char* name; const char* name;
@ -117,12 +124,16 @@ SensorConfig sensorConfigs[] = {
static String generateCommonInfoAutoConfigTopic(const char* object_id, const char* hostname) { static String generateCommonInfoAutoConfigTopic(const char* object_id, const char* hostname) {
return String("homeassistant/sensor/battery-emulator_") + String(hostname) + "/" + String(object_id) + "/config"; return String("homeassistant/sensor/battery-emulator_") + String(hostname) + "/" + String(object_id) + "/config";
} }
#endif // HA_AUTODISCOVERY
static void publish_common_info(void) { static void publish_common_info(void) {
static JsonDocument doc; static JsonDocument doc;
#ifdef HA_AUTODISCOVERY
static bool mqtt_first_transmission = true; static bool mqtt_first_transmission = true;
#endif // HA_AUTODISCOVERY
static const char* hostname = WiFi.getHostname(); static const char* hostname = WiFi.getHostname();
static String state_topic = String("battery-emulator_") + String(hostname) + "/info"; static String state_topic = String("battery-emulator_") + String(hostname) + "/info";
#ifdef HA_AUTODISCOVERY
if (mqtt_first_transmission == true) { if (mqtt_first_transmission == true) {
mqtt_first_transmission = false; mqtt_first_transmission = false;
for (int i = 0; i < sizeof(sensorConfigs) / sizeof(sensorConfigs[0]); i++) { for (int i = 0; i < sizeof(sensorConfigs) / sizeof(sensorConfigs[0]); i++) {
@ -149,6 +160,7 @@ static void publish_common_info(void) {
} }
doc.clear(); doc.clear();
} else { } else {
#endif // HA_AUTODISCOVERY
doc["SOC"] = ((float)datalayer.battery.status.reported_soc) / 100.0; doc["SOC"] = ((float)datalayer.battery.status.reported_soc) / 100.0;
doc["SOC_real"] = ((float)datalayer.battery.status.real_soc) / 100.0; doc["SOC_real"] = ((float)datalayer.battery.status.real_soc) / 100.0;
doc["state_of_health"] = ((float)datalayer.battery.status.soh_pptt) / 100.0; doc["state_of_health"] = ((float)datalayer.battery.status.soh_pptt) / 100.0;
@ -167,10 +179,12 @@ static void publish_common_info(void) {
if (!mqtt_publish(state_topic.c_str(), mqtt_msg, false)) { if (!mqtt_publish(state_topic.c_str(), mqtt_msg, false)) {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("Common info MQTT msg could not be sent"); Serial.println("Common info MQTT msg could not be sent");
#endif #endif // DEBUG_VIA_USB
} }
doc.clear(); doc.clear();
#ifdef HA_AUTODISCOVERY
} }
#endif // HA_AUTODISCOVERY
} }
/* If we lose the connection, get it back */ /* If we lose the connection, get it back */
@ -178,7 +192,7 @@ static void reconnect() {
// attempt one reconnection // attempt one reconnection
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.print("Attempting MQTT connection... "); Serial.print("Attempting MQTT connection... ");
#endif #endif // DEBUG_VIA_USB
const char* hostname = WiFi.getHostname(); const char* hostname = WiFi.getHostname();
char clientId[64]; // Adjust the size as needed char clientId[64]; // Adjust the size as needed
snprintf(clientId, sizeof(clientId), "LilyGoClient-%s", hostname); snprintf(clientId, sizeof(clientId), "LilyGoClient-%s", hostname);
@ -186,13 +200,13 @@ static void reconnect() {
if (client.connect(clientId, mqtt_user, mqtt_password)) { if (client.connect(clientId, mqtt_user, mqtt_password)) {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("connected"); Serial.println("connected");
#endif #endif // DEBUG_VIA_USB
} else { } else {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.print("failed, rc="); Serial.print("failed, rc=");
Serial.print(client.state()); Serial.print(client.state());
Serial.println(" try again in 5 seconds"); Serial.println(" try again in 5 seconds");
#endif #endif // DEBUG_VIA_USB
// Wait 5 seconds before retrying // Wait 5 seconds before retrying
} }
} }
@ -201,7 +215,7 @@ void init_mqtt(void) {
client.setServer(MQTT_SERVER, MQTT_PORT); client.setServer(MQTT_SERVER, MQTT_PORT);
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("MQTT initialized"); Serial.println("MQTT initialized");
#endif #endif // DEBUG_VIA_USB
previousMillisUpdateVal = millis(); previousMillisUpdateVal = millis();
reconnect(); reconnect();

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

@ -37,12 +37,16 @@ unsigned long last_wifi_attempt_time = millis(); //init millis so wifi monitor
void init_webserver() { void init_webserver() {
// Configure WiFi // Configure WiFi
#ifdef WIFIAP
if (AccessPointEnabled) { if (AccessPointEnabled) {
WiFi.mode(WIFI_AP_STA); // Simultaneous WiFi AP and Router connection WiFi.mode(WIFI_AP_STA); // Simultaneous WiFi AP and Router connection
init_WiFi_AP(); init_WiFi_AP();
} else { } else {
WiFi.mode(WIFI_STA); // Only Router connection WiFi.mode(WIFI_STA); // Only Router connection
} }
#else
WiFi.mode(WIFI_STA); // Only Router connection
#endif // WIFIAP
init_WiFi_STA(ssid.c_str(), password.c_str(), wifi_channel); init_WiFi_STA(ssid.c_str(), password.c_str(), wifi_channel);
String content = index_html; String content = index_html;
@ -181,7 +185,7 @@ void init_webserver() {
request->send(200, "text/plain", "Updated successfully"); request->send(200, "text/plain", "Updated successfully");
}); });
#endif #endif // TEST_FAKE_BATTERY
#if defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER #if defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER
// Route for editing ChargerTargetV // Route for editing ChargerTargetV
@ -260,7 +264,7 @@ void init_webserver() {
request->send(400, "text/plain", "Bad Request"); request->send(400, "text/plain", "Bad Request");
} }
}); });
#endif #endif // defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER
// Send a GET request to <ESP_IP>/update // Send a GET request to <ESP_IP>/update
server.on("/debug", HTTP_GET, server.on("/debug", HTTP_GET,
@ -283,22 +287,24 @@ void init_webserver() {
#ifdef MQTT #ifdef MQTT
// Init MQTT // Init MQTT
init_mqtt(); init_mqtt();
#endif #endif // MQTT
} }
#ifdef WIFIAP
void init_WiFi_AP() { void init_WiFi_AP() {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("Creating Access Point: " + String(ssidAP)); Serial.println("Creating Access Point: " + String(ssidAP));
Serial.println("With password: " + String(passwordAP)); Serial.println("With password: " + String(passwordAP));
#endif #endif // DEBUG_VIA_USB
WiFi.softAP(ssidAP, passwordAP); WiFi.softAP(ssidAP, passwordAP);
IPAddress IP = WiFi.softAPIP(); IPAddress IP = WiFi.softAPIP();
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("Access Point created."); Serial.println("Access Point created.");
Serial.print("IP address: "); Serial.print("IP address: ");
Serial.println(IP); Serial.println(IP);
#endif #endif // DEBUG_VIA_USB
} }
#endif // WIFIAP
String getConnectResultString(wl_status_t status) { String getConnectResultString(wl_status_t status) {
switch (status) { switch (status) {
@ -331,7 +337,7 @@ void wifi_monitor() {
if (status != WL_CONNECTED && status != WL_IDLE_STATUS) { if (status != WL_CONNECTED && status != WL_IDLE_STATUS) {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println(getConnectResultString(status)); Serial.println(getConnectResultString(status));
#endif #endif // DEBUG_VIA_USB
if (wifi_state == INIT) { //we haven't been connected yet, try the init logic if (wifi_state == INIT) { //we haven't been connected yet, try the init logic
init_WiFi_STA(ssid.c_str(), password.c_str(), wifi_channel); init_WiFi_STA(ssid.c_str(), password.c_str(), wifi_channel);
} else { //we were connected before, try the reconnect logic } else { //we were connected before, try the reconnect logic
@ -339,7 +345,7 @@ void wifi_monitor() {
last_wifi_attempt_time = currentMillis; last_wifi_attempt_time = currentMillis;
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("WiFi not connected, trying to reconnect..."); Serial.println("WiFi not connected, trying to reconnect...");
#endif #endif // DEBUG_VIA_USB
wifi_state = RECONNECTING; wifi_state = RECONNECTING;
WiFi.reconnect(); WiFi.reconnect();
wifi_reconnect_interval = min(wifi_reconnect_interval * 2, MAX_WIFI_RETRY_INTERVAL); wifi_reconnect_interval = min(wifi_reconnect_interval * 2, MAX_WIFI_RETRY_INTERVAL);
@ -355,7 +361,7 @@ void wifi_monitor() {
Serial.print(" Signal Strength: " + String(WiFi.RSSI()) + " dBm"); Serial.print(" Signal Strength: " + String(WiFi.RSSI()) + " dBm");
Serial.println(" Channel: " + String(WiFi.channel())); Serial.println(" Channel: " + String(WiFi.channel()));
Serial.println(" Hostname: " + String(WiFi.getHostname())); Serial.println(" Hostname: " + String(WiFi.getHostname()));
#endif #endif // DEBUG_VIA_USB
} }
} }
@ -373,7 +379,7 @@ void init_WiFi_STA(const char* ssid, const char* password, const uint8_t wifi_ch
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.print("Connecting to "); Serial.print("Connecting to ");
Serial.println(ssid); Serial.println(ssid);
#endif #endif // DEBUG_VIA_USB
WiFi.begin(ssid, password, wifi_channel); WiFi.begin(ssid, password, wifi_channel);
WiFi.setAutoReconnect(true); // Enable auto reconnect WiFi.setAutoReconnect(true); // Enable auto reconnect
wl_status_t result = static_cast<wl_status_t>(WiFi.waitForConnectResult(INIT_WIFI_CONNECT_TIMEOUT)); wl_status_t result = static_cast<wl_status_t>(WiFi.waitForConnectResult(INIT_WIFI_CONNECT_TIMEOUT));
@ -408,10 +414,10 @@ String processor(const String& var) {
// Show hardware used: // Show hardware used:
#ifdef HW_LILYGO #ifdef HW_LILYGO
content += "<h4>Hardware: LilyGo T-CAN485</h4>"; content += "<h4>Hardware: LilyGo T-CAN485</h4>";
#endif #endif // HW_LILYGO
#ifdef HW_STARK #ifdef HW_STARK
content += "<h4>Hardware: Stark CMR Module</h4>"; content += "<h4>Hardware: Stark CMR Module</h4>";
#endif #endif // HW_STARK
content += "<h4>Uptime: " + uptime_formatter::getUptime() + "</h4>"; content += "<h4>Uptime: " + uptime_formatter::getUptime() + "</h4>";
#ifdef FUNCTION_TIME_MEASUREMENT #ifdef FUNCTION_TIME_MEASUREMENT
// Load information // Load information
@ -431,7 +437,7 @@ String processor(const String& var) {
content += "<h4>CAN/serial RX function timing: " + String(datalayer.system.status.time_snap_comm_us) + " us</h4>"; content += "<h4>CAN/serial RX function timing: " + String(datalayer.system.status.time_snap_comm_us) + " us</h4>";
content += "<h4>CAN TX function timing: " + String(datalayer.system.status.time_snap_cantx_us) + " us</h4>"; content += "<h4>CAN TX function timing: " + String(datalayer.system.status.time_snap_cantx_us) + " us</h4>";
content += "<h4>OTA function timing: " + String(datalayer.system.status.time_snap_ota_us) + " us</h4>"; content += "<h4>OTA function timing: " + String(datalayer.system.status.time_snap_ota_us) + " us</h4>";
#endif #endif // FUNCTION_TIME_MEASUREMENT
wl_status_t status = WiFi.status(); wl_status_t status = WiFi.status();
// Display ssid of network connected to and, if connected to the WiFi, its own IP // Display ssid of network connected to and, if connected to the WiFi, its own IP
@ -453,97 +459,97 @@ String processor(const String& var) {
content += "<h4 style='color: white;'>Inverter protocol: "; content += "<h4 style='color: white;'>Inverter protocol: ";
#ifdef BYD_CAN #ifdef BYD_CAN
content += "BYD Battery-Box Premium HVS over CAN Bus"; content += "BYD Battery-Box Premium HVS over CAN Bus";
#endif #endif // BYD_CAN
#ifdef BYD_MODBUS #ifdef BYD_MODBUS
content += "BYD 11kWh HVM battery over Modbus RTU"; content += "BYD 11kWh HVM battery over Modbus RTU";
#endif #endif // BYD_MODBUS
#ifdef PYLON_CAN #ifdef PYLON_CAN
content += "Pylontech battery over CAN bus"; content += "Pylontech battery over CAN bus";
#endif #endif // PYLON_CAN
#ifdef SERIAL_LINK_TRANSMITTER #ifdef SERIAL_LINK_TRANSMITTER
content += "Serial link to another LilyGo board"; content += "Serial link to another LilyGo board";
#endif #endif // SERIAL_LINK_TRANSMITTER
#ifdef SMA_CAN #ifdef SMA_CAN
content += "BYD Battery-Box H 8.9kWh, 7 mod over CAN bus"; content += "BYD Battery-Box H 8.9kWh, 7 mod over CAN bus";
#endif #endif // SMA_CAN
#ifdef SOFAR_CAN #ifdef SOFAR_CAN
content += "Sofar Energy Storage Inverter High Voltage BMS General Protocol (Extended Frame) over CAN bus"; content += "Sofar Energy Storage Inverter High Voltage BMS General Protocol (Extended Frame) over CAN bus";
#endif #endif // SOFAR_CAN
#ifdef SOLAX_CAN #ifdef SOLAX_CAN
content += "SolaX Triple Power LFP over CAN bus"; content += "SolaX Triple Power LFP over CAN bus";
#endif #endif // SOLAX_CAN
content += "</h4>"; content += "</h4>";
content += "<h4 style='color: white;'>Battery protocol: "; content += "<h4 style='color: white;'>Battery protocol: ";
#ifdef BMW_I3_BATTERY #ifdef BMW_I3_BATTERY
content += "BMW i3"; content += "BMW i3";
#endif #endif // BMW_I3_BATTERY
#ifdef BYD_ATTO_3_BATTERY #ifdef BYD_ATTO_3_BATTERY
content += "BYD Atto 3"; content += "BYD Atto 3";
#endif #endif // BYD_ATTO_3_BATTERY
#ifdef CHADEMO_BATTERY #ifdef CHADEMO_BATTERY
content += "Chademo V2X mode"; content += "Chademo V2X mode";
#endif #endif // CHADEMO_BATTERY
#ifdef IMIEV_CZERO_ION_BATTERY #ifdef IMIEV_CZERO_ION_BATTERY
content += "I-Miev / C-Zero / Ion Triplet"; content += "I-Miev / C-Zero / Ion Triplet";
#endif #endif // IMIEV_CZERO_ION_BATTERY
#ifdef JAGUAR_IPACE_BATTERY #ifdef JAGUAR_IPACE_BATTERY
content += "Jaguar I-PACE"; content += "Jaguar I-PACE";
#endif #endif // JAGUAR_IPACE_BATTERY
#ifdef KIA_HYUNDAI_64_BATTERY #ifdef KIA_HYUNDAI_64_BATTERY
content += "Kia/Hyundai 64kWh"; content += "Kia/Hyundai 64kWh";
#endif #endif // KIA_HYUNDAI_64_BATTERY
#ifdef KIA_E_GMP_BATTERY #ifdef KIA_E_GMP_BATTERY
content += "Kia/Hyundai EGMP platform"; content += "Kia/Hyundai EGMP platform";
#endif #endif // KIA_E_GMP_BATTERY
#ifdef KIA_HYUNDAI_HYBRID_BATTERY #ifdef KIA_HYUNDAI_HYBRID_BATTERY
content += "Kia/Hyundai Hybrid"; content += "Kia/Hyundai Hybrid";
#endif #endif // KIA_HYUNDAI_HYBRID_BATTERY
#ifdef MG_5_BATTERY #ifdef MG_5_BATTERY
content += "MG 5"; content += "MG 5";
#endif #endif // MG_5_BATTERY
#ifdef NISSAN_LEAF_BATTERY #ifdef NISSAN_LEAF_BATTERY
content += "Nissan LEAF"; content += "Nissan LEAF";
#endif #endif // NISSAN_LEAF_BATTERY
#ifdef RENAULT_KANGOO_BATTERY #ifdef RENAULT_KANGOO_BATTERY
content += "Renault Kangoo"; content += "Renault Kangoo";
#endif #endif // RENAULT_KANGOO_BATTERY
#ifdef RENAULT_ZOE_GEN1_BATTERY #ifdef RENAULT_ZOE_GEN1_BATTERY
content += "Renault Zoe Gen1 22/40"; content += "Renault Zoe Gen1 22/40";
#endif #endif // RENAULT_ZOE_GEN1_BATTERY
#ifdef RENAULT_ZOE_GEN2_BATTERY #ifdef RENAULT_ZOE_GEN2_BATTERY
content += "Renault Zoe Gen2 50"; content += "Renault Zoe Gen2 50";
#endif #endif // RENAULT_ZOE_GEN2_BATTERY
#ifdef SANTA_FE_PHEV_BATTERY #ifdef SANTA_FE_PHEV_BATTERY
content += "Santa Fe PHEV"; content += "Santa Fe PHEV";
#endif #endif // SANTA_FE_PHEV_BATTERY
#ifdef SERIAL_LINK_RECEIVER #ifdef SERIAL_LINK_RECEIVER
content += "Serial link to another LilyGo board"; content += "Serial link to another LilyGo board";
#endif #endif // SERIAL_LINK_RECEIVER
#ifdef TESLA_MODEL_3_BATTERY #ifdef TESLA_MODEL_3_BATTERY
content += "Tesla Model S/3/X/Y"; content += "Tesla Model S/3/X/Y";
#endif #endif // TESLA_MODEL_3_BATTERY
#ifdef VOLVO_SPA_BATTERY #ifdef VOLVO_SPA_BATTERY
content += "Volvo / Polestar 78kWh battery"; content += "Volvo / Polestar 78kWh battery";
#endif #endif // VOLVO_SPA_BATTERY
#ifdef TEST_FAKE_BATTERY #ifdef TEST_FAKE_BATTERY
content += "Fake battery for testing purposes"; content += "Fake battery for testing purposes";
#endif #endif // TEST_FAKE_BATTERY
#ifdef DOUBLE_BATTERY #ifdef DOUBLE_BATTERY
content += " (Double battery)"; content += " (Double battery)";
#endif #endif // DOUBLE_BATTERY
content += "</h4>"; content += "</h4>";
#if defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER #if defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER
content += "<h4 style='color: white;'>Charger protocol: "; content += "<h4 style='color: white;'>Charger protocol: ";
#ifdef CHEVYVOLT_CHARGER #ifdef CHEVYVOLT_CHARGER
content += "Chevy Volt Gen1 Charger"; content += "Chevy Volt Gen1 Charger";
#endif #endif // CHEVYVOLT_CHARGER
#ifdef NISSANLEAF_CHARGER #ifdef NISSANLEAF_CHARGER
content += "Nissan LEAF 2013-2024 PDM charger"; content += "Nissan LEAF 2013-2024 PDM charger";
#endif #endif // NISSANLEAF_CHARGER
content += "</h4>"; content += "</h4>";
#endif #endif // defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER
// Close the block // Close the block
content += "</div>"; content += "</div>";
@ -555,7 +561,7 @@ String processor(const String& var) {
#else #else
// Start a new block with a specific background color. Color changes depending on system status // Start a new block with a specific background color. Color changes depending on system status
content += "<div style='background-color: "; content += "<div style='background-color: ";
#endif #endif // DOUBLE_BATTERY
switch (led_get_color()) { switch (led_get_color()) {
case led_color::GREEN: case led_color::GREEN:
@ -716,7 +722,7 @@ String processor(const String& var) {
content += "</div>"; content += "</div>";
content += "</div>"; content += "</div>";
#endif #endif // DOUBLE_BATTERY
#if defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER #if defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER
// Start a new block with orange background color // Start a new block with orange background color
@ -756,7 +762,7 @@ String processor(const String& var) {
content += "<h4 style='color: white;'>Charger LVDC Output V: " + String(LVvol, 2) + "</h4>"; content += "<h4 style='color: white;'>Charger LVDC Output V: " + String(LVvol, 2) + "</h4>";
content += "<h4 style='color: white;'>Charger AC Input V: " + String(ACvol, 2) + " VAC</h4>"; content += "<h4 style='color: white;'>Charger AC Input V: " + String(ACvol, 2) + " VAC</h4>";
content += "<h4 style='color: white;'>Charger AC Input I: " + String(ACcur, 2) + " A</h4>"; content += "<h4 style='color: white;'>Charger AC Input I: " + String(ACcur, 2) + " A</h4>";
#endif #endif // CHEVYVOLT_CHARGER
#ifdef NISSANLEAF_CHARGER #ifdef NISSANLEAF_CHARGER
float chgPwrDC = static_cast<float>(charger_stat_HVcur * 100); float chgPwrDC = static_cast<float>(charger_stat_HVcur * 100);
charger_stat_HVcur = chgPwrDC / (datalayer.battery.status.voltage_dV / 10); // P/U=I charger_stat_HVcur = chgPwrDC / (datalayer.battery.status.voltage_dV / 10); // P/U=I
@ -769,10 +775,10 @@ String processor(const String& var) {
content += "<h4 style='color: white;'>Charger HVDC Output V: " + String(HVvol, 2) + " V</h4>"; content += "<h4 style='color: white;'>Charger HVDC Output V: " + String(HVvol, 2) + " V</h4>";
content += "<h4 style='color: white;'>Charger HVDC Output I: " + String(HVcur, 2) + " A</h4>"; content += "<h4 style='color: white;'>Charger HVDC Output I: " + String(HVcur, 2) + " A</h4>";
content += "<h4 style='color: white;'>Charger AC Input V: " + String(ACvol, 2) + " VAC</h4>"; content += "<h4 style='color: white;'>Charger AC Input V: " + String(ACvol, 2) + " VAC</h4>";
#endif #endif // NISSANLEAF_CHARGER
// Close the block // Close the block
content += "</div>"; content += "</div>";
#endif #endif // defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER
content += "<button onclick='OTA()'>Perform OTA update</button>"; content += "<button onclick='OTA()'>Perform OTA update</button>";
content += " "; content += " ";
@ -826,7 +832,7 @@ void onOTAProgress(size_t current, size_t final) {
ota_progress_millis = millis(); ota_progress_millis = millis();
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.printf("OTA Progress Current: %u bytes, Final: %u bytes\n", current, final); Serial.printf("OTA Progress Current: %u bytes, Final: %u bytes\n", current, final);
#endif #endif // DEBUG_VIA_USB
// Reset the "watchdog" // Reset the "watchdog"
ota_timeout_timer.reset(); ota_timeout_timer.reset();
} }
@ -837,11 +843,11 @@ void onOTAEnd(bool success) {
if (success) { if (success) {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("OTA update finished successfully!"); Serial.println("OTA update finished successfully!");
#endif #endif // DEBUG_VIA_USB
} else { } else {
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println("There was an error during OTA update!"); Serial.println("There was an error during OTA update!");
#endif #endif // DEBUG_VIA_USB
// If we fail without a timeout, try to restore CAN // If we fail without a timeout, try to restore CAN
ESP32Can.CANInit(); ESP32Can.CANInit();

2
Software/src/devboard/webserver/webserver.h
View file

@ -54,6 +54,7 @@ void init_webserver();
*/ */
void wifi_monitor(); void wifi_monitor();
#ifdef WIFIAP
/** /**
* @brief Initialization function that creates a WiFi Access Point. * @brief Initialization function that creates a WiFi Access Point.
* *
@ -62,6 +63,7 @@ void wifi_monitor();
* @return void * @return void
*/ */
void init_WiFi_AP(); void init_WiFi_AP();
#endif // WIFIAP
/** /**
* @brief Initialization function that connects to an existing network. * @brief Initialization function that connects to an existing network.

4
platformio.ini
View file

@ -14,8 +14,8 @@ src_dir = ./Software
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32
platform_packages= platform_packages=
framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2 framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.4
framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.4/esp32-arduino-libs-3.0.4.zip
board = esp32dev board = esp32dev
monitor_speed = 115200 monitor_speed = 115200
monitor_filters = default, time, log2file monitor_filters = default, time, log2file