Bump AsyncWebServerUtils

Author: GuLinux

platformio.ini

@@ -19,7 +19,7 @@ lib_deps =
 	https://github.com/mathieucarbou/AsyncTCP.git#v3.2.4
 	https://github.com/mathieucarbou/ESPAsyncWebServer.git#v3.1.5
 	https://github.com/GuLinux/AsyncBufferedTcpLogger#v0.0.2
-	https://github.com/GuLinux/AsyncWebserverUtils#v0.0.2
+	https://github.com/GuLinux/AsyncWebserverUtils#v0.0.3
 	https://github.com/GuLinux/WiFiManager.git#v0.0.1
 	https://github.com/GuLinux/ArduinoOTA-Manager.git#v0.0.1
 	ayushsharma82/ElegantOTA @ 3.1.1

src/heater.cpp

@@ -112,7 +112,7 @@ bool APB::Heater::active() const {
     return d->getDuty() > 0;
 }
 
-void APB::Heater::setDuty(float duty) {
+void APB::Heater::setMaxDuty(float duty) {
     if(duty > 0) {
         d->maxDuty = duty;
         d->mode = Heater::Mode::fixed;
@@ -222,7 +222,7 @@ void APB::Heater::Private::loop()
     // From nmow on we require a temperature sensor on the heater
     if(!temperature) {
         Log.warningln("%s Unable to set target temperature, sensor not found.", log_scope);
-        q->setDuty(0);
+        q->setMaxDuty(0);
         return;
     }
 
@@ -233,7 +233,7 @@ void APB::Heater::Private::loop()
     if(mode == Heater::Mode::dewpoint) {
         if(!Ambient::Instance.reading()) {
             Log.warningln("%s Unable to set target temperature, ambient sensor not found.", log_scope);
-            q->setDuty(0);
+            q->setMaxDuty(0);
             return;
         }
         dynamicTargetTemperature = dewpointOffset + Ambient::Instance.reading()->dewpoint();

src/heater.h

@@ -29,7 +29,7 @@ class Heater {
 
     float maxDuty() const;
     float duty() const;
-    void setDuty(float duty);
+    void setMaxDuty(float duty);
     bool setTemperature(float targetTemperature, float maxDuty=1, float minDuty=0, float rampOffset=0);
     bool setDewpoint(float offset, float maxDuty=1, float minDuty=0, float rampOffset=0);
     std::optional<float> temperature() const;

src/webserver.cpp

@@ -287,23 +287,23 @@ void APB::WebServer::onPostSetHeater(AsyncWebServerRequest *request, JsonVariant
     Validation validation{request, json};
     if(validation.required<int>("index").required<const char*>("mode")
         .range("index", {0}, {Heaters::Instance.size()-1})
-        .range("duty", {0}, {1})
+        .range("max_duty", {0}, {1})
         .choice("mode", Heater::validModes()).invalid()) return;
     Heater &heater = Heaters::Instance[json["index"]];
     Heater::Mode mode = Heater::modeFromString(json["mode"]);
     if(mode == Heater::Mode::off) {
-        heater.setDuty(0);
+        heater.setMaxDuty(0);
         onGetHeaters(request);
         return;
     }
 
-    if(validation.range("duty", {0}, {1}).required<float>("duty").invalid()) return;
-    float duty = json["duty"];
+    if(validation.range("max_duty", {0}, {1}).required<float>("max_duty").invalid()) return;
+    float duty = json["max_duty"];
     static const char *temperatureErrorMessage = "Unable to set target temperature. Heater probably doesn't have a temperature sensor.";
     static const char *dewpointTemperatureErrorMessage = "Unable to set target temperature. Either the heater doesn't have a temperature sensor, or you're missing an ambient sensor.";
 
     if(mode == Heater::Mode::fixed) {
-        heater.setDuty(json["duty"]);
+        heater.setMaxDuty(json["max_duty"]);
     }
     if(mode == Heater::Mode::dewpoint) {
         if(validation

web/src/features/sensors/heaters/Heaters.js

@@ -104,8 +104,8 @@ const SetHeaterModal = ({heater: originalHeater, show, onClose, index}) => {
                 <Collapse in={heater.mode !== 'off'}>
                     <Form.Group className='mb-3'>
                         <Form.Label>Duty</Form.Label>
-                        <Badge className='float-end'><Number value={heater.duty} formatFunction={formatPercentage} decimals={1} /></Badge>
-                        <Form.Range min={0} max={1} step={0.001} value={heater.duty} onChange={updateHeater('duty', parseFloat)} />
+                        <Badge className='float-end'><Number value={heater.max_duty} formatFunction={formatPercentage} decimals={1} /></Badge>
+                        <Form.Range min={0} max={1} step={0.001} value={heater.max_duty} onChange={updateHeater('max_duty', parseFloat)} />
                         { ['target_temperature', 'dewpoint'].includes(heater.mode) && 
                         <Form.Text>When ramp is set to a non zero value, and mode is either <code>Dewpoint offset</code> or <code>Target temperature</code>,
                         this will be a maximum value rather than the real duty.</Form.Text> }