From 397b0b4d9c2167c9af48a8dffaeb51c57ff294c1 Mon Sep 17 00:00:00 2001 From: Heath Volmer Date: Mon, 8 Oct 2018 15:17:02 -0600 Subject: [PATCH] DDVC01 bridge, repaired device controls --- .../RoomBridges/CotijaDdvc01RoomBridge.cs | 40 ++++++++++++------- .../Properties/AssemblyInfo.cs | 2 +- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs b/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs index dccdc92f..f02d6098 100644 --- a/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs +++ b/PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs @@ -251,8 +251,8 @@ namespace PepperDash.Essentials.Room.Cotija void SetupFunctions() { #warning need join numbers for these - Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(12345))); - Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(12346))); + Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(BoolJoin.PromptForCode))); + Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(BoolJoin.ClientJoined))); Parent.AddAction(@"/room/room1/status", new Action(SendFullStatus)); @@ -280,21 +280,26 @@ namespace PepperDash.Essentials.Room.Cotija EISC.PulseBool(BoolJoin.ShutdownEnd))); Parent.AddAction(@"/room/room1/shutdownCancel", new Action(() => EISC.PulseBool(BoolJoin.ShutdownCancel))); - - - // Source Device (Current Source)' - - SourceDeviceMapDictionary sourceJoinMap = new SourceDeviceMapDictionary(); - - var prefix = @"/device/currentSource/"; - - foreach (var item in sourceJoinMap) - { - var join = item.Value; - Parent.AddAction(string.Format("{0}{1}", prefix, item.Key), new PressAndHoldAction(b => EISC.SetBool(join, b))); - } } + /// + /// + /// + /// + void SetupSourceFunctions(string devKey) + { + SourceDeviceMapDictionary sourceJoinMap = new SourceDeviceMapDictionary(); + + var prefix = string.Format("/device/{0}/", devKey); + + foreach (var item in sourceJoinMap) + { + var join = item.Value; + Parent.AddAction(string.Format("{0}{1}", prefix, item.Key), new PressAndHoldAction(b => EISC.SetBool(join, b))); + } + } + + /// /// Links feedbacks to whatever is gonna happen! /// @@ -488,6 +493,11 @@ namespace PepperDash.Essentials.Room.Cotija Type = type }; co.Devices.Add(devConf); + + if (group.ToLower().StartsWith("settopbox")) // Add others here as needed + { + SetupSourceFunctions(key); + } } co.SourceLists.Add("default", newSl); diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs index 7f0e0611..4cd22c15 100644 --- a/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] -[assembly: AssemblyVersion("1.2.10.*")] +[assembly: AssemblyVersion("1.2.11.*")]