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

Updates CameraControllerBridge and SIMPLCameraMessenger.cs to use new CameraControllerJoinMap

Browse Source
This commit is contained in:
Neil Dorin
2020-03-31 10:53:24 -06:00
parent 0e5052910f
commit 1ae93b3ffd
28 changed files with 258 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PepperDashEssentials/AppServer/Messengers/SIMPLAtcMessenger.cs
View File

@@ -104,10 +104,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
{
EISC = eisc;
JoinMap = new SIMPLAtcJoinMap();
// TODO: Take in JoinStart value from config
JoinMap.OffsetJoinNumbers(201);
JoinMap = new SIMPLAtcJoinMap(201);
CurrentCallItem = new CodecActiveCallItem();
CurrentCallItem.Type = eCodecCallType.Audio;
@@ -192,11 +189,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
// Pulse DTMF
AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
{
var join = JoinMap.GetJoinForKey(s);
if (join > 0)
{
EISC.PulseBool(join, 100);
}
var join = JoinMap.Joins[s];
if (join != null)
{
if (join.JoinNumber > 0)
{
EISC.PulseBool(join.JoinNumber, 100);
}
}
}));
}

127
PepperDashEssentials/AppServer/Messengers/SIMPLCameraMessenger.cs
View File

@@ -19,94 +19,19 @@ namespace PepperDash.Essentials.AppServer.Messengers
CameraControllerJoinMap JoinMap;
//public class BoolJoin
//{
// /// <summary>
// /// 1
// /// </summary>
// public const uint CameraControlUp = 1;
// /// <summary>
// /// 2
// /// </summary>
// public const uint CameraControlDown = 2;
// /// <summary>
// /// 3
// /// </summary>
// public const uint CameraControlLeft = 3;
// /// <summary>
// /// 4
// /// </summary>
// public const uint CameraControlRight = 4;
// /// <summary>
// /// 5
// /// </summary>
// public const uint CameraControlZoomIn = 5;
// /// <summary>
// /// 6
// /// </summary>
// public const uint CameraControlZoomOut = 6;
// /// <summary>
// /// 10
// /// </summary>
// public const uint CameraHasPresets = 10;
// /// <summary>
// /// 11 - 20
// /// </summary>
// public const uint CameraPresetStart = 10;
// /// <summary>
// /// 21
// /// </summary>
// public const uint CameraModeAuto = 21;
// /// <summary>
// /// 22
// /// </summary>
// public const uint CameraModeManual = 22;
// /// <summary>
// /// 23
// /// </summary>
// public const uint CameraModeOff = 23;
// /// <summary>
// /// 24
// /// </summary>
// public const uint CameraSupportsModeAuto = 24;
// /// <summary>
// /// 25
// /// </summary>
// public const uint CameraSupportsModeOff = 25;
//}
//public class UshortJoin
//{
// /// <summary>
// /// 10
// /// </summary>
// public const uint CameraPresetCount = 10;
//}
//public class StringJoin
//{
// /// <summary>
// /// 11-20
// /// </summary>
// public const uint CameraPresetNameStart = 10;
//}
public SIMPLCameraMessenger(string key, BasicTriList eisc, string messagePath, uint joinStart)
: base(key, messagePath)
{
EISC = eisc;
//JoinStart = joinStart - 1;
JoinMap = new CameraControllerJoinMap();
JoinMap.OffsetJoinNumbers(joinStart);
JoinMap = new CameraControllerJoinMap(joinStart);
EISC.SetUShortSigAction(JoinMap.NumberOfPresets.JoinNumber, (u) => SendCameraFullMessageObject());
EISC.SetUShortSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.NumberOfPresets), (u) => SendCameraFullMessageObject());
EISC.SetBoolSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeAuto), (b) => PostCameraMode());
EISC.SetBoolSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeManual), (b) => PostCameraMode());
EISC.SetBoolSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeOff), (b) => PostCameraMode());
EISC.SetBoolSigAction(JoinMap.CameraModeAuto.JoinNumber, (b) => PostCameraMode());
EISC.SetBoolSigAction(JoinMap.CameraModeManual.JoinNumber, (b) => PostCameraMode());
EISC.SetBoolSigAction(JoinMap.CameraModeOff.JoinNumber, (b) => PostCameraMode());
}
@@ -119,22 +44,22 @@ namespace PepperDash.Essentials.AppServer.Messengers
// Add press and holds using helper action
Action<string, uint> addPHAction = (s, u) =>
asc.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
addPHAction("/cameraUp", JoinMap.GetJoinForKey(CameraControllerJoinMap.TiltUp));
addPHAction("/cameraDown", JoinMap.GetJoinForKey(CameraControllerJoinMap.TiltDown));
addPHAction("/cameraLeft", JoinMap.GetJoinForKey(CameraControllerJoinMap.PanLeft));
addPHAction("/cameraRight", JoinMap.GetJoinForKey(CameraControllerJoinMap.PanRight));
addPHAction("/cameraZoomIn", JoinMap.GetJoinForKey(CameraControllerJoinMap.ZoomIn));
addPHAction("/cameraZoomOut", JoinMap.GetJoinForKey(CameraControllerJoinMap.ZoomOut));
addPHAction("/cameraUp", JoinMap.TiltUp.JoinNumber);
addPHAction("/cameraDown", JoinMap.TiltDown.JoinNumber);
addPHAction("/cameraLeft", JoinMap.PanLeft.JoinNumber);
addPHAction("/cameraRight", JoinMap.PanRight.JoinNumber);
addPHAction("/cameraZoomIn", JoinMap.ZoomIn.JoinNumber);
addPHAction("/cameraZoomOut", JoinMap.ZoomOut.JoinNumber);
Action<string, uint> addAction = (s, u) =>
asc.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
addAction("/cameraModeAuto", JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeAuto));
addAction("/cameraModeManual", JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeManual));
addAction("/cameraModeOff", JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeOff));
addAction("/cameraModeAuto", JoinMap.CameraModeAuto.JoinNumber);
addAction("/cameraModeManual", JoinMap.CameraModeManual.JoinNumber);
addAction("/cameraModeOff", JoinMap.CameraModeOff.JoinNumber);
var presetStart = JoinMap.GetJoinForKey(CameraControllerJoinMap.PresetRecallStart);
var presetEnd = JoinMap.GetJoinForKey(CameraControllerJoinMap.PresetRecallStart) + JoinMap.GetJoinSpanForKey(CameraControllerJoinMap.PresetRecallStart);
var presetStart = JoinMap.PresetRecallStart.JoinNumber;
var presetEnd = JoinMap.PresetRecallStart.JoinNumber + JoinMap.PresetRecallStart.JoinSpan;
int presetId = 1;
// camera presets
@@ -159,11 +84,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
appServerController.RemoveAction(MessagePath + "/cameraModeManual");
appServerController.RemoveAction(MessagePath + "/cameraModeOff");
EISC.SetUShortSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.NumberOfPresets), null);
EISC.SetUShortSigAction(JoinMap.NumberOfPresets.JoinNumber, null);
EISC.SetBoolSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeAuto), null);
EISC.SetBoolSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeManual), null);
EISC.SetBoolSigAction(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeOff), null);
EISC.SetBoolSigAction(JoinMap.CameraModeAuto.JoinNumber, null);
EISC.SetBoolSigAction(JoinMap.CameraModeManual.JoinNumber, null);
EISC.SetBoolSigAction(JoinMap.CameraModeOff.JoinNumber, null);
}
/// <summary>
@@ -174,10 +99,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
var presetList = new List<CameraPreset>();
// Build a list of camera presets based on the names and count
if (EISC.GetBool(JoinMap.GetJoinForKey(CameraControllerJoinMap.SupportsPresets)))
if (EISC.GetBool(JoinMap.SupportsPresets.JoinNumber))
{
var presetStart = JoinMap.GetJoinForKey(CameraControllerJoinMap.PresetLabelStart);
var presetEnd = JoinMap.GetJoinForKey(CameraControllerJoinMap.PresetLabelStart) + JoinMap.GetJoinForKey(CameraControllerJoinMap.NumberOfPresets);
var presetStart = JoinMap.PresetLabelStart.JoinNumber;
var presetEnd = JoinMap.PresetLabelStart.JoinNumber + JoinMap.NumberOfPresets.JoinNumber;
var presetId = 1;
for (uint i = presetStart; i < presetEnd; i++)
@@ -192,7 +117,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
PostStatusMessage(new
{
cameraMode = GetCameraMode(),
hasPresets = EISC.GetBool(JoinMap.GetJoinForKey(CameraControllerJoinMap.SupportsPresets)),
hasPresets = EISC.GetBool(JoinMap.SupportsPresets.JoinNumber),
presets = presetList
});
}
@@ -215,8 +140,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
string GetCameraMode()
{
string m;
if (EISC.GetBool(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeAuto))) m = eCameraControlMode.Auto.ToString().ToLower();
else if (EISC.GetBool(JoinMap.GetJoinForKey(CameraControllerJoinMap.CameraModeManual))) m = eCameraControlMode.Manual.ToString().ToLower();
if (EISC.GetBool(JoinMap.CameraModeAuto.JoinNumber)) m = eCameraControlMode.Auto.ToString().ToLower();
else if (EISC.GetBool(JoinMap.CameraModeManual.JoinNumber)) m = eCameraControlMode.Manual.ToString().ToLower();
else m = eCameraControlMode.Off.ToString().ToLower();
return m;
}

