0.8.910009-zero

This commit is contained in:
Patrick Amrhein 2024-03-14 20:25:19 +01:00
parent 3dfbee82c7
commit d203defb2e
6 changed files with 107 additions and 18 deletions

View file

@ -755,6 +755,9 @@ class RestApi {
objGroup[F("refresh")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].refresh;
objGroup[F("powerTolerance")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].powerTolerance;
objGroup[F("powerMax")] = (uint16_t)mConfig->plugin.zeroExport.groups[group].powerMax;
objGroup[F("Kp")] = ah::round3((float)mConfig->plugin.zeroExport.groups[group].Kp);
objGroup[F("Ki")] = ah::round3((float)mConfig->plugin.zeroExport.groups[group].Ki);
objGroup[F("Kd")] = ah::round3((float)mConfig->plugin.zeroExport.groups[group].Kd);
}
}
#endif
@ -1017,6 +1020,9 @@ class RestApi {
mConfig->plugin.zeroExport.groups[group].refresh = jsonIn[F("refresh")];
mConfig->plugin.zeroExport.groups[group].powerTolerance = jsonIn[F("powerTolerance")];
mConfig->plugin.zeroExport.groups[group].powerMax = jsonIn[F("powerMax")];
mConfig->plugin.zeroExport.groups[group].Kp = jsonIn[F("Kp")];
mConfig->plugin.zeroExport.groups[group].Ki = jsonIn[F("Ki")];
mConfig->plugin.zeroExport.groups[group].Kd = jsonIn[F("Kd")];
// Global
mApp->saveSettings(false); // without reboot
}

View file

@ -1379,6 +1379,9 @@
divRow("{#ZE_GROUP_TAB_ADVANCED_REFRESH}", ml("input", {name: "refresh", class: "text", type: "number", min: "0", max: "255", value: obj.refresh}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_POWERTOLERANCE}", ml("input", {name: "powerTolerance", class: "text", type: "number", min: "0", max: "255", value: obj.powerTolerance}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_POWERMAX}", ml("input", {name: "powerMax", class: "text", type: "number", min: "0", max: "65535", value: obj.powerMax}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_KP}", ml("input", {name: "Kp", class: "text", type: "number", min: "-5", max: "0", step: "0.01", value: obj.Kp}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_KI}", ml("input", {name: "Ki", class: "text", type: "number", min: "-5", max: "0", step: "0.01", value: obj.Ki}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_KD}", ml("input", {name: "Kd", class: "text", type: "number", min: "-5", max: "0", step: "0.01", value: obj.Kd}, null)),
]),
// Global
ml("div", {class: "row mt-5"}, [
@ -1495,6 +1498,9 @@
o.refresh = document.getElementsByName("refresh")[0].value;
o.powerTolerance = document.getElementsByName("powerTolerance")[0].value;
o.powerMax = document.getElementsByName("powerMax")[0].value;
o.Kp = document.getElementsByName("Kp")[0].value;
o.Ki = document.getElementsByName("Ki")[0].value;
o.Kd = document.getElementsByName("Kd")[0].value;
// Global
getAjax("/api/setup", cb, "POST", JSON.stringify(o));
}
@ -1555,6 +1561,9 @@
o.refresh = 10;
o.powerTolerance = 10;
o.powerMax = 600;
o.Kp = -1;
o.Ki = 0;
o.Kd = 0;
// Global
getAjax("/api/setup", cb, "POST", JSON.stringify(o));
}

View file

@ -948,6 +948,21 @@
"en": "Group Power max (Watt):",
"de": "Gruppe Leistung Max (Watt):"
},
{
"token": "ZE_GROUP_TAB_ADVANCED_KP",
"en": "Kp:",
"de": "Kp:"
},
{
"token": "ZE_GROUP_TAB_ADVANCED_KI",
"en": "Ki:",
"de": "Ki:"
},
{
"token": "ZE_GROUP_TAB_ADVANCED_KD",
"en": "Kd:",
"de": "Kd:"
},
{
"token": "ZE_GROUP_EDIT_BTN_SAVE",
"en": "save",