Fix the MQTT worker to use the correct controller APIs when setting t…

…he pilot wire derogation/setpoint mode
opennetty · Dec 10, 2024 · a3819dd · a3819dd
1 parent 4f679a9
commit a3819dd
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/src/OpenNetty.Mqtt/OpenNettyMqttWorker.cs b/src/OpenNetty.Mqtt/OpenNettyMqttWorker.cs
@@ -123,36 +123,6 @@ await _manager.FindEndpointByNameAsync(name) is not OpenNettyEndpoint endpoint)
                                 break;
 
                             case OpenNettyMqttAttributes.PilotWireDerogationMode when operation is OpenNettyMqttOperation.Set:
-                                switch (message.ConvertPayloadToString()?.ToLowerInvariant())
-                                {
-                                    case "comfort":
-                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
-                                            OpenNettyModels.TemperatureControl.PilotWireMode.Comfort);
-                                        break;
-
-                                    case "comfort-1":
-                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
-                                            OpenNettyModels.TemperatureControl.PilotWireMode.ComfortMinusOne);
-                                        break;
-
-                                    case "comfort-2":
-                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
-                                            OpenNettyModels.TemperatureControl.PilotWireMode.ComfortMinusTwo);
-                                        break;
-
-                                    case "eco":
-                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
-                                            OpenNettyModels.TemperatureControl.PilotWireMode.Eco);
-                                        break;
-
-                                    case "frost_protection":
-                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
-                                            OpenNettyModels.TemperatureControl.PilotWireMode.FrostProtection);
-                                        break;
-                                }
-                                break;
-
-                            case OpenNettyMqttAttributes.PilotWireSetpointMode when operation is OpenNettyMqttOperation.Set:
                                 switch (message.ConvertPayloadToString()?.ToLowerInvariant())
                                 {
                                     case "none":
@@ -251,6 +221,36 @@ await _controller.SetPilotWireDerogationModeAsync(endpoint,
                                 }
                                 break;
 
+                            case OpenNettyMqttAttributes.PilotWireSetpointMode when operation is OpenNettyMqttOperation.Set:
+                                switch (message.ConvertPayloadToString()?.ToLowerInvariant())
+                                {
+                                    case "comfort":
+                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
+                                            OpenNettyModels.TemperatureControl.PilotWireMode.Comfort);
+                                        break;
+
+                                    case "comfort-1":
+                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
+                                            OpenNettyModels.TemperatureControl.PilotWireMode.ComfortMinusOne);
+                                        break;
+
+                                    case "comfort-2":
+                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
+                                            OpenNettyModels.TemperatureControl.PilotWireMode.ComfortMinusTwo);
+                                        break;
+
+                                    case "eco":
+                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
+                                            OpenNettyModels.TemperatureControl.PilotWireMode.Eco);
+                                        break;
+
+                                    case "frost_protection":
+                                        await _controller.SetPilotWireSetpointModeAsync(endpoint,
+                                            OpenNettyModels.TemperatureControl.PilotWireMode.FrostProtection);
+                                        break;
+                                }
+                                break;
+
                             case OpenNettyMqttAttributes.RateType or OpenNettyMqttAttributes.IsPowerCutActive
                                 when operation is OpenNettyMqttOperation.Get:
                                 _ = await _controller.GetSmartMeterInformationAsync(endpoint);