27
PepperDashEssentials/AppServer/SIMPLJoinMaps/SIMPLAtcJoinMap.cs
View File

@@ -9,7 +9,7 @@ namespace PepperDash.Essentials.AppServer
public class SIMPLAtcJoinMap : JoinMapBaseAdvanced
{
[JoinName("EndCall")]
public JoinDataComplete EndCall = new JoinDataComplete( new JoinData() { JoinNumber = 21, JoinSpan = 1 }, new JoinMetadata() { Label = "Hang Up", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
public JoinDataComplete EndCall = new JoinDataComplete(new JoinData() { JoinNumber = 21, JoinSpan = 1 }, new JoinMetadata() { Label = "Hang Up", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
[JoinName("IncomingAnswer")]
public JoinDataComplete IncomingAnswer = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Answer Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
[JoinName("IncomingReject")]
@@ -51,27 +51,14 @@ namespace PepperDash.Essentials.AppServer
[JoinName("#")]
public JoinDataComplete DtmfPound = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF #", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
public SIMPLAtcJoinMap()
/// <summary>
/// Constructor that passes the joinStart to the base class
/// </summary>
/// <param name="joinStart"></param>
public SIMPLAtcJoinMap(uint joinStart)
: base(joinStart)
{
// Add all the JoinDataComplete properties to the Joins Dictionary
Joins = GetType()
.GetCType()
.GetProperties()
.Where(prop => prop.IsDefined(typeof (JoinNameAttribute), false))
.Select(prop => (JoinDataComplete) prop.GetValue(this, null))
.ToDictionary(join => join.GetNameAttribute(), join => join);
}
public override void OffsetJoinNumbers(uint joinStart)
{
var joinOffset = joinStart - 1;
foreach (var join in Joins)
{
join.Value.JoinNumber = join.Value.JoinNumber + joinOffset;
}
PrintJoinMapInfo();
}
}
}