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

Merge branch 'main' into feature/checkbox-settings

Browse source
This commit is contained in:
Daniel Öster 2024-02-29 23:24:17 +02:00 • committed by GitHub
commit 511638944d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Software/Software.ino
View file

@ -23,7 +23,7 @@
#endif #endif
Preferences settings; // Store user settings Preferences settings; // Store user settings
const char* version_number = "5.4.dev"; //The current software version, shown on webserver const char* version_number = "5.4.dev"; // The current software version, shown on webserver
// Interval settings // Interval settings
int intervalUpdateValues = 4800; // Interval at which to update inverter values / Modbus registers int intervalUpdateValues = 4800; // Interval at which to update inverter values / Modbus registers
const int interval10 = 10; // Interval for 10ms tasks const int interval10 = 10; // Interval for 10ms tasks

32
Software/src/devboard/webserver/settings_html.cpp
View file

@ -73,11 +73,21 @@ String settings_processor(const String& var) {
#endif #endif
content += "<script>"; content += "<script>";
content += "function editComplete() {";
content += " if (this.status == 200) {";
content += " window.location.reload();";
content += " }";
content += "}";
content += "function editError() {";
content += " alert('Invalid input');";
content += "}";
content += "function editWh() {"; content += "function editWh() {";
content += "var value = prompt('How much energy the battery can store. Enter new Wh value (1-120000):');"; content += "var value = prompt('How much energy the battery can store. Enter new Wh value (1-120000):');";
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 1 && value <= 120000) {"; content += " if (value >= 1 && value <= 120000) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateBatterySize?value=' + value, true);"; content += " xhr.open('GET', '/updateBatterySize?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -90,6 +100,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value == 0 || value == 1) {"; content += " if (value == 0 || value == 1) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateUseScaledSOC?value=' + value, true);"; content += " xhr.open('GET', '/updateUseScaledSOC?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -104,6 +116,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 50 && value <= 100) {"; content += " if (value >= 50 && value <= 100) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateSocMax?value=' + value, true);"; content += " xhr.open('GET', '/updateSocMax?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -118,6 +132,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 0 && value <= 50) {"; content += " if (value >= 0 && value <= 50) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateSocMin?value=' + value, true);"; content += " xhr.open('GET', '/updateSocMin?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -132,6 +148,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 0 && value <= 1000) {"; content += " if (value >= 0 && value <= 1000) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateMaxChargeA?value=' + value, true);"; content += " xhr.open('GET', '/updateMaxChargeA?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -146,6 +164,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 0 && value <= 1000) {"; content += " if (value >= 0 && value <= 1000) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateMaxDischargeA?value=' + value, true);"; content += " xhr.open('GET', '/updateMaxDischargeA?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -160,6 +180,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 0 && value <= 5000) {"; content += " if (value >= 0 && value <= 5000) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateFakeBatteryVoltage?value=' + value, true);"; content += " xhr.open('GET', '/updateFakeBatteryVoltage?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -175,6 +197,8 @@ String settings_processor(const String& var) {
content += " if (value !== null) {"; content += " if (value !== null) {";
content += " if (value == 0 || value == 1) {"; content += " if (value == 0 || value == 1) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateChargerHvEnabled?value=' + value, true);"; content += " xhr.open('GET', '/updateChargerHvEnabled?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " }"; content += " }";
@ -190,6 +214,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value == 0 || value == 1) {"; content += " if (value == 0 || value == 1) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateChargerAux12vEnabled?value=' + value, true);"; content += " xhr.open('GET', '/updateChargerAux12vEnabled?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -205,6 +231,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 0 && value <= 1000) {"; content += " if (value >= 0 && value <= 1000) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateChargeSetpointV?value=' + value, true);"; content += " xhr.open('GET', '/updateChargeSetpointV?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -220,6 +248,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 0 && value <= 1000) {"; content += " if (value >= 0 && value <= 1000) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateChargeSetpointA?value=' + value, true);"; content += " xhr.open('GET', '/updateChargeSetpointA?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";
@ -235,6 +265,8 @@ String settings_processor(const String& var) {
content += "if (value !== null) {"; content += "if (value !== null) {";
content += " if (value >= 0 && value <= 1000) {"; content += " if (value >= 0 && value <= 1000) {";
content += " var xhr = new XMLHttpRequest();"; content += " var xhr = new XMLHttpRequest();";
content += " xhr.onload = editComplete;";
content += " xhr.onerror = editError;";
content += " xhr.open('GET', '/updateChargeEndA?value=' + value, true);"; content += " xhr.open('GET', '/updateChargeEndA?value=' + value, true);";
content += " xhr.send();"; content += " xhr.send();";
content += " } else {"; content += " } else {";