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

Removed changes from webserver and fix MAX_CAN_FAILURES

Browse source
This commit is contained in:
Ole 2024-04-09 22:13:57 +02:00
parent ed1d17cc9b
commit 15c1291f90
3 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Software/src/battery/BMW-I3-BATTERY.cpp
View file

@ -16,7 +16,6 @@ static unsigned long previousMillis5000 = 0; // will store last time a 5000ms
static unsigned long previousMillis10000 = 0; // will store last time a 10000ms CAN Message was send static unsigned long previousMillis10000 = 0; // will store last time a 10000ms CAN Message was send
static uint8_t CANstillAlive = 12; // counter for checking if CAN is still alive static uint8_t CANstillAlive = 12; // counter for checking if CAN is still alive
static uint16_t CANerror = 0; // counter on how many CAN errors encountered static uint16_t CANerror = 0; // counter on how many CAN errors encountered
#define MAX_CAN_FAILURES 500 // Amount of malformed CAN messages to allow before raising a warning
#define ALIVE_MAX_VALUE 14 // BMW CAN messages contain alive counter, goes from 0...14 #define ALIVE_MAX_VALUE 14 // BMW CAN messages contain alive counter, goes from 0...14
static const uint16_t WUPonDuration = 477; // in milliseconds how long WUP should be ON after poweron static const uint16_t WUPonDuration = 477; // in milliseconds how long WUP should be ON after poweron

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

@ -529,12 +529,6 @@ String processor(const String& var) {
} else { // > 0 } else { // > 0
content += "<h4>Battery charging!</h4>"; content += "<h4>Battery charging!</h4>";
} }
#ifdef BMW_I3_BATTERY
content += "<h4>Battery Capacity cAh: " + String(battery_capacity_cah / 100.0, 2) + " Ah</h4>";
content += "<h4>Battery SOC: " + String(battery_soc / 10.0, 1) + "%%</h4>";
content += "<h4>Battery SOC hvMax: " + String(battery_soc_hvmax / 10.0, 1) + "%%</h4>";
content += "<h4>Battery SOC hvMin: " + String(battery_soc_hvmin / 10.0, 1) + "%%</h4>";
#endif
content += "<h4>Automatic contactor closing allowed:</h4>"; content += "<h4>Automatic contactor closing allowed:</h4>";
content += "<h4>Battery: "; content += "<h4>Battery: ";

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

@ -40,13 +40,6 @@ extern uint8_t LEDcolor; //Enum, 0-10
extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false
extern bool inverterAllowsContactorClosing; //Bool, 1=true, 0=false extern bool inverterAllowsContactorClosing; //Bool, 1=true, 0=false
#ifdef BMW_I3_BATTERY
extern uint16_t battery_soc;
extern uint16_t battery_soc_hvmax;
extern uint16_t battery_soc_hvmin;
extern uint16_t battery_capacity_cah;
#endif
extern const char* ssid; extern const char* ssid;
extern const char* password; extern const char* password;
extern const uint8_t wifi_channel; extern const uint8_t wifi_channel;