diff --git a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs index 622f1c19..71a7430b 100644 --- a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")] -[assembly: AssemblyVersion("1.0.12.*")] +[assembly: AssemblyVersion("1.0.14.*")] diff --git a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs index bca4c272..0d90bff3 100644 --- a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs +++ b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs @@ -187,8 +187,6 @@ namespace PepperDash.Essentials disp.IsCoolingDownFeedback.OutputChange += (o, a) => { IsCoolingDownFeedback.FireUpdate(); - if (IsCoolingDownFeedback.BoolValue) - (DefaultDisplay as IBasicVolumeWithFeedback).SetVolume(DefaultVolume); }; } @@ -216,8 +214,8 @@ namespace PepperDash.Essentials /// public void RunDefaultRoute() { - if (DefaultSourceItem != null && !OnFeedback.BoolValue) - RunRouteAction(DefaultSourceItem); + //if (DefaultSourceItem != null && !OnFeedback.BoolValue) + RunRouteAction(DefaultSourceItem); } /// diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index 379e7395..2c84c6ae 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index ce598718..1c46a92d 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ diff --git a/devjson commands.json b/devjson commands.json index 03a1f2bc..d3570ae2 100644 --- a/devjson commands.json +++ b/devjson commands.json @@ -2,6 +2,10 @@ devjson:1 {"deviceKey":"display-1-comMonitor","methodName":"PrintStatus"} devjson:1 {"deviceKey":"display-1-com","methodName":"SimulateReceive", "params": ["\\x05\\x06taco\\xAA"]} +devjson:1 {"deviceKey":"display-1","methodName":"InputHdmi1", "params": []} + +devjson:1 {"deviceKey":"display-1","methodName":"PowerOff", "params": []} + devjson:1 {"deviceKey":"timer","methodName":"Start" } devjson:1 {"deviceKey":"timer","methodName":"Cancel" }