pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-29 20:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Stop Sharing button method to use the room route action method to sync source fb. Updated xStatus, xConfiguration, booking and phonebook deserialization classes in codec to match onsite return results from NYU room kit plus codec

Browse Source
This commit is contained in:
Neil Dorin
2017-10-24 10:16:28 -06:00
parent 84262c782d
commit 17fd9488f2
9 changed files with 1776 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
View File

@@ -139,6 +139,7 @@
<Compile Include="VideoCodec\CiscoCodec\CallHistoryDataClasses.cs" />
<Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodec.cs" />
<Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodecPropertiesConfig.cs" />
<Compile Include="VideoCodec\CiscoCodec\xStatusSparkPlus.cs" />
<Compile Include="VideoCodec\MockVC\MockVcPropertiesConfig.cs" />
<Compile Include="VideoCodec\CiscoCodec\PhonebookDataClasses.cs" />
<Compile Include="VideoCodec\CiscoCodec\xConfiguration.cs" />

24
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs
View File

@@ -23,7 +23,27 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
public class LastUpdated
{
public DateTime Value { get; set; }
string _value;
public DateTime Value {
get
{
DateTime _valueDateTime;
try
{
_valueDateTime = DateTime.Parse(_value);
return _valueDateTime;
}
catch
{
return new DateTime();
}
}
set
{
_value = value.ToString();
}
}
}
public class Id
@@ -275,7 +295,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
public string status { get; set; }
public ResultInfo ResultInfo { get; set; }
public LastUpdated LastUpdated { get; set; }
//public LastUpdated LastUpdated { get; set; }
public List<Booking> Booking { get; set; }
}

15
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
View File

