Rename "is_power_cut_active" and "rate_type" to use more specific names

opennetty · Dec 21, 2024 · fa511c5 · fa511c5
1 parent 1cad805
commit fa511c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/OpenNetty.Mqtt/OpenNettyMqttAttributes.cs b/src/OpenNetty.Mqtt/OpenNettyMqttAttributes.cs
@@ -26,11 +26,6 @@ public static class OpenNettyMqttAttributes
     /// </summary>
     public const string DimmingStep = "dimming_step";
 
-    /// <summary>
-    /// Power cut active indicator.
-    /// </summary>
-    public const string IsPowerCutActive = "is_power_cut_active";
-
     /// <summary>
     /// Pilot wire derogation mode.
     /// </summary>
@@ -41,11 +36,6 @@ public static class OpenNettyMqttAttributes
     /// </summary>
     public const string PilotWireSetpointMode = "pilot_wire_setpoint_mode";
 
-    /// <summary>
-    /// Rate type.
-    /// </summary>
-    public const string RateType = "rate_type";
-
     /// <summary>
     /// Scenario.
     /// </summary>
@@ -56,6 +46,16 @@ public static class OpenNettyMqttAttributes
     /// </summary>
     public const string SmartMeterIndexes = "smart_meter_indexes";
 
+    /// <summary>
+    /// Smart meter power cut mode.
+    /// </summary>
+    public const string SmartMeterPowerCutMode = "smart_meter_power_cut_mode";
+
+    /// <summary>
+    /// Smart meter rate type.
+    /// </summary>
+    public const string SmartMeterRateType = "smart_meter_rate_type";
+
     /// <summary>
     /// Switch state.
     /// </summary>

diff --git a/src/OpenNetty.Mqtt/OpenNettyMqttHostedService.cs b/src/OpenNetty.Mqtt/OpenNettyMqttHostedService.cs
@@ -196,14 +196,14 @@ await _events.SmartMeterIndexesReported
 
             await _events.SmartMeterPowerCutModeReported
                 .Where(static arguments => !string.IsNullOrEmpty(arguments.Endpoint.Name))
-                .Do(arguments => ReportStringAsync(arguments.Endpoint, OpenNettyMqttAttributes.IsPowerCutActive,
+                .Do(arguments => ReportStringAsync(arguments.Endpoint, OpenNettyMqttAttributes.SmartMeterPowerCutMode,
                     arguments.Active ? "1" : "0"))
                 .Retry()
                 .SubscribeAsync(static arguments => ValueTask.CompletedTask),
 
             await _events.SmartMeterRateTypeReported
                 .Where(static arguments => !string.IsNullOrEmpty(arguments.Endpoint.Name))
-                .Do(arguments => ReportStringAsync(arguments.Endpoint, OpenNettyMqttAttributes.RateType, arguments.Type switch
+                .Do(arguments => ReportStringAsync(arguments.Endpoint, OpenNettyMqttAttributes.SmartMeterRateType, arguments.Type switch
                 {
                     OpenNettyModels.TemperatureControl.SmartMeterRateType.Peak    => "peak",
                     OpenNettyModels.TemperatureControl.SmartMeterRateType.OffPeak => "off_peak",

diff --git a/src/OpenNetty.Mqtt/OpenNettyMqttWorker.cs b/src/OpenNetty.Mqtt/OpenNettyMqttWorker.cs
@@ -251,7 +251,7 @@ await _controller.SetPilotWireSetpointModeAsync(endpoint,
                                 }
                                 break;
 
-                            case OpenNettyMqttAttributes.RateType or OpenNettyMqttAttributes.IsPowerCutActive
+                            case OpenNettyMqttAttributes.SmartMeterPowerCutMode or OpenNettyMqttAttributes.SmartMeterRateType
                                 when operation is OpenNettyMqttOperation.Get:
                                 _ = await _controller.GetSmartMeterInformationAsync(endpoint);
                                 break;