1.1.12 - MQTT area basic_state now includes arm_vacation to align wit…

…h changes to Home Assistant
excaliburpartners · Apr 5, 2022 · 41330b9 · 41330b9
1 parent 3b86dd6
commit 41330b9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/OmniLinkBridge/MQTT/AreaCommands.cs b/OmniLinkBridge/MQTT/AreaCommands.cs
@@ -6,9 +6,9 @@ enum AreaCommands
         arm_home,
         arm_away,
         arm_night,
+        arm_vacation,
         // The below aren't supported by Home Assistant
         arm_home_instant,
-        arm_night_delay,
-        arm_vacation
+        arm_night_delay
     }
 }
diff --git a/OmniLinkBridge/MQTT/MappingExtensions.cs b/OmniLinkBridge/MQTT/MappingExtensions.cs
@@ -62,8 +62,9 @@ public static string ToBasicState(this clsArea area)
                 case enuSecurityMode.DayInst:
                     return "armed_home";
                 case enuSecurityMode.Away:
-                case enuSecurityMode.Vacation:
                     return "armed_away";
+                case enuSecurityMode.Vacation:
+                    return "armed_vacation";
                 case enuSecurityMode.Off:
                 default:
                     return "disarmed";

diff --git a/OmniLinkBridge/MQTT/MessageProcessor.cs b/OmniLinkBridge/MQTT/MessageProcessor.cs
@@ -56,10 +56,10 @@ public void Process(string messageTopic, string payload)
             { AreaCommands.arm_home, enuUnitCommand.SecurityDay },
             { AreaCommands.arm_away, enuUnitCommand.SecurityAway },
             { AreaCommands.arm_night, enuUnitCommand.SecurityNight },
+            { AreaCommands.arm_vacation, enuUnitCommand.SecurityVac },
             // The below aren't supported by Home Assistant
             { AreaCommands.arm_home_instant, enuUnitCommand.SecurityDyi },
-            { AreaCommands.arm_night_delay, enuUnitCommand.SecurityNtd },
-            { AreaCommands.arm_vacation, enuUnitCommand.SecurityVac },
+            { AreaCommands.arm_night_delay, enuUnitCommand.SecurityNtd }
         };
 
         private void ProcessAreaReceived(clsArea area, Topic command, string payload)

diff --git a/OmniLinkBridge/Properties/AssemblyInfo.cs b/OmniLinkBridge/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Excalibur Partners, LLC")]
 [assembly: AssemblyProduct("OmniLinkBridge")]
-[assembly: AssemblyCopyright("Copyright © Excalibur Partners, LLC 2021")]
+[assembly: AssemblyCopyright("Copyright © Excalibur Partners, LLC 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.11.0")]
-[assembly: AssemblyFileVersion("1.1.11.0")]
+[assembly: AssemblyVersion("1.1.12.0")]
+[assembly: AssemblyFileVersion("1.1.12.0")]
diff --git a/OmniLinkBridgeTest/Properties/AssemblyInfo.cs b/OmniLinkBridgeTest/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Excalibur Partners, LLC")]
 [assembly: AssemblyProduct("OmniLinkBridgeTest")]
-[assembly: AssemblyCopyright("Copyright © Excalibur Partners, LLC 2020")]
+[assembly: AssemblyCopyright("Copyright © Excalibur Partners, LLC 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/README.md b/README.md
@@ -170,7 +170,7 @@ SUB omnilink/areaX/state
 string triggered, arming, armed_night, armed_night_delay, armed_home, armed_home_instant, armed_away, armed_vacation, disarmed
 
 SUB omnilink/areaX/basic_state  
-string triggered, arming, armed_night, armed_home, armed_away, disarmed
+string triggered, arming, armed_night, armed_home, armed_away, armed_vacation, disarmed
 
 SUB omnilink/areaX/json_state
 string json