From 41330b9bf46ff04809ac15a94cea07eda088c4e6 Mon Sep 17 00:00:00 2001 From: Ryan Wagoner Date: Mon, 4 Apr 2022 22:46:09 -0400 Subject: [PATCH] 1.1.12 - MQTT area basic_state now includes arm_vacation to align with changes to Home Assistant --- OmniLinkBridge/MQTT/AreaCommands.cs | 4 ++-- OmniLinkBridge/MQTT/MappingExtensions.cs | 3 ++- OmniLinkBridge/MQTT/MessageProcessor.cs | 4 ++-- OmniLinkBridge/Properties/AssemblyInfo.cs | 6 +++--- OmniLinkBridgeTest/Properties/AssemblyInfo.cs | 2 +- README.md | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/OmniLinkBridge/MQTT/AreaCommands.cs b/OmniLinkBridge/MQTT/AreaCommands.cs index 15546fc..568b622 100644 --- a/OmniLinkBridge/MQTT/AreaCommands.cs +++ b/OmniLinkBridge/MQTT/AreaCommands.cs @@ -6,9 +6,9 @@ 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 index 1d1a2d9..45545a0 100644 --- a/OmniLinkBridge/MQTT/MappingExtensions.cs +++ b/OmniLinkBridge/MQTT/MappingExtensions.cs @@ -62,8 +62,9 @@ namespace OmniLinkBridge.MQTT 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 index 8be0930..4c1e950 100644 --- a/OmniLinkBridge/MQTT/MessageProcessor.cs +++ b/OmniLinkBridge/MQTT/MessageProcessor.cs @@ -56,10 +56,10 @@ namespace OmniLinkBridge.MQTT { 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 index 4a81ecb..2545a62 100644 --- a/OmniLinkBridge/Properties/AssemblyInfo.cs +++ b/OmniLinkBridge/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [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 @@ using System.Runtime.InteropServices; // 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 index 4fe201e..fee5a78 100644 --- a/OmniLinkBridgeTest/Properties/AssemblyInfo.cs +++ b/OmniLinkBridgeTest/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; [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 index b22a878..754fdd3 100644 --- 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