mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-15 12:44:58 +00:00
Trying to make bridge base happy with DDVC01
This commit is contained in:
@@ -84,6 +84,10 @@ namespace PepperDash.Essentials.Room.Config
|
|||||||
|
|
||||||
return rm;
|
return rm;
|
||||||
}
|
}
|
||||||
|
else if (typeName == "ddvc01Bridge")
|
||||||
|
{
|
||||||
|
return new Device(Key, Name); // placeholder device that does nothing.
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ namespace PepperDash.Essentials
|
|||||||
|
|
||||||
string SystemUuid;
|
string SystemUuid;
|
||||||
|
|
||||||
public List<CotijaEssentialsHuddleSpaceRoomBridge> CotijaRooms { get; private set; }
|
public List<CotijaBridgeBase> CotijaRooms { get; private set; }
|
||||||
|
|
||||||
long ButtonHeartbeatInterval = 1000;
|
long ButtonHeartbeatInterval = 1000;
|
||||||
|
|
||||||
@@ -60,7 +60,7 @@ namespace PepperDash.Essentials
|
|||||||
Config = config;
|
Config = config;
|
||||||
Debug.Console(0, this, "Mobile UI controller initializing for server:{0}", config.ServerUrl);
|
Debug.Console(0, this, "Mobile UI controller initializing for server:{0}", config.ServerUrl);
|
||||||
|
|
||||||
CotijaRooms = new List<CotijaEssentialsHuddleSpaceRoomBridge>();
|
CotijaRooms = new List<CotijaBridgeBase>();
|
||||||
|
|
||||||
//CrestronConsole.AddNewConsoleCommand(s => RegisterSystemToServer(),
|
//CrestronConsole.AddNewConsoleCommand(s => RegisterSystemToServer(),
|
||||||
// "CotiInitializeHttpClient", "Initializes a new HTTP client connection to a specified URL", ConsoleAccessLevelEnum.AccessOperator);
|
// "CotiInitializeHttpClient", "Initializes a new HTTP client connection to a specified URL", ConsoleAccessLevelEnum.AccessOperator);
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using Crestron.SimplSharp;
|
||||||
|
|
||||||
|
namespace PepperDash.Essentials
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public abstract class CotijaBridgeBase
|
||||||
|
{
|
||||||
|
public CotijaSystemController Parent { get; private set; }
|
||||||
|
|
||||||
|
public CotijaBridgeBase(CotijaSystemController parent)
|
||||||
|
{
|
||||||
|
Parent = parent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,7 +16,7 @@ using PepperDash.Essentials.Room.Config;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Room.Cotija
|
namespace PepperDash.Essentials.Room.Cotija
|
||||||
{
|
{
|
||||||
public class CotijaDdvc01RoomBridge : Device, IDelayedConfiguration
|
public class CotijaDdvc01RoomBridge : CotijaBridgeBase, IDelayedConfiguration
|
||||||
{
|
{
|
||||||
public class BoolJoin
|
public class BoolJoin
|
||||||
{
|
{
|
||||||
@@ -122,6 +122,12 @@ namespace PepperDash.Essentials.Room.Cotija
|
|||||||
|
|
||||||
public bool ConfigIsLoaded { get; private set; }
|
public bool ConfigIsLoaded { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
/// <param name="name"></param>
|
||||||
|
/// <param name="ipId"></param>
|
||||||
public CotijaDdvc01RoomBridge(string key, string name, uint ipId)
|
public CotijaDdvc01RoomBridge(string key, string name, uint ipId)
|
||||||
: base(key, name)
|
: base(key, name)
|
||||||
{
|
{
|
||||||
@@ -156,6 +162,9 @@ namespace PepperDash.Essentials.Room.Cotija
|
|||||||
SetupFunctions();
|
SetupFunctions();
|
||||||
SetupFeedbacks();
|
SetupFeedbacks();
|
||||||
EISC.SigChange += EISC_SigChange;
|
EISC.SigChange += EISC_SigChange;
|
||||||
|
// load config if it's already there
|
||||||
|
if (EISC.BooleanInput[BoolJoin.ConfigIsReady].BoolValue)
|
||||||
|
LoadConfigValues();
|
||||||
return base.CustomActivate();
|
return base.CustomActivate();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,6 +252,7 @@ namespace PepperDash.Essentials.Room.Cotija
|
|||||||
EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues);
|
EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -329,6 +339,7 @@ namespace PepperDash.Essentials.Room.Cotija
|
|||||||
|
|
||||||
co.SourceLists.Add("default", newSl);
|
co.SourceLists.Add("default", newSl);
|
||||||
|
|
||||||
|
Debug.Console(0, this, "******* CONFIG FROM DDVC: \r", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
|
||||||
|
|
||||||
|
|
||||||
ConfigIsLoaded = true;
|
ConfigIsLoaded = true;
|
||||||
|
|||||||
@@ -10,15 +10,18 @@ using PepperDash.Essentials.Room.Cotija;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials
|
namespace PepperDash.Essentials
|
||||||
{
|
{
|
||||||
public class CotijaEssentialsHuddleSpaceRoomBridge
|
public class CotijaEssentialsHuddleSpaceRoomBridge : CotijaBridgeBase
|
||||||
{
|
{
|
||||||
CotijaSystemController Parent;
|
|
||||||
|
|
||||||
public EssentialsHuddleSpaceRoom Room { get; private set; }
|
public EssentialsHuddleSpaceRoom Room { get; private set; }
|
||||||
|
|
||||||
public CotijaEssentialsHuddleSpaceRoomBridge(CotijaSystemController parent, EssentialsHuddleSpaceRoom room)
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="parent"></param>
|
||||||
|
/// <param name="room"></param>
|
||||||
|
public CotijaEssentialsHuddleSpaceRoomBridge(CotijaSystemController parent, EssentialsHuddleSpaceRoom room):base(parent)
|
||||||
{
|
{
|
||||||
Parent = parent;
|
|
||||||
Room = room;
|
Room = room;
|
||||||
|
|
||||||
// we add actions to the messaging system with a path, and a related action. Custom action
|
// we add actions to the messaging system with a path, and a related action. Custom action
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user