pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

EOD commit. Working on integrating Crestron OBTP library

Browse Source
This commit is contained in:
Neil Dorin
2017-09-15 17:02:22 -06:00
parent 9b85456f2e
commit 253095cb93
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Essentials Devices Common/Essentials Devices Common/References/Cisco One Button To Push.dll
View File

Binary file not shown.

41
Essentials Devices Common/Essentials Devices Common/VC/CiscoCodec/CiscoCodec.cs
View File

@@ -26,6 +26,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public StatusMonitorBase CommunicationMonitor { get; private set; } public StatusMonitorBase CommunicationMonitor { get; private set; }
public BoolFeedback StandbyIsOnFeedback { get; private set; }
private CiscoOneButtonToPush CodecObtp; private CiscoOneButtonToPush CodecObtp;
private Corporate_Phone_Book PhoneBook; private Corporate_Phone_Book PhoneBook;
@@ -92,15 +94,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
int PresentationSource; int PresentationSource;
public bool CommDebuggingIsOn;
// Constructor for IBasicCommunication // Constructor for IBasicCommunication
public CiscoCodec(string key, string name, IBasicCommunication comm, int serverPort) public CiscoCodec(string key, string name, IBasicCommunication comm, int serverPort)
: base(key, name) : base(key, name)
{ {
StandbyIsOnFeedback = new BoolFeedback(StandbyStateFeedbackFunc);
Communication = comm; Communication = comm;
SyncState = new CodecSyncState(key + "--sync"); SyncState = new CodecSyncState(key + "--sync");
PortGather = new CommunicationGather(Communication, Delimiter); PortGather = new CommunicationGather(Communication, Delimiter);
PortGather.IncludeDelimiter = true;
PortGather.LineReceived += this.Port_LineReceived; PortGather.LineReceived += this.Port_LineReceived;
//ServerPort = serverPort; //ServerPort = serverPort;
@@ -116,6 +123,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
CodecEvent = new CiscoCodecEvents.RootObject(); CodecEvent = new CiscoCodecEvents.RootObject();
CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate; CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
CodecStatus.Status.Standby.State.ValueChangedAction = StandbyIsOnFeedback.FireUpdate;
//Client = new HttpsClient(); //Client = new HttpsClient();
@@ -129,6 +139,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public override bool CustomActivate() public override bool CustomActivate()
{ {
CrestronConsole.AddNewConsoleCommand(SendText, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(SendText, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCiscoCommDebug", "0 for Off, 1 for on", ConsoleAccessLevelEnum.AccessOperator);
Communication.Connect(); Communication.Connect();
var socket = Communication as ISocketStatus; var socket = Communication as ISocketStatus;
@@ -193,6 +206,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
return base.CustomActivate(); return base.CustomActivate();
} }
public void SetCommDebug(string s)
{
if (s == "1")
{
CommDebuggingIsOn = true;
Debug.Console(0, this, "Comm Debug Enabled.");
}
else
{
CommDebuggingIsOn = false;
Debug.Console(0, this, "Comm Debug Disabled.");
}
}
void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e) void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
{ {
// Reset sync status on disconnect // Reset sync status on disconnect
@@ -208,17 +235,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// <param name="args"></param> /// <param name="args"></param>
void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args) void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
{ {
if (Debug.Level == 2) if (CommDebuggingIsOn)
{ {
if(!JsonFeedbackMessageIsIncoming) if(!JsonFeedbackMessageIsIncoming)
Debug.Console(2, this, "RX: '{0}'", args.Text); Debug.Console(1, this, "RX: '{0}'", args.Text);
} }
if (args.Text == "{" + Delimiter) // Check for the beginning of a new JSON message if (args.Text == "{" + Delimiter) // Check for the beginning of a new JSON message
{ {
JsonFeedbackMessageIsIncoming = true; JsonFeedbackMessageIsIncoming = true;
Debug.Console(2, this, "Incoming JSON message..."); if (CommDebuggingIsOn)
Debug.Console(1, this, "Incoming JSON message...");
JsonMessage = new StringBuilder(); JsonMessage = new StringBuilder();
} }
@@ -228,7 +256,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
JsonMessage.Append(args.Text); JsonMessage.Append(args.Text);
Debug.Console(2, this, "Complete JSON Received:\n{0}", JsonMessage.ToString()); if (CommDebuggingIsOn)
Debug.Console(1, this, "Complete JSON Received:\n{0}", JsonMessage.ToString());
// Forward the complete message to be deserialized // Forward the complete message to be deserialized
DeserializeResponse(JsonMessage.ToString()); DeserializeResponse(JsonMessage.ToString());
@@ -269,7 +298,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public void SendText(string command) public void SendText(string command)
{ {
Debug.Console(1, this, "Sending: '{0}'", command); if (CommDebuggingIsOn)
Debug.Console(1, this, "Sending: '{0}'", command);
Communication.SendText(command + Delimiter); Communication.SendText(command + Delimiter);
} }

10
Essentials/PepperDashEssentials/ControlSystem.cs
View File

@@ -128,12 +128,14 @@ namespace PepperDash.Essentials
} }
// CODEC TESTING // CODEC TESTING
//GenericSshClient TestCodecClient = new GenericSshClient("TestCodec-1--SshClient", "10.11.50.135", 22, "crestron", "2H3Zu&OvgXp6"); GenericSshClient TestCodecClient = new GenericSshClient("TestCodec-1--SshClient", "10.11.50.135", 22, "crestron", "2H3Zu&OvgXp6");
//PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec TestCodec = PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec TestCodec =
// new PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec("TestCodec-1", "Cisco Spark Room Kit", TestCodecClient, 8080); new PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec("TestCodec-1", "Cisco Spark Room Kit", TestCodecClient, 8080);
//TestCodec.CustomActivate(); TestCodec.CommDebuggingIsOn = true;
TestCodec.CustomActivate();
// CODEC TESTING // CODEC TESTING
} }