patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix name for inverter id and channel id

Browse Source
This commit is contained in:
helgeerbe 2023-02-23 22:41:37 +01:00
parent 56151b0d12
commit 10f907477d
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/WebApi_powerlimiter.cpp
View File

@ -109,6 +109,7 @@ void WebApiPowerLimiterClass::onAdminPost(AsyncWebServerRequest* request)
return; return;
} }
CONFIG_T& config = Configuration.get(); CONFIG_T& config = Configuration.get();
config.PowerLimiter_Enabled = root[F("enabled")].as<bool>(); config.PowerLimiter_Enabled = root[F("enabled")].as<bool>();
config.PowerLimiter_SolarPassTroughEnabled = root[F("solar_passtrough_enabled")].as<bool>(); config.PowerLimiter_SolarPassTroughEnabled = root[F("solar_passtrough_enabled")].as<bool>();
@ -133,7 +134,7 @@ void WebApiPowerLimiterClass::onAdminPost(AsyncWebServerRequest* request)
response->setLength(); response->setLength();
request->send(response); request->send(response);
MqttSettings.performReconnect(); MqttSettings.performReconnect(); // TODO(helge) is this really needed
MqttHandleHass.forceUpdate(); MqttHandleHass.forceUpdate(); // TODO(helge) is this really needed
PowerLimiter.init(); PowerLimiter.init();
} }

4
webapp/src/types/PowerLimiterConfig.ts
View File

@ -5,8 +5,8 @@ export interface PowerLimiterConfig {
mqtt_topic_powermeter_2: string; mqtt_topic_powermeter_2: string;
mqtt_topic_powermeter_3: string; mqtt_topic_powermeter_3: string;
is_inverter_behind_powermeter: boolean; is_inverter_behind_powermeter: boolean;
inverterId: number; inverter_id: number;
inverterChannelId: number; inverter_channel_id: number;
lower_power_limit: number; lower_power_limit: number;
upper_power_limit: number; upper_power_limit: number;
battery_soc_start_threshold: number; battery_soc_start_threshold: number;

8
webapp/src/views/PowerLimiterAdminView.vue
View File

@ -17,13 +17,13 @@
<div class="alert alert-secondary" v-show="powerLimiterConfigList.enabled" role="alert" v-html="$t('powerlimiteradmin.SolarpasstroughInfo')"></div> <div class="alert alert-secondary" v-show="powerLimiterConfigList.enabled" role="alert" v-html="$t('powerlimiteradmin.SolarpasstroughInfo')"></div>
<div class="row mb-3"> <div class="row mb-3" v-show="powerLimiterConfigList.enabled">
<label for="inputTimezone" class="col-sm-2 col-form-label"> <label for="inputTimezone" class="col-sm-2 col-form-label">
{{ $t('powerlimiteradmin.InverterId') }} {{ $t('powerlimiteradmin.InverterId') }}
<BIconInfoCircle v-tooltip :title="$t('powerlimiteradmin.InverterIdHint')" /> <BIconInfoCircle v-tooltip :title="$t('powerlimiteradmin.InverterIdHint')" />
</label> </label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-select" v-model="powerLimiterConfigList.inverterId"> <select class="form-select" v-model="powerLimiterConfigList.inverter_id">
<option v-for="inverter in inverterList" :key="inverter.key" :value="inverter.key"> <option v-for="inverter in inverterList" :key="inverter.key" :value="inverter.key">
{{ inverter.value }} {{ inverter.value }}
</option> </option>
@ -31,13 +31,13 @@
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3" v-show="powerLimiterConfigList.enabled">
<label for="inputTimezone" class="col-sm-2 col-form-label"> <label for="inputTimezone" class="col-sm-2 col-form-label">
{{ $t('powerlimiteradmin.InverterChannelId') }} {{ $t('powerlimiteradmin.InverterChannelId') }}
<BIconInfoCircle v-tooltip :title="$t('powerlimiteradmin.InverterChannelIdHint')" /> <BIconInfoCircle v-tooltip :title="$t('powerlimiteradmin.InverterChannelIdHint')" />
</label> </label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-select" v-model="powerLimiterConfigList.inverterChannelId"> <select class="form-select" v-model="powerLimiterConfigList.inverter_channel_id">
<option v-for="inverterChannel in inverterChannelList" :key="inverterChannel.key" :value="inverterChannel.key"> <option v-for="inverterChannel in inverterChannelList" :key="inverterChannel.key" :value="inverterChannel.key">
{{ inverterChannel.value }} {{ inverterChannel.value }}
</option> </option>

BIN
webapp_dist/js/app.js.gz
View File

Binary file not shown.