use camel case keys in api

helgeerbe · Sep 13, 2024 · 750dc67 · 750dc67
1 parent 62ac1d0
commit 750dc67
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -263,7 +263,7 @@ bool ConfigurationClass::write()
     battery["mqtt_voltage_unit"] = config.Battery.MqttVoltageUnit;
     battery["enable_discharge_current_limit"] = config.Battery.EnableDischargeCurrentLimit;
     battery["discharge_current_limit"] = config.Battery.DischargeCurrentLimit;
-    battery["useBattery_reported_discharge_current_limit"] = config.Battery.UseBatteryReportedDischargeCurrentLimit;
+    battery["use_battery_reported_discharge_current_limit"] = config.Battery.UseBatteryReportedDischargeCurrentLimit;
     battery["mqtt_discharge_current_topic"] = config.Battery.MqttDischargeCurrentTopic;
     battery["mqtt_discharge_current_json_path"] = config.Battery.MqttDischargeCurrentJsonPath;
     battery["mqtt_amperage_unit"] = config.Battery.MqttAmperageUnit;

diff --git a/src/WebApi_battery.cpp b/src/WebApi_battery.cpp
@@ -45,9 +45,9 @@ void WebApiBatteryClass::onStatus(AsyncWebServerRequest* request)
     root["mqtt_voltage_topic"] = config.Battery.MqttVoltageTopic;
     root["mqtt_voltage_json_path"] = config.Battery.MqttVoltageJsonPath;
     root["mqtt_voltage_unit"] = config.Battery.MqttVoltageUnit;
-    root["enableDischargeCurrentLimit"] = config.Battery.EnableDischargeCurrentLimit;
-    root["dischargeCurrentLimit"] = static_cast<int>(config.Battery.DischargeCurrentLimit * 100 +0.5) / 100.0;
-    root["useBatteryReportedDischargeCurrentLimit"] = config.Battery.UseBatteryReportedDischargeCurrentLimit;
+    root["enable_discharge_current_limit"] = config.Battery.EnableDischargeCurrentLimit;
+    root["discharge_current_limit"] = static_cast<int>(config.Battery.DischargeCurrentLimit * 100 +0.5) / 100.0;
+    root["use_battery_reported_discharge_current_limit"] = config.Battery.UseBatteryReportedDischargeCurrentLimit;
     root["mqtt_discharge_current_topic"] = config.Battery.MqttDischargeCurrentTopic;
     root["mqtt_discharge_current_json_path"] = config.Battery.MqttDischargeCurrentJsonPath;
     root["mqtt_amperage_unit"] = config.Battery.MqttAmperageUnit;
@@ -97,9 +97,9 @@ void WebApiBatteryClass::onAdminPost(AsyncWebServerRequest* request)
     strlcpy(config.Battery.MqttVoltageTopic, root["mqtt_voltage_topic"].as<String>().c_str(), sizeof(config.Battery.MqttVoltageTopic));
     strlcpy(config.Battery.MqttVoltageJsonPath, root["mqtt_voltage_json_path"].as<String>().c_str(), sizeof(config.Battery.MqttVoltageJsonPath));
     config.Battery.MqttVoltageUnit = static_cast<BatteryVoltageUnit>(root["mqtt_voltage_unit"].as<uint8_t>());
-    config.Battery.EnableDischargeCurrentLimit = root["enableDischargeCurrentLimit"].as<bool>();
-    config.Battery.DischargeCurrentLimit = static_cast<int>(root["dischargeCurrentLimit"].as<float>() * 100) / 100.0;
-    config.Battery.UseBatteryReportedDischargeCurrentLimit = root["useBatteryReportedDischargeCurrentLimit"].as<bool>();
+    config.Battery.EnableDischargeCurrentLimit = root["enable_discharge_current_limit"].as<bool>();
+    config.Battery.DischargeCurrentLimit = static_cast<int>(root["discharge_currentLimit"].as<float>() * 100) / 100.0;
+    config.Battery.UseBatteryReportedDischargeCurrentLimit = root["use_battery_reported_discharge_current_limit"].as<bool>();
     strlcpy(config.Battery.MqttDischargeCurrentTopic, root["mqtt_discharge_current_topic"].as<String>().c_str(), sizeof(config.Battery.MqttDischargeCurrentTopic));
     strlcpy(config.Battery.MqttDischargeCurrentJsonPath, root["mqtt_discharge_current_json_path"].as<String>().c_str(), sizeof(config.Battery.MqttDischargeCurrentJsonPath));
     config.Battery.MqttAmperageUnit = static_cast<BatteryAmperageUnit>(root["mqtt_amperage_unit"].as<uint8_t>());

diff --git a/webapp/src/types/BatteryConfig.ts b/webapp/src/types/BatteryConfig.ts
@@ -9,9 +9,9 @@ export interface BatteryConfig {
     mqtt_voltage_topic: string;
     mqtt_voltage_json_path: string;
     mqtt_voltage_unit: number;
-    enableDischargeCurrentLimit: boolean;
-    dischargeCurrentLimit: number;
-    useBatteryReportedDischargeCurrentLimit: boolean;
+    enable_discharge_current_limit: boolean;
+    discharge_current_limit: number;
+    use_battery_reported_discharge_current_limit: boolean;
     mqtt_discharge_current_topic: string;
     mqtt_discharge_current_json_path: string;
     mqtt_amperage_unit: number;

diff --git a/webapp/src/views/BatteryAdminView.vue b/webapp/src/views/BatteryAdminView.vue
@@ -127,14 +127,14 @@
             >
                 <InputElement
                     :label="$t('batteryadmin.LimitDischargeCurrent')"
-                    v-model="batteryConfigList.enableDischargeCurrentLimit"
+                    v-model="batteryConfigList.enable_discharge_current_limit"
                     type="checkbox"
                 />
 
-                <template v-if="batteryConfigList.enableDischargeCurrentLimit">
+                <template v-if="batteryConfigList.enable_discharge_current_limit">
                     <InputElement
                         :label="$t('batteryadmin.DischargeCurrentLimit')"
-                        v-model="batteryConfigList.dischargeCurrentLimit"
+                        v-model="batteryConfigList.discharge_current_limit"
                         type="number"
                         min="0"
                         step="0.1"
@@ -143,12 +143,12 @@
 
                     <InputElement
                         :label="$t('batteryadmin.UseBatteryReportedDischargeCurrentLimit')"
-                        v-model="batteryConfigList.useBatteryReportedDischargeCurrentLimit"
+                        v-model="batteryConfigList.use_battery_reported_discharge_current_limit"
                         type="checkbox"
                     />
                 </template>
 
-                <template v-if="batteryConfigList.enableDischargeCurrentLimit && batteryConfigList.useBatteryReportedDischargeCurrentLimit">
+                <template v-if="batteryConfigList.enable_discharge_current_limit && batteryConfigList.use_battery_reported_discharge_current_limit">
                     <div
                         class="alert alert-secondary"
                         role="alert"