This commit is contained in:
Heath Volmer
2017-03-03 14:42:20 -07:00
parent a5c63bc6a1
commit 2cf269a2e2
21 changed files with 136 additions and 20 deletions

View File

@@ -33,6 +33,13 @@ namespace PepperDash.Essentials
// ConsoleAccessLevelEnum.AccessOperator);
//CrestronConsole.AddNewConsoleCommand(s => TearDown(), "ungo", "Reloads configuration file",
// ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(s =>
{
foreach (var tl in TieLineCollection.Default)
CrestronConsole.ConsoleCommandResponse(" {0}\r", tl);
},
"listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
GoWithLoad();
}
@@ -49,7 +56,6 @@ namespace PepperDash.Essentials
ConsoleAccessLevelEnum.AccessOperator);
//PortalSync = new PepperDashPortalSyncClient();
//GoWithLoad();
Debug.Console(0, "Starting Essentials load from configuration");
ConfigReader.LoadConfig2();

View File

@@ -3,11 +3,9 @@
<DeployDeviceID>E282E6BE-C7C3-4ece-916A-88FB1CF8AF3C</DeployDeviceID>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<RemoteDebugEnabled>false</RemoteDebugEnabled>
<StartAction>Project</StartAction>
<StartProgram>
</StartProgram>
<StartArguments>
</StartArguments>
<RemoteDebugEnabled>true</RemoteDebugEnabled>
<StartAction>Program</StartAction>
<StartProgram>\Simpl\App01\SimplSharpPro.exe</StartProgram>
<StartArguments>01 PepperDashEssentials</StartArguments>
</PropertyGroup>
</Project>

View File

@@ -186,8 +186,17 @@ namespace PepperDash.Essentials
/// Run the same source to all destinations
/// </summary>
/// <param name="sourceItem"></param>
public void DoSourceToAllDestinationsRoute(SourceListItem sourceItem)
public void RouteSourceToAllDestinations(SourceListItem sourceItem)
{
if (Config.Volumes.ContainsKey("master"))
{
var audioDev = DeviceManager.GetDeviceForKey(Config.Volumes["master"].DeviceKey);
if (audioDev is IBasicVolumeWithFeedback)
{
}
}
foreach (var display in Displays.Values)
{
if (sourceItem != null)

View File

@@ -0,0 +1,37 @@
3/2/2017 9:30:00 AM, Info: Initializing SIMPLSharp Services...
3/2/2017 9:30:00 AM, Info: ProjectInfo successfully initialized.
3/2/2017 9:30:09 AM, Info: Saving project information...
3/2/2017 9:30:09 AM, Info: Saving project information...
3/2/2017 9:30:09 AM, Info: Saving project information...
3/2/2017 9:30:09 AM, Info: Saving project information...
3/2/2017 9:30:09 AM, Info: Saving project information...
3/2/2017 9:30:09 AM, Info: Saving project information...
3/2/2017 9:30:11 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/2/2017 9:30:13 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/2/2017 9:30:13 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/2/2017 9:30:14 AM, Info: Saving project information...
3/2/2017 10:17:17 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/2/2017 10:17:18 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/2/2017 10:17:18 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/2/2017 10:17:20 AM, Info: Saving project information...
3/2/2017 10:25:22 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/2/2017 10:25:23 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/2/2017 10:25:23 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/2/2017 10:25:25 AM, Info: Saving project information...
3/2/2017 2:15:17 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/2/2017 2:15:18 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/2/2017 2:15:18 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/2/2017 2:15:19 PM, Info: Saving project information...
3/2/2017 2:29:51 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/2/2017 2:29:52 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/2/2017 2:29:52 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/2/2017 2:29:53 PM, Info: Saving project information...
3/2/2017 2:32:50 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/2/2017 2:32:51 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/2/2017 2:32:51 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/2/2017 2:32:52 PM, Info: Saving project information...
3/2/2017 2:37:30 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/2/2017 2:37:31 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/2/2017 2:37:31 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/2/2017 2:37:32 PM, Info: Saving project information...
3/3/2017 8:31:30 AM, Info: Terminating SIMPLSharp Services

View File

@@ -0,0 +1,23 @@
3/3/2017 10:51:03 AM, Info: Initializing SIMPLSharp Services...
3/3/2017 10:51:03 AM, Info: ProjectInfo successfully initialized.
3/3/2017 10:51:26 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/3/2017 10:51:28 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/3/2017 10:51:28 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/3/2017 10:51:30 AM, Info: Saving project information...
3/3/2017 10:55:54 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/3/2017 10:55:55 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/3/2017 10:55:55 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/3/2017 10:55:56 AM, Info: Saving project information...
3/3/2017 11:04:14 AM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/3/2017 11:04:15 AM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/3/2017 11:04:15 AM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/3/2017 11:04:16 AM, Info: Saving project information...
3/3/2017 12:09:36 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/3/2017 12:09:37 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/3/2017 12:09:37 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/3/2017 12:09:38 PM, Info: Saving project information...
3/3/2017 2:10:13 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
3/3/2017 2:10:14 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
3/3/2017 2:10:14 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
3/3/2017 2:10:16 PM, Info: Saving project information...
3/3/2017 2:41:00 PM, Info: Terminating SIMPLSharp Services

View File

@@ -402,7 +402,7 @@ namespace PepperDash.Essentials
}
else
{
CurrentRoom.DoSourceToAllDestinationsRoute(localSrcItem);
CurrentRoom.RouteSourceToAllDestinations(localSrcItem);
}
});
SourcesSrl.StringInputSig(i, 1).StringValue = srcConfig.PreferredName;
@@ -661,7 +661,7 @@ namespace PepperDash.Essentials
EndMeetingButtonSig.BoolValue = false;
if (but != 2)
{
CurrentRoom.DoSourceToAllDestinationsRoute(null);
CurrentRoom.RouteSourceToAllDestinations(null);
}
else
ShareButtonSig.BoolValue = true; // restore Share fb
@@ -1004,8 +1004,12 @@ namespace PepperDash.Essentials
TriList.BooleanInput[UIBoolJoin.Display1SelectPressAndFb].BoolValue = isSource;
TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue =
isSource ? info.PreferredName : "";
if (!isSource)
if (!isSource) // return if no source
{
TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.Display1ControlButtonEnable].BoolValue = false;
return;
}
// enable audio and control buttons
var devConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key == info.SourceKey);
TriList.BooleanInput[UIBoolJoin.Display1AudioButtonEnable].BoolValue =
@@ -1027,7 +1031,11 @@ namespace PepperDash.Essentials
TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue =
isSource ? info.PreferredName : "";
if (!isSource)
{
TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.Display2ControlButtonEnable].BoolValue = false;
return;
}
// enable audio and control buttons
var devConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key == info.SourceKey);
TriList.BooleanInput[UIBoolJoin.Display2AudioButtonEnable].BoolValue =

View File

@@ -10,8 +10,8 @@
<ArchiveName />
</RequiredInfo>
<OptionalInfo>
<CompiledOn>2/23/2017 6:17:07 PM</CompiledOn>
<CompilerRev>1.0.0.32912</CompilerRev>
<CompiledOn>3/3/2017 2:10:14 PM</CompiledOn>
<CompilerRev>1.0.0.25506</CompilerRev>
</OptionalInfo>
<Plugin>
<Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>

View File

@@ -1,4 +1,4 @@
MainAssembly=PepperDashEssentials.dll:af55346e89a169c7f5695f0d1c1e3e5f
MainAssembly=PepperDashEssentials.dll:5511f262a85934403988d20b8adf9a11
MainAssemblyMinFirmwareVersion=1.009.0029
MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c
ü
@@ -42,21 +42,21 @@ DependencySource=PepperDashCorePortalSync.dll:815e608cb8a8808dab167837cf89b15a
DependencyPath=PepperDashEssentials.cpz:PepperDashCorePortalSync.dll
DependencyMainAssembly=PepperDashCorePortalSync.dll:815e608cb8a8808dab167837cf89b15a
ü
DependencySource=PepperDash_Core.dll:f8093aacbe4fa6cef78b7af4d978e897
DependencySource=PepperDash_Core.dll:598033e01568965c3bd67b29e5993374
DependencyPath=PepperDashEssentials.cpz:PepperDash_Core.dll
DependencyMainAssembly=PepperDash_Core.dll:f8093aacbe4fa6cef78b7af4d978e897
DependencyMainAssembly=PepperDash_Core.dll:598033e01568965c3bd67b29e5993374
ü
DependencySource=PepperDash_Essentials_Core.dll:87ac80b38f6424be025aeddbe3561f47
DependencySource=PepperDash_Essentials_Core.dll:fa7be9399267fd4cec1ae0929edbd944
DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Core.dll
DependencyMainAssembly=PepperDash_Essentials_Core.dll:87ac80b38f6424be025aeddbe3561f47
DependencyMainAssembly=PepperDash_Essentials_Core.dll:fa7be9399267fd4cec1ae0929edbd944
ü
DependencySource=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0
DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Displays.dll
DependencyMainAssembly=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0
ü
DependencySource=PepperDash_Essentials_DM.dll:33b846111ff1f05f67a42bb2e9b0fbff
DependencySource=PepperDash_Essentials_DM.dll:e1019b74d6e14079ed0473b76177aae3
DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_DM.dll
DependencyMainAssembly=PepperDash_Essentials_DM.dll:33b846111ff1f05f67a42bb2e9b0fbff
DependencyMainAssembly=PepperDash_Essentials_DM.dll:e1019b74d6e14079ed0473b76177aae3
ü
DependencySource=SimplSharpCryptographyInterface.dll:dd4791a86d6f67ddc309c4ab1e24c663
DependencyPath=PepperDashEssentials.cpz:SimplSharpCryptographyInterface.dll

View File

@@ -0,0 +1,35 @@
{
"name": "Sample DirecTV List",
"channels": [
{
"name": "HBO",
"IconUrl": "HBO",
"Channel": "501"
},
{
"name": "HBO",
"IconUrl": "HBO",
"Channel": "501"
},
{
"name": "HBO",
"IconUrl": "HBO",
"Channel": "501"
},
{
"name": "HBO",
"IconUrl": "HBO",
"Channel": "501"
},
{
"name": "HBO",
"IconUrl": "HBO",
"Channel": "501"
},
{
"name": "HBO",
"IconUrl": "HBO",
"Channel": "501"
}
]
}