mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-01-28 20:04:56 +00:00
Wrap up Friday - null ref in RoomBase on Occ sensor event
This commit is contained in:
@@ -38,16 +38,14 @@ namespace PepperDash.Essentials.Core
|
||||
/// </summary>
|
||||
public override bool CustomActivate()
|
||||
{
|
||||
new CTimer(o =>
|
||||
Debug.Console(0, this, "Activating");
|
||||
var response = Hardware.RegisterWithLogging(Key);
|
||||
if (response == eDeviceRegistrationUnRegistrationResponse.Success)
|
||||
{
|
||||
Debug.Console(1, this, "Activating");
|
||||
var response = Hardware.RegisterWithLogging(Key);
|
||||
if (response == eDeviceRegistrationUnRegistrationResponse.Success)
|
||||
{
|
||||
Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
|
||||
CommunicationMonitor.Start();
|
||||
}
|
||||
}, 0);
|
||||
Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
|
||||
CommunicationMonitor.Start();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -201,7 +201,7 @@ namespace PepperDash.Essentials.Devices.Common
|
||||
{
|
||||
if (props.PortNumber > cs.NumberOfVersiPorts)
|
||||
{
|
||||
Debug.Console(0, "WARNING: Cannot register Vesiport {0} on {1}. Out of range",
|
||||
Debug.Console(0, "WARNING: Cannot add Vesiport {0} on {1}. Out of range",
|
||||
props.PortNumber, props.PortDeviceKey);
|
||||
return null;
|
||||
}
|
||||
@@ -290,16 +290,17 @@ namespace PepperDash.Essentials.Devices.Common
|
||||
else if (typeName == "occsensor")
|
||||
{
|
||||
var props = JsonConvert.DeserializeObject<GlsOccupancySensorConfigurationProperties>(properties.ToString());
|
||||
|
||||
uint id = 0x00;
|
||||
GlsOccupancySensorBase occSensor = null;
|
||||
|
||||
try
|
||||
{
|
||||
id = Convert.ToUInt32(props.CresnetId, 8);
|
||||
id = Convert.ToUInt32(props.CresnetId, 16);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Console(0, "Unable to convert Crestnet ID: {0} to hex. Error:\n{1}", props.CresnetId, e);
|
||||
Debug.Console(0, "ERROR:Unable to convert Crestnet ID: {0} to hex. Error:\n{1}", props.CresnetId, e);
|
||||
}
|
||||
|
||||
switch (props.Model.ToLower())
|
||||
@@ -324,7 +325,7 @@ namespace PepperDash.Essentials.Devices.Common
|
||||
if (occSensor != null)
|
||||
return new EssentialsGlsOccupancySensorBaseController(key, name, occSensor, props);
|
||||
else
|
||||
Debug.Console(0, "Unable to create Occupancy Sensor Device. Key: '{0}'", key);
|
||||
Debug.Console(0, "ERROR: Unable to create Occupancy Sensor Device. Key: '{0}'", key);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -39,6 +39,9 @@ namespace PepperDash.Essentials.Devices.Common.Occupancy
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public class GlsOccupancySensorConfigurationProperties
|
||||
{
|
||||
public string CresnetId { get; set; }
|
||||
|
||||
@@ -130,6 +130,11 @@
|
||||
<Compile Include="OTHER\Fusion\FusionEventHandlers.cs" />
|
||||
<Compile Include="OTHER\Fusion\FusionProcessorQueries.cs" />
|
||||
<Compile Include="OTHER\Fusion\FusionRviDataClasses.cs" />
|
||||
<Compile Include="Properties\Resources.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="REMOVE EssentialsApp.cs" />
|
||||
<Compile Include="OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
|
||||
<Compile Include="HttpApiHandler.cs" />
|
||||
@@ -193,6 +198,15 @@
|
||||
<Compile Include="UI\SubpageReferenceListSourceItem.cs" />
|
||||
<None Include="app.config" />
|
||||
<None Include="Properties\ControlSystem.cfg" />
|
||||
<None Include="Resources\PepperDash Essentials iPad.sgd">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Resources\PepperDash Essentials TSW-560.sgd">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Resources\PepperDash Essentials TSW-760.sgd">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">
|
||||
@@ -204,6 +218,12 @@
|
||||
<Name>Essentials Devices Common</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Properties\Resources.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
[assembly: AssemblyCompany("PepperDash Technology Corp")]
|
||||
[assembly: AssemblyProduct("PepperDashEssentials")]
|
||||
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
|
||||
[assembly: AssemblyVersion("1.0.27.*")]
|
||||
[assembly: AssemblyVersion("1.0.30.*")]
|
||||
|
||||
|
||||
81
Essentials/PepperDashEssentials/Properties/Resources.Designer.cs
generated
Normal file
81
Essentials/PepperDashEssentials/Properties/Resources.Designer.cs
generated
Normal file
@@ -0,0 +1,81 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.8794
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace PepperDash.Essentials.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
||||
/// </summary>
|
||||
// This class was auto-generated by the StronglyTypedResourceBuilder
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
internal class Resources {
|
||||
|
||||
private static global::System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
internal Resources() {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the cached ResourceManager instance used by this class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PepperDash.Essentials.Properties.Resources", typeof(Resources).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Overrides the current thread's CurrentUICulture property for all
|
||||
/// resource lookups using this strongly typed resource class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
set {
|
||||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
|
||||
internal static byte[] PepperDash_Essentials_iPad {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("PepperDash_Essentials_iPad", resourceCulture);
|
||||
return ((byte[])(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static byte[] PepperDash_Essentials_TSW_560 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("PepperDash_Essentials_TSW_560", resourceCulture);
|
||||
return ((byte[])(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static byte[] PepperDash_Essentials_TSW_760 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("PepperDash_Essentials_TSW_760", resourceCulture);
|
||||
return ((byte[])(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
130
Essentials/PepperDashEssentials/Properties/Resources.resx
Normal file
130
Essentials/PepperDashEssentials/Properties/Resources.resx
Normal file
@@ -0,0 +1,130 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="PepperDash_Essentials_iPad" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\PepperDash Essentials iPad.sgd;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="PepperDash_Essentials_TSW_560" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\PepperDash Essentials TSW-560.sgd;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="PepperDash_Essentials_TSW_760" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\PepperDash Essentials TSW-760.sgd;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
</root>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
20901
Essentials/PepperDashEssentials/Resources/PepperDash Essentials iPad.sgd
Normal file
20901
Essentials/PepperDashEssentials/Resources/PepperDash Essentials iPad.sgd
Normal file
File diff suppressed because it is too large
Load Diff
@@ -197,16 +197,16 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
||||
void Codec_IsReady()
|
||||
{
|
||||
string roomNumberSipUri = "";
|
||||
|
||||
#warning FIX PHONE FORMATTING TO ONLY SHOW WHEN APPROPRIATE - TALK TO NEIL
|
||||
|
||||
if (!string.IsNullOrEmpty(Codec.CodecInfo.SipUri)) // If both values are present, format the string with a pipe divider
|
||||
roomNumberSipUri = string.Format("{0} | {1}", GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber), Codec.CodecInfo.SipUri);
|
||||
else // If only one value present, just show the phone number
|
||||
roomNumberSipUri = Codec.CodecInfo.SipPhoneNumber;
|
||||
|
||||
if (string.IsNullOrEmpty(roomNumberSipUri))
|
||||
{
|
||||
var phone = Codec.CodecInfo.E164Alias.Length < 7 ? Codec.CodecInfo.E164Alias : GetFormattedPhoneNumber(Codec.CodecInfo.E164Alias);
|
||||
roomNumberSipUri = string.Format("{0} | {1}", phone, Codec.CodecInfo.H323Id);
|
||||
}
|
||||
if(string.IsNullOrEmpty(roomNumberSipUri))
|
||||
roomNumberSipUri = string.Format("{0} | {1}", Codec.CodecInfo.E164Alias, Codec.CodecInfo.H323Id);
|
||||
|
||||
TriList.SetString(UIStringJoin.RoomPhoneText, roomNumberSipUri);
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,19 +0,0 @@
|
||||
{
|
||||
"RoomName": "Neil Essentials Huddle Space",
|
||||
"IpId": 241,
|
||||
"RoomGuid": "1-00:10:7f:74:11:49-8bca1901-999e-47fa-9c48-d241d6",
|
||||
"StaticAssets": [
|
||||
{
|
||||
"Number": 1,
|
||||
"Name": "Test Asset 1",
|
||||
"Type": "Test Asset 1",
|
||||
"InstanceID": "f8a00507-fa3c-4c9d-acfd-1bc03a0bec60"
|
||||
},
|
||||
{
|
||||
"Number": 2,
|
||||
"Name": "Test Asset 2",
|
||||
"Type": "Test Asset 2",
|
||||
"InstanceID": "82f31b23-8572-4192-8631-8128e65959e3"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,355 +0,0 @@
|
||||
{
|
||||
"system": {},
|
||||
"system_url": "http://example.com/systems/55bc5f25-1122-4a85-9ae1-9be21b95a7dc#/system_summary",
|
||||
"template": {
|
||||
"info": {
|
||||
"lastModifiedDate": "2017-03-22T17:32:17.800Z",
|
||||
"comment": "",
|
||||
"lastUid": 13,
|
||||
"processorType": "mc3",
|
||||
"systemType": "presentation",
|
||||
"requiredControlSofwareVersion": ""
|
||||
},
|
||||
"rooms": [
|
||||
{
|
||||
"properties": {
|
||||
"helpMessage": "Help!!",
|
||||
"volumes": {
|
||||
"master": {
|
||||
"label": "Volume",
|
||||
"level": 50,
|
||||
"deviceKey": "biampTesira-1--master"
|
||||
},
|
||||
"program": {
|
||||
"label": "Volume",
|
||||
"level": 50,
|
||||
"deviceKey": "biampTesira-1--program"
|
||||
}
|
||||
},
|
||||
"defaultVideoBehavior": "basic",
|
||||
"defaultAudioKey": "amplifier-1",
|
||||
"displayKeys": [
|
||||
"display-1",
|
||||
"display-2"
|
||||
],
|
||||
"hasDsp": true,
|
||||
"defaultAudioBehavior": "audioFollowVideo",
|
||||
"sourceListKey": "default",
|
||||
"description": ""
|
||||
},
|
||||
"key": "room1",
|
||||
"type": "presentation",
|
||||
"name": "West Dungeon"
|
||||
}
|
||||
],
|
||||
"sourceLists": {
|
||||
"default": {
|
||||
"source-2": {
|
||||
"sourceKey": "laptop-2",
|
||||
"includeInSourceList": true,
|
||||
"volumeControlKey": "$defaultAudio",
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "laptop-2",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"icon": "",
|
||||
"order": 2,
|
||||
"type": "route",
|
||||
"altIcon": "Blank"
|
||||
},
|
||||
"roomOff": {
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "$off",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"sourceKey": "$off",
|
||||
"type": "off"
|
||||
},
|
||||
"source-1": {
|
||||
"sourceKey": "laptop-1",
|
||||
"includeInSourceList": true,
|
||||
"volumeControlKey": "$defaultAudio",
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "laptop-1",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"icon": "",
|
||||
"order": 1,
|
||||
"type": "route",
|
||||
"altIcon": "Blank"
|
||||
},
|
||||
"source-3": {
|
||||
"sourceKey": "sonyBdp-generic-1",
|
||||
"includeInSourceList": true,
|
||||
"volumeControlKey": "$defaultAudio",
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "sonyBdp-generic-1",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"icon": "",
|
||||
"order": 3,
|
||||
"type": "route",
|
||||
"altIcon": "Blank"
|
||||
}
|
||||
}
|
||||
},
|
||||
"tieLines": [
|
||||
{
|
||||
"destinationPort": "card2--hdmiIn",
|
||||
"sourcePort": "HdmiOut",
|
||||
"sourceKey": "sonyBdp-generic-1",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "dmMd8x8-1"
|
||||
},
|
||||
{
|
||||
"destinationPort": "anyAudioIn",
|
||||
"sourcePort": "card1--audioOut1",
|
||||
"sourceKey": "dmMd8x8-1",
|
||||
"type": "audio",
|
||||
"destinationKey": "amplifier-1"
|
||||
}
|
||||
],
|
||||
"devices": [
|
||||
{
|
||||
"group": "dmChassis",
|
||||
"properties": {
|
||||
"outputSlots": {
|
||||
"1": "dmc4kHdo"
|
||||
},
|
||||
"inputNames": {},
|
||||
"volumeControls": {
|
||||
"1": {
|
||||
"outLevel": -1,
|
||||
"isVolumeControlPoint": true
|
||||
},
|
||||
"2": {
|
||||
"outLevel": 65535,
|
||||
"isVolumeControlPoint": false
|
||||
}
|
||||
},
|
||||
"control": {
|
||||
"method": "ipid",
|
||||
"ipid": "03",
|
||||
"params": {
|
||||
"endOfLineString": "\n",
|
||||
"deviceReadyResponsePattern": ".*>"
|
||||
}
|
||||
},
|
||||
"inputSlots": {
|
||||
"1": "dmc4kC",
|
||||
"2": "dmc4kHd"
|
||||
}
|
||||
},
|
||||
"uid": 9,
|
||||
"key": "dmMd8x8-1",
|
||||
"name": "DM-MD8x8",
|
||||
"type": "dmMd8x8"
|
||||
},
|
||||
{
|
||||
"group": "amplifier",
|
||||
"properties": {},
|
||||
"uid": 0,
|
||||
"key": "amplifier-1",
|
||||
"name": "Audio endpoint/Amplifier",
|
||||
"type": "amplifier"
|
||||
},
|
||||
{
|
||||
"group": "display",
|
||||
"properties": {
|
||||
"control": {
|
||||
"method": "tcpIp",
|
||||
"tcpSshProperties": {
|
||||
"port": 123,
|
||||
"address": "123"
|
||||
}
|
||||
}
|
||||
},
|
||||
"uid": 2,
|
||||
"key": "display-1",
|
||||
"name": "Display 1",
|
||||
"type": "NecMPSX"
|
||||
},
|
||||
{
|
||||
"group": "pc",
|
||||
"properties": {
|
||||
"hasAudio": true,
|
||||
"hasControls": false
|
||||
},
|
||||
"uid": 3,
|
||||
"key": "laptop-1",
|
||||
"name": "Laptop AAA",
|
||||
"type": "laptop"
|
||||
},
|
||||
{
|
||||
"group": "pc",
|
||||
"properties": {
|
||||
"hasAudio": true,
|
||||
"hasControls": false
|
||||
},
|
||||
"uid": 4,
|
||||
"key": "laptop-2",
|
||||
"name": "Laptop BBB",
|
||||
"type": "laptop"
|
||||
},
|
||||
{
|
||||
"group": "discPlayer",
|
||||
"properties": {
|
||||
"hasControls": true,
|
||||
"hasTransport": true,
|
||||
"control": {
|
||||
"method": "ir",
|
||||
"controlPortNumber": 1,
|
||||
"controlPortDevKey": "processor",
|
||||
"irFile": "Sony BDP Series.ir"
|
||||
},
|
||||
"hasAudio": true,
|
||||
"hasNumeric": true,
|
||||
"hasDpad": true
|
||||
},
|
||||
"uid": 5,
|
||||
"key": "sonyBdp-generic-1",
|
||||
"name": "LaserDisc player",
|
||||
"type": "sonyBdp-generic"
|
||||
},
|
||||
{
|
||||
"group": "processor",
|
||||
"properties": {
|
||||
"numberOfIrPorts": 5,
|
||||
"numberOfComPorts": 2
|
||||
},
|
||||
"uid": 6,
|
||||
"supportsCompliance": true,
|
||||
"type": "mc3",
|
||||
"name": "MC3",
|
||||
"supportedSystemTypes": [
|
||||
"custom",
|
||||
"hudType",
|
||||
"presType"
|
||||
],
|
||||
"key": "processor"
|
||||
},
|
||||
{
|
||||
"group": "display",
|
||||
"properties": {
|
||||
"control": {
|
||||
"method": "tcpIp",
|
||||
"tcpSshProperties": {
|
||||
"port": 123,
|
||||
"address": "123"
|
||||
}
|
||||
}
|
||||
},
|
||||
"uid": 7,
|
||||
"key": "display-2",
|
||||
"name": "Display 2",
|
||||
"type": "NecMPSX"
|
||||
},
|
||||
{
|
||||
"group": "touchpanel",
|
||||
"properties": {
|
||||
"sourcesOverflowCount": 5,
|
||||
"defaultRoomKey": "room1",
|
||||
"control": {
|
||||
"method": "ipid",
|
||||
"ipid": "A1",
|
||||
"params": {
|
||||
"endOfLineString": "\n",
|
||||
"deviceReadyResponsePattern": ".*>"
|
||||
}
|
||||
},
|
||||
"showTime": true,
|
||||
"roomListKey": "",
|
||||
"showDate": true,
|
||||
"sgdFile": "Essentials TSW.sgd",
|
||||
"usesSplashPage": true,
|
||||
"showVolumeGauge": true
|
||||
},
|
||||
"uid": 8,
|
||||
"key": "tsw1052-1",
|
||||
"name": "TSW 1050/1052 1",
|
||||
"type": "tsw1052"
|
||||
},
|
||||
{
|
||||
"group": "dsp",
|
||||
"properties": {
|
||||
"levelControlBlocks": {
|
||||
"audioCallRx": {
|
||||
"index1": 1,
|
||||
"index2": 0,
|
||||
"label": "Audio Call Receive",
|
||||
"hasLevel": true,
|
||||
"instanceTag": "VoIPRxLevel",
|
||||
"hasMute": true
|
||||
},
|
||||
"audioCallTx": {
|
||||
"index1": 1,
|
||||
"index2": 0,
|
||||
"label": "Audio Call Transmit",
|
||||
"hasLevel": false,
|
||||
"instanceTag": "VoIPTxLevel",
|
||||
"hasMute": true
|
||||
},
|
||||
"master": {
|
||||
"index1": 1,
|
||||
"index2": 0,
|
||||
"label": "Master",
|
||||
"hasLevel": true,
|
||||
"instanceTag": "RoomLevel",
|
||||
"hasMute": true
|
||||
},
|
||||
"program": {
|
||||
"index1": 1,
|
||||
"index2": 0,
|
||||
"label": "Program",
|
||||
"hasLevel": true,
|
||||
"instanceTag": "ProgramLevel",
|
||||
"hasMute": true
|
||||
}
|
||||
},
|
||||
"presenterMic": {
|
||||
"enabled": false
|
||||
},
|
||||
"control": {
|
||||
"method": "ssh",
|
||||
"tcpSshProperties": {
|
||||
"port": 22,
|
||||
"address": "10.11.50.191",
|
||||
"ipAutoReconnectInterval": 1000,
|
||||
"username": "default"
|
||||
},
|
||||
"comParams": {
|
||||
"stopBits": 1,
|
||||
"hardwareHandshake": "None",
|
||||
"baudRate": 38400,
|
||||
"dataBits": 8,
|
||||
"parity": "None",
|
||||
"softwareHandshake": "None",
|
||||
"protocol": "RS232"
|
||||
},
|
||||
"params": {
|
||||
"endOfLineString": "\n",
|
||||
"deviceReadyResponsePattern": "Welcome to the Tesira Text Protocol Server.*"
|
||||
}
|
||||
}
|
||||
},
|
||||
"uid": 12,
|
||||
"type": "biampTesira",
|
||||
"name": "Biamp Tesira 1",
|
||||
"key": "biampTesira-1"
|
||||
}
|
||||
]
|
||||
},
|
||||
"template_url": "http://example.com/templates/9f143a56-a160-453a-a7cb-5854857fd220#/template_summary"
|
||||
}
|
||||
@@ -1,388 +0,0 @@
|
||||
{
|
||||
"template": {
|
||||
"info": {
|
||||
"comment": "",
|
||||
"lastUid": 9,
|
||||
"requiredControlSofwareVersion": "",
|
||||
"processorType": "rmc3",
|
||||
"lastModifiedDate": "2017-07-07T16:58:43.621Z",
|
||||
"systemType": "presentation"
|
||||
},
|
||||
"devices": [
|
||||
{
|
||||
"type": "dmMd8x8",
|
||||
"properties": {
|
||||
"inputNames": {},
|
||||
"control": {
|
||||
"params": {
|
||||
"deviceReadyResponsePattern": ".*>",
|
||||
"endOfLineString": "\n"
|
||||
},
|
||||
"method": "ipid",
|
||||
"ipid": "04"
|
||||
},
|
||||
"inputSlots": {
|
||||
"1": "dmc4kHd",
|
||||
"2": "dmc4kHd",
|
||||
"3": "dmc4kHd"
|
||||
},
|
||||
"volumeControls": {
|
||||
"1": {
|
||||
"outLevel": 65535,
|
||||
"isVolumeControlPoint": false
|
||||
},
|
||||
"2": {
|
||||
"outLevel": 65535,
|
||||
"isVolumeControlPoint": false
|
||||
}
|
||||
},
|
||||
"outputSlots": {
|
||||
"1": "dmc4kHdo"
|
||||
}
|
||||
},
|
||||
"key": "dmMd8x8-1",
|
||||
"name": "DM-MD8x8 Chassis 1",
|
||||
"uid": 4,
|
||||
"group": "dmChassis"
|
||||
},
|
||||
{
|
||||
"supportsCompliance": true,
|
||||
"key": "processor",
|
||||
"properties": {
|
||||
"numberOfComPorts": 1,
|
||||
"numberOfIrPorts": 2
|
||||
},
|
||||
"supportedSystemTypes": [
|
||||
"hudType",
|
||||
"presType",
|
||||
"vtcType",
|
||||
"custom"
|
||||
],
|
||||
"type": "rmc3",
|
||||
"supportedConfigModes": [
|
||||
"compliance",
|
||||
"essentials"
|
||||
],
|
||||
"uid": 0,
|
||||
"name": "RMC3",
|
||||
"group": "processor"
|
||||
},
|
||||
{
|
||||
"type": "sonyBdp-generic",
|
||||
"properties": {
|
||||
"control": {
|
||||
"irFile": "Sony BDP Series.ir",
|
||||
"method": "ir",
|
||||
"controlPortDevKey": "processor",
|
||||
"controlPortNumber": 1
|
||||
},
|
||||
"hasAudio": true,
|
||||
"hasControls": true,
|
||||
"hasTransport": true,
|
||||
"hasDpad": true
|
||||
},
|
||||
"key": "sonyBdp-generic-1",
|
||||
"group": "discPlayer",
|
||||
"uid": 1,
|
||||
"name": "Sony Bluray 1"
|
||||
},
|
||||
{
|
||||
"type": "comcastMotorola-generic",
|
||||
"properties": {
|
||||
"control": {
|
||||
"irFile": "Comcast Motorola DVR.ir",
|
||||
"method": "ir",
|
||||
"controlPortDevKey": "processor",
|
||||
"controlPortNumber": 2
|
||||
},
|
||||
"hasAudio": true,
|
||||
"hasControls": true,
|
||||
"hasDvr": true,
|
||||
"hasDpad": true,
|
||||
"hasNumeric": true
|
||||
},
|
||||
"key": "comcastMotorola-generic-1",
|
||||
"group": "setTopBox",
|
||||
"uid": 2,
|
||||
"name": "Comcast Motorola DVR 1"
|
||||
},
|
||||
{
|
||||
"type": "laptop",
|
||||
"properties": {
|
||||
"hasAudio": true,
|
||||
"hasControls": false
|
||||
},
|
||||
"key": "laptop-1",
|
||||
"group": "pc",
|
||||
"uid": 3,
|
||||
"name": "Laptop 1"
|
||||
},
|
||||
{
|
||||
"type": "biampTesira",
|
||||
"properties": {
|
||||
"control": {
|
||||
"deviceReadyResponsePattern": "Welcome to the Tesira Text Protocol Server.*",
|
||||
"tcpSshProperties": {
|
||||
"port": 22,
|
||||
"address": "0.0.0.0",
|
||||
"username": "default"
|
||||
},
|
||||
"endOfLineString": "\r\n",
|
||||
"method": "ssh"
|
||||
},
|
||||
"levelControlBlocks": {
|
||||
"audioCallRx": {
|
||||
"label": "Audio Call Receive",
|
||||
"index1": 1,
|
||||
"instanceTag": "VoIPRxLevel",
|
||||
"hasMute": true,
|
||||
"hasLevel": true,
|
||||
"index2": 0
|
||||
},
|
||||
"audioCallTx": {
|
||||
"label": "Audio Call Transmit",
|
||||
"index1": 1,
|
||||
"instanceTag": "VoIPTxLevel",
|
||||
"hasMute": true,
|
||||
"hasLevel": false,
|
||||
"index2": 0
|
||||
},
|
||||
"master": {
|
||||
"label": "Master",
|
||||
"index1": 1,
|
||||
"instanceTag": "RoomLevel",
|
||||
"hasMute": true,
|
||||
"hasLevel": true,
|
||||
"index2": 0
|
||||
},
|
||||
"program": {
|
||||
"label": "Program",
|
||||
"index1": 1,
|
||||
"instanceTag": "ProgramLevel",
|
||||
"hasMute": true,
|
||||
"hasLevel": true,
|
||||
"index2": 0
|
||||
}
|
||||
},
|
||||
"presenterMic": {
|
||||
"enabled": false
|
||||
}
|
||||
},
|
||||
"key": "biampTesira-1",
|
||||
"name": "Biamp Tesira 1",
|
||||
"uid": 5,
|
||||
"group": "dsp"
|
||||
},
|
||||
{
|
||||
"type": "NecMPSX",
|
||||
"properties": {
|
||||
"control": {
|
||||
"tcpSshProperties": {
|
||||
"address": "0.0.0.0",
|
||||
"port": 23
|
||||
},
|
||||
"method": "tcpIp"
|
||||
}
|
||||
},
|
||||
"key": "display-1",
|
||||
"name": "Left Display",
|
||||
"uid": 6,
|
||||
"group": "display"
|
||||
},
|
||||
{
|
||||
"type": "NecMPSX",
|
||||
"properties": {
|
||||
"control": {
|
||||
"tcpSshProperties": {
|
||||
"address": "0.0.0.0",
|
||||
"port": 23
|
||||
},
|
||||
"method": "tcpIp"
|
||||
}
|
||||
},
|
||||
"key": "display-2",
|
||||
"name": "Right Display",
|
||||
"uid": 7,
|
||||
"group": "display"
|
||||
},
|
||||
{
|
||||
"type": "tsw1052",
|
||||
"properties": {
|
||||
"defaultRoomKey": "room1",
|
||||
"roomListKey": "",
|
||||
"sourcesOverflowCount": 5,
|
||||
"sgdFile": "Essentials TSW.sgd",
|
||||
"control": {
|
||||
"params": {
|
||||
"deviceReadyResponsePattern": ".*>",
|
||||
"endOfLineString": "\n"
|
||||
},
|
||||
"method": "ipid",
|
||||
"ipid": "03"
|
||||
},
|
||||
"showTime": true,
|
||||
"showVolumeGauge": true,
|
||||
"showDate": true,
|
||||
"usesSplashPage": true
|
||||
},
|
||||
"key": "tsw1052-1",
|
||||
"name": "TSW 1050/1052 1",
|
||||
"uid": 8,
|
||||
"group": "touchpanel"
|
||||
},
|
||||
{
|
||||
"type": "amplifier",
|
||||
"key": "amplifier-1",
|
||||
"uid": 9,
|
||||
"name": "Amplifier"
|
||||
}
|
||||
],
|
||||
"rooms": [
|
||||
{
|
||||
"properties": {
|
||||
"defaultAudioBehavior": "audioFollowVideo",
|
||||
"defaultVideoBehavior": "advanced",
|
||||
"description": "",
|
||||
"displayKeys": [
|
||||
"display-1"
|
||||
],
|
||||
"hasDsp": true,
|
||||
"defaultAudioKey": "biampTesira-1",
|
||||
"volumes": {
|
||||
"master": {
|
||||
"label": "Volume",
|
||||
"level": -10,
|
||||
"deviceKey": "biampTesira-1--master"
|
||||
},
|
||||
"program": {
|
||||
"label": "Volume",
|
||||
"level": -10,
|
||||
"deviceKey": "biampTesira-1--program"
|
||||
}
|
||||
},
|
||||
"helpMessage": "",
|
||||
"sourceListKey": "default"
|
||||
},
|
||||
"key": "room1",
|
||||
"type": "presentation",
|
||||
"name": "Neil's Test Presentation Template"
|
||||
}
|
||||
],
|
||||
"sourceLists": {
|
||||
"default": {
|
||||
"roomOff": {
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "$off",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"sourceKey": "$off",
|
||||
"type": "off"
|
||||
},
|
||||
"source-1": {
|
||||
"sourceKey": "laptop-1",
|
||||
"includeInSourceList": true,
|
||||
"volumeControlKey": "$defaultAudio",
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "laptop-1",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"icon": "",
|
||||
"order": 1,
|
||||
"type": "route",
|
||||
"altIcon": "Blank"
|
||||
},
|
||||
"source-2": {
|
||||
"sourceKey": "sonyBdp-generic-1",
|
||||
"includeInSourceList": true,
|
||||
"volumeControlKey": "$defaultAudio",
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "sonyBdp-generic-1",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"icon": "",
|
||||
"order": 3,
|
||||
"type": "route",
|
||||
"altIcon": "Blank"
|
||||
},
|
||||
"source-3": {
|
||||
"sourceKey": "comcastMotorola-generic-1",
|
||||
"includeInSourceList": true,
|
||||
"volumeControlKey": "$defaultAudio",
|
||||
"routeList": [
|
||||
{
|
||||
"sourceKey": "comcastMotorola-generic-1",
|
||||
"type": "audioVideo",
|
||||
"destinationKey": "$defaultAll"
|
||||
}
|
||||
],
|
||||
"icon": "",
|
||||
"order": 3,
|
||||
"type": "route",
|
||||
"altIcon": "Blank"
|
||||
}
|
||||
}
|
||||
},
|
||||
"tieLines": [
|
||||
{
|
||||
"sourceKey": "sonyBdp-generic-1",
|
||||
"destinationKey": "dmMd8x8-1",
|
||||
"sourcePort": "HdmiOut",
|
||||
"destinationPort": "card1--hdmiIn",
|
||||
"type": "audioVideo"
|
||||
},
|
||||
{
|
||||
"sourceKey": "comcastMotorola-generic-1",
|
||||
"destinationKey": "dmMd8x8-1",
|
||||
"sourcePort": "anyVideoOut",
|
||||
"destinationPort": "card2--hdmiIn",
|
||||
"type": "audioVideo"
|
||||
},
|
||||
{
|
||||
"sourceKey": "laptop-1",
|
||||
"destinationKey": "dmMd8x8-1",
|
||||
"sourcePort": "anyOut",
|
||||
"destinationPort": "card3--hdmiIn",
|
||||
"type": "audioVideo"
|
||||
},
|
||||
{
|
||||
"sourceKey": "dmMd8x8-1",
|
||||
"destinationKey": "display-1",
|
||||
"sourcePort": "card1--hdmiOut1",
|
||||
"destinationPort": "HdmiIn1",
|
||||
"type": "audioVideo"
|
||||
},
|
||||
{
|
||||
"sourceKey": "dmMd8x8-1",
|
||||
"destinationKey": "display-2",
|
||||
"sourcePort": "card1--hdmiOut2",
|
||||
"destinationPort": "HdmiIn1",
|
||||
"type": "audioVideo"
|
||||
},
|
||||
{
|
||||
"sourceKey": "dmMd8x8-1",
|
||||
"destinationKey": "biampTesira-1",
|
||||
"sourcePort": "card1--audioOut1",
|
||||
"destinationPort": "anyAudioIn",
|
||||
"type": "audio"
|
||||
},
|
||||
{
|
||||
"sourceKey": "biampTesira-1",
|
||||
"destinationKey": "amplifier-1",
|
||||
"sourcePort": "anyAudioOut",
|
||||
"destinationPort": "anyAudioIn",
|
||||
"type": "audio"
|
||||
}
|
||||
]
|
||||
},
|
||||
"system": {},
|
||||
"system_url": "http://portal-QA.devcloud.pepperdash.com/templates/0f50640b-bc89-42d5-998f-81d137d3fc98#/template_summary"
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user