diff --git a/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs b/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs index 6327c8f2..ef6c5b57 100644 --- a/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs +++ b/Essentials/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs @@ -84,6 +84,10 @@ namespace PepperDash.Essentials.Room.Config return rm; } + else if (typeName == "ddvc01Bridge") + { + return new Device(Key, Name); // placeholder device that does nothing. + } return null; } diff --git a/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs b/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs index 11147c2b..7c1c1b71 100644 --- a/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs +++ b/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs @@ -44,7 +44,7 @@ namespace PepperDash.Essentials string SystemUuid; - public List CotijaRooms { get; private set; } + public List CotijaRooms { get; private set; } long ButtonHeartbeatInterval = 1000; @@ -60,7 +60,7 @@ namespace PepperDash.Essentials Config = config; Debug.Console(0, this, "Mobile UI controller initializing for server:{0}", config.ServerUrl); - CotijaRooms = new List(); + CotijaRooms = new List(); //CrestronConsole.AddNewConsoleCommand(s => RegisterSystemToServer(), // "CotiInitializeHttpClient", "Initializes a new HTTP client connection to a specified URL", ConsoleAccessLevelEnum.AccessOperator); diff --git a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaBridgeBase.cs b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaBridgeBase.cs new file mode 100644 index 00000000..7f859497 --- /dev/null +++ b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaBridgeBase.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Crestron.SimplSharp; + +namespace PepperDash.Essentials +{ + /// + /// + /// + public abstract class CotijaBridgeBase + { + public CotijaSystemController Parent { get; private set; } + + public CotijaBridgeBase(CotijaSystemController parent) + { + Parent = parent; + } + } +} \ No newline at end of file diff --git a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs index 2c88aee5..356f57d2 100644 --- a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs +++ b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs @@ -16,7 +16,7 @@ using PepperDash.Essentials.Room.Config; namespace PepperDash.Essentials.Room.Cotija { - public class CotijaDdvc01RoomBridge : Device, IDelayedConfiguration + public class CotijaDdvc01RoomBridge : CotijaBridgeBase, IDelayedConfiguration { public class BoolJoin { @@ -122,6 +122,12 @@ namespace PepperDash.Essentials.Room.Cotija public bool ConfigIsLoaded { get; private set; } + /// + /// + /// + /// + /// + /// public CotijaDdvc01RoomBridge(string key, string name, uint ipId) : base(key, name) { @@ -156,6 +162,9 @@ namespace PepperDash.Essentials.Room.Cotija SetupFunctions(); SetupFeedbacks(); EISC.SigChange += EISC_SigChange; + // load config if it's already there + if (EISC.BooleanInput[BoolJoin.ConfigIsReady].BoolValue) + LoadConfigValues(); return base.CustomActivate(); } @@ -243,6 +252,7 @@ namespace PepperDash.Essentials.Room.Cotija EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues); + } /// @@ -329,6 +339,7 @@ namespace PepperDash.Essentials.Room.Cotija co.SourceLists.Add("default", newSl); + Debug.Console(0, this, "******* CONFIG FROM DDVC: \r", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented)); ConfigIsLoaded = true; diff --git a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs index ea9bc6ed..fa84ca66 100644 --- a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs +++ b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs @@ -10,15 +10,18 @@ using PepperDash.Essentials.Room.Cotija; namespace PepperDash.Essentials { - public class CotijaEssentialsHuddleSpaceRoomBridge + public class CotijaEssentialsHuddleSpaceRoomBridge : CotijaBridgeBase { - CotijaSystemController Parent; public EssentialsHuddleSpaceRoom Room { get; private set; } - public CotijaEssentialsHuddleSpaceRoomBridge(CotijaSystemController parent, EssentialsHuddleSpaceRoom room) + /// + /// + /// + /// + /// + public CotijaEssentialsHuddleSpaceRoomBridge(CotijaSystemController parent, EssentialsHuddleSpaceRoom room):base(parent) { - Parent = parent; Room = room; // we add actions to the messaging system with a path, and a related action. Custom action diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index f4bf645d..5acd33d3 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