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

Fixed where system won't register if no uuid in config (from manual config)

Browse Source
This commit is contained in:
Heath Volmer
2018-08-01 15:30:10 -06:00
parent 1371c728c5
commit 7e8cdd738f
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PepperDashEssentials/Properties/AssemblyInfo.cs
View File

@@ -3,6 +3,6 @@
[assembly: AssemblyTitle("PepperDashEssentials")] [assembly: AssemblyTitle("PepperDashEssentials")]
[assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyCompany("PepperDash Technology Corp")]
[assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyProduct("PepperDashEssentials")]
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")]
[assembly: AssemblyVersion("1.2.5.*")] [assembly: AssemblyVersion("1.2.5.*")]

8
PepperDashEssentials/Room/Cotija/CotijaSystemController.cs
View File

@@ -188,6 +188,12 @@ namespace PepperDash.Essentials
/// <param name="command"></param> /// <param name="command"></param>
void AuthorizeSystem(string code) void AuthorizeSystem(string code)
{ {
if (string.IsNullOrEmpty(SystemUuid))
{
CrestronConsole.ConsoleCommandResponse("System does not have a UUID. Please ensure proper portal-format configuration is loaded and restart.");
return;
}
if (string.IsNullOrEmpty(code)) if (string.IsNullOrEmpty(code))
{ {
CrestronConsole.ConsoleCommandResponse("Please enter a user code to authorize a system"); CrestronConsole.ConsoleCommandResponse("Please enter a user code to authorize a system");
@@ -274,6 +280,8 @@ namespace PepperDash.Essentials
/// <param name="url">URL of the server, including the port number, if not 80. Format: "serverUrlOrIp:port"</param> /// <param name="url">URL of the server, including the port number, if not 80. Format: "serverUrlOrIp:port"</param>
void RegisterSystemToServer() void RegisterSystemToServer()
{ {
var ready = RegisterLockEvent.Wait(20000); var ready = RegisterLockEvent.Wait(20000);
if (!ready) if (!ready)
{ {

8
PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs
View File

@@ -326,11 +326,15 @@ namespace PepperDash.Essentials
{ {
var sourceKey = room is IHasCurrentSourceInfoChange ? (room as IHasCurrentSourceInfoChange).CurrentSourceInfoKey : null; var sourceKey = room is IHasCurrentSourceInfoChange ? (room as IHasCurrentSourceInfoChange).CurrentSourceInfoKey : null;
var rmVc = room as IHasCurrentVolumeControls as IBasicVolumeWithFeedback; var rmVc = room as IHasCurrentVolumeControls;
var volumes = new Volumes(); var volumes = new Volumes();
if (rmVc != null) if (rmVc != null)
{ {
volumes.Master = new Volume("master", rmVc.VolumeLevelFeedback.UShortValue, rmVc.MuteFeedback.BoolValue, "Volume", true, ""); var vc = rmVc.CurrentVolumeControls as IBasicVolumeWithFeedback;
if (rmVc != null)
{
volumes.Master = new Volume("master", vc.VolumeLevelFeedback.UShortValue, vc.MuteFeedback.BoolValue, "Volume", true, "");
}
} }
PostStatusMessage(new PostStatusMessage(new