mirror of
https://github.com/dalathegreat/Battery-Emulator.git
synced 2025-10-03 17:59:27 +02:00
Merge branch 'main' into feature/lilygo_t_2can
This commit is contained in:
commit
c3caad4da7
50 changed files with 363 additions and 858 deletions
|
@ -93,6 +93,8 @@ String options_from_map(int selected, const TMap& value_name_map) {
|
|||
return options;
|
||||
}
|
||||
|
||||
static const std::map<int, String> led_modes = {{0, "Classic"}, {1, "Energy Flow"}, {2, "Heartbeat"}};
|
||||
|
||||
static const std::map<int, String> tesla_countries = {
|
||||
{21843, "US (USA)"}, {17217, "CA (Canada)"}, {18242, "GB (UK & N Ireland)"},
|
||||
{17483, "DK (Denmark)"}, {17477, "DE (Germany)"}, {16725, "AU (Australia)"}};
|
||||
|
@ -281,6 +283,26 @@ String settings_processor(const String& var, BatteryEmulatorSettingsStore& setti
|
|||
return settings.getBool("WIFIAPENABLED", wifiap_enabled) ? "checked" : "";
|
||||
}
|
||||
|
||||
if (var == "CANLOGUSB") {
|
||||
return settings.getBool("CANLOGUSB") ? "checked" : "";
|
||||
}
|
||||
|
||||
if (var == "USBENABLED") {
|
||||
return settings.getBool("USBENABLED") ? "checked" : "";
|
||||
}
|
||||
|
||||
if (var == "WEBENABLED") {
|
||||
return settings.getBool("WEBENABLED") ? "checked" : "";
|
||||
}
|
||||
|
||||
if (var == "CANLOGSD") {
|
||||
return settings.getBool("CANLOGSD") ? "checked" : "";
|
||||
}
|
||||
|
||||
if (var == "SDLOGENABLED") {
|
||||
return settings.getBool("SDLOGENABLED") ? "checked" : "";
|
||||
}
|
||||
|
||||
if (var == "MQTTENABLED") {
|
||||
return settings.getBool("MQTTENABLED") ? "checked" : "";
|
||||
}
|
||||
|
@ -555,6 +577,10 @@ String settings_processor(const String& var, BatteryEmulatorSettingsStore& setti
|
|||
return options_from_map(settings.getUInt("GTWPACK", 0), tesla_pack);
|
||||
}
|
||||
|
||||
if (var == "LEDMODE") {
|
||||
return options_from_map(settings.getUInt("LEDMODE", 0), led_modes);
|
||||
}
|
||||
|
||||
return String();
|
||||
}
|
||||
|
||||
|
@ -944,6 +970,25 @@ const char* getCANInterfaceName(CAN_Interface interface) {
|
|||
<label>Custom hostname: </label>
|
||||
<input type='text' name='HOSTNAME' value="%HOSTNAME%" />
|
||||
|
||||
<label>Enable CAN logging via USB serial: </label>
|
||||
<input type='checkbox' name='CANLOGUSB' value='on' style='margin-left: 0;' %CANLOGUSB% />
|
||||
|
||||
<label>Enable logging via USB serial: </label>
|
||||
<input type='checkbox' name='USBENABLED' value='on' style='margin-left: 0;' %USBENABLED% />
|
||||
|
||||
<label>Enable logging via Webserver: </label>
|
||||
<input type='checkbox' name='WEBENABLED' value='on' style='margin-left: 0;' %WEBENABLED% />
|
||||
|
||||
<label>Enable CAN logging via SD card: </label>
|
||||
<input type='checkbox' name='CANLOGSD' value='on' style='margin-left: 0;' %CANLOGSD% />
|
||||
|
||||
<label>Enable logging via SD card: </label>
|
||||
<input type='checkbox' name='SDLOGENABLED' value='on' style='margin-left: 0;' %SDLOGENABLED% />
|
||||
|
||||
<label for='LEDMODE'>Status LED pattern: </label><select name='LEDMODE' id='LEDMODE'>
|
||||
%LEDMODE%
|
||||
</select>
|
||||
|
||||
<label>Enable MQTT: </label>
|
||||
<input type='checkbox' name='MQTTENABLED' value='on' style='margin-left: 0;' %MQTTENABLED% />
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue