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

Show absolute limit in limit dialogue

Browse Source
This commit is contained in:
Thomas Basler 2022-10-10 19:20:19 +02:00
parent 94f05b3ee8
commit 283eae295b
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/WebApi_limit.cpp
View File

@ -36,6 +36,7 @@ void WebApiLimitClass::onLimitStatus(AsyncWebServerRequest* request)
((uint32_t)(inv->serial() & 0xFFFFFFFF))); ((uint32_t)(inv->serial() & 0xFFFFFFFF)));
root[buffer]["limit_relative"] = inv->SystemConfigPara()->getLimitPercent(); root[buffer]["limit_relative"] = inv->SystemConfigPara()->getLimitPercent();
root[buffer]["max_power"] = inv->DevInfo()->getMaxPower();
LastCommandSuccess status = inv->SystemConfigPara()->getLastLimitCommandSuccess(); LastCommandSuccess status = inv->SystemConfigPara()->getLastLimitCommandSuccess();
String limitStatus = "Unknown"; String limitStatus = "Unknown";

17
webapp/src/components/HomeView.vue
View File

@ -173,13 +173,22 @@
<div class="row mb-3"> <div class="row mb-3">
<label for="inputCurrentLimit" class="col-sm-3 col-form-label">Current <label for="inputCurrentLimit" class="col-sm-3 col-form-label">Current
Limit:</label> Limit:</label>
<div class="col-sm-9"> <div class="col-sm-4">
<div class="input-group"> <div class="input-group">
<input type="number" class="form-control" id="inputCurrentLimit" <input type="number" class="form-control" id="inputCurrentLimit"
aria-describedby="currentLimitType" v-model="currentLimit" disabled /> aria-describedby="currentLimitType" v-model="currentLimit" disabled />
<span class="input-group-text" id="currentLimitType">%</span> <span class="input-group-text" id="currentLimitType">%</span>
</div> </div>
</div> </div>
<div class="col-sm-4" v-if="maxPower > 0">
<div class="input-group">
<input type="number" class="form-control" id="inputCurrentLimitAbsolute"
aria-describedby="currentLimitTypeAbsolute"
v-model="currentLimitAbsolute" disabled />
<span class="input-group-text" id="currentLimitTypeAbsolute">W</span>
</div>
</div>
</div> </div>
<div class="row mb-3 align-items-center"> <div class="row mb-3 align-items-center">
@ -341,7 +350,9 @@ export default defineComponent({
limitSettingLoading: true, limitSettingLoading: true,
currentLimit: 0, currentLimit: 0,
currentLimitAbsolute: 0,
successCommandLimit: "", successCommandLimit: "",
maxPower: 0,
targetLimit: 0, targetLimit: 0,
targetLimitMin: 10, targetLimitMin: 10,
targetLimitMax: 100, targetLimitMax: 100,
@ -494,7 +505,11 @@ export default defineComponent({
fetch("/api/limit/status") fetch("/api/limit/status")
.then((response) => response.json()) .then((response) => response.json())
.then((data) => { .then((data) => {
this.maxPower = data[serial].max_power;
this.currentLimit = data[serial].limit_relative; this.currentLimit = data[serial].limit_relative;
if (this.maxPower > 0) {
this.currentLimitAbsolute = this.currentLimit * this.maxPower / 100;
}
this.successCommandLimit = data[serial].limit_set_status; this.successCommandLimit = data[serial].limit_set_status;
this.limitSettingSerial = serial; this.limitSettingSerial = serial;
this.limitSettingLoading = false; this.limitSettingLoading = false;