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

Adds QR code join to mobile control Ddvc01 room bridge and passes accross QR code url (join 403)

Browse Source
This commit is contained in:
Neil Dorin
2020-03-04 17:23:00 -07:00
parent c4a64ab3c2
commit 9b5d7411af
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PepperDashEssentials/AppServer/MobileControlSystemController.cs
View File

@@ -52,7 +52,7 @@ namespace PepperDash.Essentials
DateTime LastAckMessage; DateTime LastAckMessage;
public string SystemUuid; public string SystemUuid { get; private set; }
List<MobileControlBridgeBase> RoomBridges = new List<MobileControlBridgeBase>(); List<MobileControlBridgeBase> RoomBridges = new List<MobileControlBridgeBase>();

5
PepperDashEssentials/AppServer/RoomBridges/MobileControlDdvc01RoomBridge.cs
View File

@@ -183,6 +183,10 @@ namespace PepperDash.Essentials.Room.MobileControl
/// </summary> /// </summary>
public const uint ServerUrl = 402; public const uint ServerUrl = 402;
/// <summary> /// <summary>
/// 403
/// </summary>
public const uint QrCodeUrl = 403;
/// <summary>
/// 512 /// 512
/// </summary> /// </summary>
public const uint RoomSpeedDialNamesJoinStart = 512; public const uint RoomSpeedDialNamesJoinStart = 512;
@@ -907,6 +911,7 @@ namespace PepperDash.Essentials.Room.MobileControl
Debug.Console(1, this, "Server user code changed: {0}", UserCode); Debug.Console(1, this, "Server user code changed: {0}", UserCode);
EISC.StringInput[StringJoin.UserCodeToSystem].StringValue = UserCode; EISC.StringInput[StringJoin.UserCodeToSystem].StringValue = UserCode;
EISC.StringInput[StringJoin.ServerUrl].StringValue = Parent.Config.ClientAppUrl; EISC.StringInput[StringJoin.ServerUrl].StringValue = Parent.Config.ClientAppUrl;
EISC.StringInput[StringJoin.QrCodeUrl].StringValue = string.Format("http://{0}/api/system/{1}/qr", Parent.Config.ServerUrl, Parent.SystemUuid);
} }
} }
} }

8
essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4k202CController.cs
View File

@@ -101,8 +101,16 @@ namespace PepperDash.Essentials.DM
return (int)Tx.VideoSourceFeedback; return (int)Tx.VideoSourceFeedback;
}); });
AudioSourceNumericFeedback = new IntFeedback(() => AudioSourceNumericFeedback = new IntFeedback(() =>
{
try
{ {
return (int)Tx.AudioSourceFeedback; return (int)Tx.AudioSourceFeedback;
}
catch
{
return 0;
}
}); });
HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () =>