duty_cycle is a ratio [0; 1]

(cherry picked from commit e10368bcdfad44cefd1ec6faec7f91b8b5498a37)
mathieucarbou · Jun 24, 2024 · f3522db · f3522db
1 parent b757b34
commit f3522db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/remote/JSYRemoteUDP/JSYRemoteUDP.ino b/remote/JSYRemoteUDP/JSYRemoteUDP.ino
@@ -1,7 +1,17 @@
 #include <Arduino.h>
-#include <ArduinoJson.h>
-#include <MycilaJSY.h>
-#include <MycilaLogger.h>
+
+#include <ArduinoJson.h>       // https://github.com/bblanchon/ArduinoJson
+#include <AsyncTCP.h>          // https://github.com/mathieucarbou/AsyncTCP
+#include <ESPAsyncWebServer.h> // https://github.com/mathieucarbou/ESPAsyncWebServer
+#include <ESPDash.h>           // https://github.com/mathieucarbou/ayushsharma82-ESP-DASH#dev
+#include <ElegantOTA.h>        // https://github.com/mathieucarbou/ayushsharma82-ElegantOTA#dev
+#include <MycilaESPConnect.h>  // https://github.com/mathieucarbou/MycilaESPConnect
+#include <MycilaJSY.h>         // https://github.com/mathieucarbou/MycilaJSY
+#include <MycilaLogger.h>      // https://github.com/mathieucarbou/MycilaLogger
+#include <MycilaSystem.h>      // https://github.com/mathieucarbou/MycilaSystem
+#include <MycilaTaskManager.h> // https://github.com/mathieucarbou/MycilaTaskMonitor
+#include <MycilaTaskMonitor.h> // https://github.com/mathieucarbou/MycilaTaskMonitor
+#include <WebSerialLite.h>     // https://github.com/mathieucarbou/WebSerialLite
 
 Mycila::JSY jsy;
 Mycila::Logger logger;

diff --git a/src/init/MQTT.cpp b/src/init/MQTT.cpp
@@ -56,11 +56,11 @@ Mycila::Task initMqttSubscribersTask("Init MQTT Subscribers", [](void* params) {
   });
 
   mqtt.subscribe(baseTopic + "/router/output1/dimmer/duty_cycle/set", [](const String& topic, const String& payload) {
-    output1.tryDimmerDutyCycle(payload.toFloat() / 100);
+    output1.tryDimmerDutyCycle(payload.toFloat());
   });
 
   mqtt.subscribe(baseTopic + "/router/output2/dimmer/duty_cycle/set", [](const String& topic, const String& payload) {
-    output2.tryDimmerDutyCycle(payload.toFloat() / 100);
+    output2.tryDimmerDutyCycle(payload.toFloat());
   });
 
   mqtt.subscribe(baseTopic + "/router/output1/bypass/set", [](const String& topic, const String& payload) {

diff --git a/src/init/REST.cpp b/src/init/REST.cpp
@@ -269,7 +269,7 @@ Mycila::Task initRestApiTask("Init REST API", [](void* params) {
       if (request->hasParam("duty", true))
         output1.tryDimmerDuty(request->getParam("level", true)->value().toInt());
       else if (request->hasParam("duty_cycle", true))
-        output1.tryDimmerDutyCycle(request->getParam("duty_cycle", true)->value().toFloat() / 100);
+        output1.tryDimmerDutyCycle(request->getParam("duty_cycle", true)->value().toFloat());
       request->send(200);
     })
     .setAuthentication(YASOLR_ADMIN_USERNAME, config.get(KEY_ADMIN_PASSWORD));
@@ -279,7 +279,7 @@ Mycila::Task initRestApiTask("Init REST API", [](void* params) {
       if (request->hasParam("duty", true))
         output2.tryDimmerDuty(request->getParam("level", true)->value().toInt());
       else if (request->hasParam("duty_cycle", true))
-        output2.tryDimmerDutyCycle(request->getParam("duty_cycle", true)->value().toFloat() / 100);
+        output2.tryDimmerDutyCycle(request->getParam("duty_cycle", true)->value().toFloat());
       request->send(200);
     })
     .setAuthentication(YASOLR_ADMIN_USERNAME, config.get(KEY_ADMIN_PASSWORD));
@@ -339,7 +339,7 @@ Mycila::Task initRestApiTask("Init REST API", [](void* params) {
         json["temperature"] = ds18O1.getValidTemperature();
 
         json["dimmer"]["duty"] = dimmerO1.getPowerDuty();
-        json["dimmer"]["duty_cycle"] = dimmerO1.getPowerDutyCycle() * 100;
+        json["dimmer"]["duty_cycle"] = dimmerO1.getPowerDutyCycle();
         json["dimmer"]["state"] = YASOLR_STATE(dimmerO1.isOn());
 
         json["metrics"]["apparent_power"] = routerMetrics.outputs[idx].apparentPower;

diff --git a/src/tasks/MQTT.cpp b/src/tasks/MQTT.cpp
@@ -123,7 +123,7 @@ Mycila::Task mqttPublishTask("MQTT", [](void* params) {
   mqtt.publish(baseTopic + "/router/output1/state", output1.getStateName());
   mqtt.publish(baseTopic + "/router/output1/temperature", String(ds18O1.getValidTemperature(), 1));
   mqtt.publish(baseTopic + "/router/output1/dimmer/duty", String(dimmerO1.getPowerDuty()));
-  mqtt.publish(baseTopic + "/router/output1/dimmer/duty_cycle", String(dimmerO1.getPowerDutyCycle() * 100));
+  mqtt.publish(baseTopic + "/router/output1/dimmer/duty_cycle", String(dimmerO1.getPowerDutyCycle()));
   mqtt.publish(baseTopic + "/router/output1/dimmer/state", YASOLR_STATE(dimmerO1.isOn()));
   mqtt.publish(baseTopic + "/router/output1/relay/state", YASOLR_STATE(bypassRelayO1.isOn()));
   mqtt.publish(baseTopic + "/router/output1/relay/switch_count", String(bypassRelayO1.getSwitchCount()));
@@ -133,7 +133,7 @@ Mycila::Task mqttPublishTask("MQTT", [](void* params) {
   mqtt.publish(baseTopic + "/router/output2/state", output2.getStateName());
   mqtt.publish(baseTopic + "/router/output2/temperature", String(ds18O2.getValidTemperature(), 1));
   mqtt.publish(baseTopic + "/router/output2/dimmer/duty", String(dimmerO2.getPowerDuty()));
-  mqtt.publish(baseTopic + "/router/output2/dimmer/duty_cycle", String(dimmerO2.getPowerDutyCycle() * 100));
+  mqtt.publish(baseTopic + "/router/output2/dimmer/duty_cycle", String(dimmerO2.getPowerDutyCycle()));
   mqtt.publish(baseTopic + "/router/output2/dimmer/state", YASOLR_STATE(dimmerO2.isOn()));
   mqtt.publish(baseTopic + "/router/output2/relay/state", YASOLR_STATE(bypassRelayO2.isOn()));
   mqtt.publish(baseTopic + "/router/output2/relay/switch_count", String(bypassRelayO2.getSwitchCount()));