@@ -44,11 +44,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public StringFeedback LocalLayoutFeedback { get; private set; }
/// <summary>
/// An internal pseudo-source that is routable and connected to the osd input
/// </summary>
public DummyRoutingInputsDevice OsdSource { get; private set; }
private CodecCommandWithLabel CurrentSelfviewPipPosition;
private CodecCommandWithLabel CurrentLocalLayout;
@@ -373,7 +368,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
prefix + "/Status/Video/Selfview" + Delimiter +
prefix + "/Status/Video/Layout" + Delimiter +
prefix + "/Bookings" + Delimiter +
prefix + "/Event/CallDisconnect" + Delimiter;
prefix + "/Event/CallDisconnect" + Delimiter;// +
//prefix + "/Event/Bookings" + Delimiter;
return base.CustomActivate();
}
@@ -726,7 +722,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{
var directoryResults = new CodecDirectory();
directoryResults = CiscoCodecPhonebook.ConvertCiscoPhonebookToGeneric(codecPhonebookResponse.CommandResponse.PhonebookSearchResult);
if(codecPhonebookResponse.CommandResponse.PhonebookSearchResult.ResultInfo.TotalRows.Value != "0")
directoryResults = CiscoCodecPhonebook.ConvertCiscoPhonebookToGeneric(codecPhonebookResponse.CommandResponse.PhonebookSearchResult);
PrintPhonebook(directoryResults);
@@ -1004,7 +1001,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// </summary>
public void SelectPresentationSource1()
{
SelectPresentationByConnector(1);
SelectPresentationByConnector(2);
}
/// <summary>
@@ -1012,7 +1009,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// </summary>
public void SelectPresentationSource2()
{
SelectPresentationByConnector(2);
SelectPresentationByConnector(3);
}
/// <summary>

258
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xConfiguration.cs
View File

@@ -17,19 +17,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Dereverberation
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Mode2
public class Mode
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -44,7 +38,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class EchoControl
{
public Dereverberation Dereverberation { get; set; }
public Mode2 Mode { get; set; }
public Mode Mode { get; set; }
public NoiseReduction NoiseReduction { get; set; }
}
@@ -54,12 +48,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode2
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Microphone
{
public string id { get; set; }
public Mode Mode { get; set; }
public EchoControl EchoControl { get; set; }
public Level Level { get; set; }
public Mode2 Mode { get; set; }
}
public class Input
@@ -94,29 +94,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public Mode3 Mode { get; set; }
}
public class Mode4
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class OutputType
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Line
{
public string id { get; set; }
public Mode4 Mode { get; set; }
public OutputType OutputType { get; set; }
}
public class Output
{
public InternalSpeaker InternalSpeaker { get; set; }
public List<Line> Line { get; set; }
}
public class RingTone
@@ -146,38 +126,120 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public SoundsAndAlerts SoundsAndAlerts { get; set; }
}
public class Framerate
public class DefaultMode
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Camera
public class Backlight
{
public Framerate Framerate { get; set; }
public DefaultMode DefaultMode { get; set; }
}
public class Closeup
public class DefaultLevel
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Mode4
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Brightness
{
public DefaultLevel DefaultLevel { get; set; }
public Mode4 Mode { get; set; }
}
public class Mode5
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Focus
{
public Mode5 Mode { get; set; }
}
public class Level2
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Mode6
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Gamma
{
public Level2 Level { get; set; }
public Mode6 Mode { get; set; }
}
public class Mirror
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Level3
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Mode7
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Whitebalance
{
public Level3 Level { get; set; }
public Mode7 Mode { get; set; }
}
public class Camera
{
public string id { get; set; }
public Backlight Backlight { get; set; }
public Brightness Brightness { get; set; }
public Focus Focus { get; set; }
public Gamma Gamma { get; set; }
public Mirror Mirror { get; set; }
public Whitebalance Whitebalance { get; set; }
}
public class Closeup
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Mode8
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class SpeakerTrack
{
public Closeup Closeup { get; set; }
public Mode5 Mode { get; set; }
public Mode8 Mode { get; set; }
}
public class Cameras
{
public Camera Camera { get; set; }
public List<Camera> Camera { get; set; }
public SpeakerTrack SpeakerTrack { get; set; }
}
@@ -187,7 +249,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode6
public class Mode9
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -202,7 +264,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class AutoAnswer
{
public Delay Delay { get; set; }
public Mode6 Mode { get; set; }
public Mode9 Mode { get; set; }
public Mute2 Mute { get; set; }
}
@@ -235,7 +297,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public DefaultTimeout DefaultTimeout { get; set; }
}
public class Mode7
public class Mode10
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -243,10 +305,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Encryption
{
public Mode7 Mode { get; set; }
public Mode10 Mode { get; set; }
}
public class Mode8
public class Mode11
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -254,7 +316,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class FarEndControl
{
public Mode8 Mode { get; set; }
public Mode11 Mode { get; set; }
}
public class MaxReceiveCallRate
@@ -281,7 +343,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode9
public class Mode12
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -289,7 +351,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class MultiStream
{
public Mode9 Mode { get; set; }
public Mode12 Mode { get; set; }
}
public class Conference
@@ -312,7 +374,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode10
public class Mode13
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -327,11 +389,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Authentication
{
public LoginName LoginName { get; set; }
public Mode10 Mode { get; set; }
public Mode13 Mode { get; set; }
public Password Password { get; set; }
}
public class Mode11
public class Mode14
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -339,7 +401,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class CallSetup
{
public Mode11 Mode { get; set; }
public Mode14 Mode { get; set; }
}
public class KeySize
@@ -388,7 +450,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode12
public class Mode15
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -397,7 +459,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class NAT
{
public Address2 Address { get; set; }
public Mode12 Mode { get; set; }
public Mode15 Mode { get; set; }
}
public class H323
@@ -483,7 +545,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode13
public class Mode16
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -512,7 +574,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public AnonymousIdentity AnonymousIdentity { get; set; }
public Eap Eap { get; set; }
public Identity Identity { get; set; }
public Mode13 Mode { get; set; }
public Mode16 Mode { get; set; }
public Password2 Password { get; set; }
public TlsVerify TlsVerify { get; set; }
public UseClientCertificate UseClientCertificate { get; set; }
@@ -640,7 +702,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public Video Video { get; set; }
}
public class Mode14
public class Mode17
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -649,7 +711,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class QoS
{
public Diffserv Diffserv { get; set; }
public Mode14 Mode { get; set; }
public Mode17 Mode { get; set; }
}
public class Allow
@@ -669,7 +731,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode15
public class Mode18
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -683,7 +745,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Voice
{
public Mode15 Mode { get; set; }
public Mode18 Mode { get; set; }
public VlanId VlanId { get; set; }
}
@@ -707,7 +769,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public VLAN VLAN { get; set; }
}
public class Mode16
public class Mode19
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -715,10 +777,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class CDP
{
public Mode16 Mode { get; set; }
public Mode19 Mode { get; set; }
}
public class Mode17
public class Mode20
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -726,10 +788,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class H3232
{
public Mode17 Mode { get; set; }
public Mode20 Mode { get; set; }
}
public class Mode18
public class Mode21
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -737,7 +799,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class HTTP
{
public Mode18 Mode { get; set; }
public Mode21 Mode { get; set; }
}
public class MinimumTLSVersion
@@ -777,7 +839,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public VerifyServerCertificate VerifyServerCertificate { get; set; }
}
public class Mode19
public class Mode22
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -797,11 +859,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class NTP2
{
public Mode19 Mode { get; set; }
public Mode22 Mode { get; set; }
public List<Server3> Server { get; set; }
}
public class Mode20
public class Mode23
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -809,7 +871,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class SIP
{
public Mode20 Mode { get; set; }
public Mode23 Mode { get; set; }
}
public class CommunityName
@@ -830,7 +892,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public Address7 Address { get; set; }
}
public class Mode21
public class Mode24
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -852,12 +914,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{
public CommunityName CommunityName { get; set; }
public List<Host> Host { get; set; }
public Mode21 Mode { get; set; }
public Mode24 Mode { get; set; }
public SystemContact SystemContact { get; set; }
public SystemLocation SystemLocation { get; set; }
}
public class Mode22
public class Mode25
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -865,10 +927,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class SSH
{
public Mode22 Mode { get; set; }
public Mode25 Mode { get; set; }
}
public class Mode23
public class Mode26
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -876,7 +938,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class UPnP
{
public Mode23 Mode { get; set; }
public Mode26 Mode { get; set; }
}
public class WelcomeText
@@ -1017,7 +1079,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode24
public class Mode27
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1035,11 +1097,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public ExternalManager ExternalManager { get; set; }
public HttpMethod HttpMethod { get; set; }
public LoginName2 LoginName { get; set; }
public Mode24 Mode { get; set; }
public Mode27 Mode { get; set; }
public Password3 Password { get; set; }
}
public class Mode25
public class Mode28
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1077,7 +1139,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Proximity
{
public Mode25 Mode { get; set; }
public Mode28 Mode { get; set; }
public Services Services { get; set; }
}
@@ -1135,7 +1197,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode26
public class Mode29
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1144,7 +1206,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Ice
{
public DefaultCandidate DefaultCandidate { get; set; }
public Mode26 Mode { get; set; }
public Mode29 Mode { get; set; }
}
public class ListenPort
@@ -1220,7 +1282,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode27
public class Mode30
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1230,7 +1292,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{
public BaudRate BaudRate { get; set; }
public LoginRequired LoginRequired { get; set; }
public Mode27 Mode { get; set; }
public Mode30 Mode { get; set; }
}
public class BootAction
@@ -1319,7 +1381,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public Type2 Type { get; set; }
}
public class Mode28
public class Mode31
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1327,7 +1389,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class KeyTones
{
public Mode28 Mode { get; set; }
public Mode31 Mode { get; set; }
}
public class Language
@@ -1397,7 +1459,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode29
public class Mode32
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1434,7 +1496,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public BaseDN BaseDN { get; set; }
public Encryption3 Encryption { get; set; }
public MinimumTLSVersion2 MinimumTLSVersion { get; set; }
public Mode29 Mode { get; set; }
public Mode32 Mode { get; set; }
public Server6 Server { get; set; }
public VerifyServerCertificate2 VerifyServerCertificate { get; set; }
}
@@ -1456,7 +1518,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode30
public class Mode33
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1465,7 +1527,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class CameraControl
{
public CameraId CameraId { get; set; }
public Mode30 Mode { get; set; }
public Mode33 Mode { get; set; }
}
public class InputSourceType
@@ -1480,12 +1542,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Visibility
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class PreferredResolution
{
public string valueSpaceRef { get; set; }
@@ -1504,16 +1560,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Visibility
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
}
public class Connector
{
public string id { get; set; }
public CameraControl CameraControl { get; set; }
public InputSourceType InputSourceType { get; set; }
public Name3 Name { get; set; }
public Visibility Visibility { get; set; }
public PreferredResolution PreferredResolution { get; set; }
public PresentationSelection PresentationSelection { get; set; }
public Quality Quality { get; set; }
public Visibility Visibility { get; set; }
}
public class Input2
@@ -1527,7 +1589,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode31
public class Mode34
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1535,7 +1597,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class CEC
{
public Mode31 Mode { get; set; }
public Mode34 Mode { get; set; }
}
public class MonitorRole
@@ -1580,7 +1642,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode32
public class Mode35
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1601,7 +1663,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Default
{
public FullscreenMode FullscreenMode { get; set; }
public Mode32 Mode { get; set; }
public Mode35 Mode { get; set; }
public OnMonitorRole OnMonitorRole { get; set; }
public PIPPosition PIPPosition { get; set; }
}
@@ -1612,7 +1674,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Mode33
public class Mode36
{
public string valueSpaceRef { get; set; }
public string Value { get; set; }
@@ -1621,7 +1683,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class OnCall
{
public Duration Duration { get; set; }
public Mode33 Mode { get; set; }
public Mode36 Mode { get; set; }
}
public class Selfview

28
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs
View File

@@ -31,15 +31,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
}
public class ConnectionStatus
{
public string Value { get; set; }
}
public class EcReferenceDelay
{
public string Value { get; set; }
}
public class Microphone
{
public string id { get; set; }
public ConnectionStatus ConnectionStatus { get; set; }
public EcReferenceDelay EcReferenceDelay { get; set; }
}
public class Connectors
@@ -205,6 +212,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public string Value { get; set; }
}
public class Flip
{
public string Value { get; set; }
}
public class HardwareID
{
public string Value { get; set; }
}
public class Manufacturer
{
public string Value { get; set; }
@@ -237,15 +254,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public Zoom Zoom { get; set; }
}
public class SoftwareID
{
public string Value { get; set; }
}
public class Camera
{
public string id { get; set; }
public Capabilities Capabilities { get; set; }
public Connected Connected { get; set; }
public Framerate Framerate { get; set; }
public Flip Flip { get; set; }
public HardwareID HardwareID { get; set; }
public MacAddress MacAddress { get; set; }
public Manufacturer Manufacturer { get; set; }
public Model Model { get; set; }
public Position Position { get; set; }
public SerialNumber SerialNumber { get; set; }
public SoftwareID SoftwareID { get; set; }
}
public class Availability

1552
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatusSparkPlus.cs Normal file
View File

File diff suppressed because it is too large Load Diff

6
Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
View File

@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Routing;
using PepperDash.Essentials.Devices.Common;
using PepperDash.Essentials.Devices.Common.Codec;
@@ -33,6 +34,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
#endregion
/// <summary>
/// An internal pseudo-source that is routable and connected to the osd input
/// </summary>
public DummyRoutingInputsDevice OsdSource { get; protected set; }
public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }

2
Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -944,6 +944,8 @@ namespace PepperDash.Essentials
if (_CurrentRoom != null)
_CurrentRoom.CurrentSingleSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd"));
SetupHeaderButtons();
}
else

1
Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -179,7 +179,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
triList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
triList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, Codec.StopSharing);
}
catch (Exception e)
{