Merge pull request #37 from PepperDash/feature/CI+PresetSaved

Add PresetSaved and update CI workflows
PepperDash · Apr 5, 2023 · ed8a945 · ed8a945
2 parents 8ddfceb + 8cde992
commit ed8a945
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 62 deletions.
diff --git a/...flows/essentialsplugins-betabuilds-v2.yml → ...flows/essentialsplugins-betabuilds-v3.yml b/...flows/essentialsplugins-betabuilds-v2.yml → ...flows/essentialsplugins-betabuilds-v3.yml
@@ -162,7 +162,7 @@ jobs:
           $exclusions = "packages"
           # Trying to get any .json schema files (not currently working)
           # Gets any files with the listed extensions.
-          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object {
+          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec", "*.md" | ForEach-Object {
             $allowed = $true;
             # Exclude any files in submodules
             foreach ($exclude in $exclusions) {

diff --git a/...flows/essentialsplugins-releasebuilds.yml → ...ws/essentialsplugins-releasebuilds-v2.yml b/...flows/essentialsplugins-releasebuilds.yml → ...ws/essentialsplugins-releasebuilds-v2.yml
@@ -117,7 +117,7 @@ jobs:
           $exclusions = "packages"
           # Trying to get any .json schema files (not currently working)
           # Gets any files with the listed extensions.
-          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec" | ForEach-Object {
+          Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.nuspec", "*.md" | ForEach-Object {
             $allowed = $true;
             # Exclude any files in submodules
             foreach ($exclude in $exclusions) {

diff --git a/HDIntegratedCamera_InterfaceSpecifications-E.pdf b/HDIntegratedCamera_InterfaceSpecifications-E.pdf
diff --git a/PanasonicCameraEpi/CommandQueue.cs b/PanasonicCameraEpi/CommandQueue.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 
 namespace PanasonicCameraEpi
 {

diff --git a/PanasonicCameraEpi/HttpCommandQueue.cs b/PanasonicCameraEpi/HttpCommandQueue.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharp.Net.Http;
 using Crestron.SimplSharpPro.CrestronThread;
 using PepperDash.Core;

diff --git a/PanasonicCameraEpi/PanasonicCamera.cs b/PanasonicCameraEpi/PanasonicCamera.cs
@@ -3,14 +3,14 @@
 using System.Linq;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json.Linq;
-using PepperDash.Essentials.Bridges;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Core;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
+using Crestron.SimplSharp;
+
 
 namespace PanasonicCameraEpi
 {
@@ -30,7 +30,23 @@ public class PanasonicCamera : ReconfigurableDevice, IBridgeAdvanced, IHasCamera
         public BoolFeedback IsOnlineFeedback { get { return _monitor.IsOnlineFeedback; } }		
         public IntFeedback PanSpeedFeedback { get; private set; }
         public IntFeedback ZoomSpeedFeedback { get; private set; }
-        public IntFeedback TiltSpeedFeedback { get; private set; }		
+        public IntFeedback TiltSpeedFeedback { get; private set; }
+        public BoolFeedback PresetSavedFeedback { get; private set; }
+        public bool PresetSavedBool
+        {
+            get
+            {
+                return _PresetSavedBool;
+            }
+            set
+            {
+                _PresetSavedBool = value;
+                PresetSavedFeedback.FireUpdate();
+            }
+
+
+        }
+        private bool _PresetSavedBool { get; set; }
 
         public PanasonicCamera(IBasicCommunication comms, DeviceConfig config)
             : base(config)
@@ -42,7 +58,7 @@ public PanasonicCamera(IBasicCommunication comms, DeviceConfig config)
 			_responseHandler = new PanasonicResponseHandler();
 
             if (cameraConfig.CommunicationMonitor == null)
-                cameraConfig.CommunicationMonitor = new CommunicationMonitorConfig()
+                cameraConfig.CommunicationMonitor = new CommunicationMonitorConfig
                 {
                     PollInterval = 60000,
                     TimeToWarning = 180000,
@@ -57,13 +73,10 @@ public PanasonicCamera(IBasicCommunication comms, DeviceConfig config)
                 comms.TextReceived += _responseHandler.HandleResponseReceeved;
                     throw new NotImplementedException("Need to create a command queue for serial");
 			}
-			else
-            {
-                _monitor = new PanasonicHttpCameraMonitor(this, tempClient, cameraConfig.CommunicationMonitor);
-                var queue = new HttpCommandQueue(comms);
-                queue.ResponseReceived += _responseHandler.HandleResponseReceived;
-                _queue = queue;
-            }
+            _monitor = new PanasonicHttpCameraMonitor(this, tempClient, cameraConfig.CommunicationMonitor);
+            var queue = new HttpCommandQueue(comms);
+            queue.ResponseReceived += _responseHandler.HandleResponseReceived;
+            _queue = queue;
 
             _cmd = new PanasonicCmdBuilder(12, 25, 12, cameraConfig.HomeCommand, cameraConfig.PrivacyCommand);
             _presets = cameraConfig.Presets.ToDictionary(x => (uint)x.Id);
@@ -129,7 +142,7 @@ private void SetupFeedbacks()
                 if (_presets.ContainsKey(index))
                     continue;
 
-                _presets.Add(index, new PanasonicCameraPreset() {Id = (int) index, Name = String.Empty});
+                _presets.Add(index, new PanasonicCameraPreset {Id = (int) index, Name = String.Empty});
             }
 
             NumberOfPresetsFeedback = new IntFeedback(() => _presets.Values.Count(x => !String.IsNullOrEmpty(x.Name)));
@@ -138,6 +151,7 @@ private void SetupFeedbacks()
             PanSpeedFeedback = new IntFeedback(() => PanSpeed);
             TiltSpeedFeedback = new IntFeedback(() => TiltSpeed);
             ZoomSpeedFeedback = new IntFeedback(() => ZoomSpeed);
+            PresetSavedFeedback = new BoolFeedback(() => PresetSavedBool); 
 
             PanSpeedFeedback.FireUpdate();
             TiltSpeedFeedback.FireUpdate();
@@ -285,6 +299,8 @@ public void RecallPreset(int preset)
         public void SavePreset(int preset)
         {
             _queue.EnqueueCmd(_cmd.PresetSaveCommand(preset));
+            PresetSavedBool = true;
+            new CTimer( (o) => PresetSavedBool = false, 5000);
         }
 
 		/// <summary>
@@ -295,16 +311,19 @@ public void SetIpAddress(string address)
 		{
 			try
 			{
-				if (address.Length > 2 & Config.Properties["control"]["tcpSshProperties"]["address"].ToString() != address)
-				{
-					Debug.Console(2, this, "Changing IPAddress: {0}", address);
-
-					Config.Properties["control"]["tcpSshProperties"]["address"] = address;
-					Debug.Console(2, this, "{0}", Config.Properties.ToString());
-                    SetConfig(Config);
-					var tempClient = DeviceManager.GetDeviceForKey(string.Format("{0}-httpClient", this.Key)) as GenericHttpClient;
-					tempClient.Client.HostName = address;
-				}
+			    if (!(address.Length > 2 & Config.Properties["control"]["tcpSshProperties"]["address"].ToString() != address))
+			        return;
+			    Debug.Console(2, this, "Changing IPAddress: {0}", address);
+
+			    Config.Properties["control"]["tcpSshProperties"]["address"] = address;
+			    Debug.Console(2, this, "{0}", Config.Properties.ToString());
+			    SetConfig(Config);
+			    var tempClient = DeviceManager.GetDeviceForKey(string.Format("{0}-httpClient", Key)) as GenericHttpClient;
+			    if (tempClient == null)
+			    {
+			        throw new Exception("Error - No Valid TCP Client!");
+			    }
+			    tempClient.Client.HostName = address;
 			}
 			catch (Exception e)
 			{
@@ -373,6 +392,8 @@ public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, E
             NameFeedback.LinkInputSig(trilist.StringInput[joinMap.DeviceName.JoinNumber]);
 
             NumberOfPresetsFeedback.LinkInputSig(trilist.UShortInput[joinMap.NumberOfPresets.JoinNumber]);
+
+            PresetSavedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PresetSavedFeedback.JoinNumber]);
 
             CameraIsOffFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
             CameraIsOffFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);

diff --git a/PanasonicCameraEpi/PanasonicCameraBridgeJoinMap.cs b/PanasonicCameraEpi/PanasonicCameraBridgeJoinMap.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
 
 namespace PanasonicCameraEpi
 {
@@ -198,6 +193,23 @@ public class PanasonicCameraBridgeJoinMap : JoinMapBaseAdvanced
                 JoinType = eJoinType.Digital
             });
 
+        /// <summary>
+        /// Camera preset saved
+        /// </summary>
+        [JoinName("PresetSavedFeedback")]
+        public JoinDataComplete PresetSavedFeedback = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 30,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Camera preset saved Feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
         /// <summary>
         /// Camera preset save
         /// </summary>

diff --git a/PanasonicCameraEpi/PanasonicCameraExtensions.cs b/PanasonicCameraEpi/PanasonicCameraExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace PanasonicCameraEpi
+namespace PanasonicCameraEpi
 {
     public static class ScalingExtensions
     {

diff --git a/PanasonicCameraEpi/PanasonicCameraFactory.cs b/PanasonicCameraEpi/PanasonicCameraFactory.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Core;
 
 namespace PanasonicCameraEpi
 {

diff --git a/PanasonicCameraEpi/PanasonicCameraMonitor.cs b/PanasonicCameraEpi/PanasonicCameraMonitor.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.Net.Http;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PanasonicCameraEpi
 {

diff --git a/PanasonicCameraEpi/PanasonicCameraPropsConfig.cs b/PanasonicCameraEpi/PanasonicCameraPropsConfig.cs
@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using PepperDash.Core;
-using PepperDash.Core.WebApi.Presets;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using Newtonsoft.Json;

diff --git a/PanasonicCameraEpi/PanasonicCmdBuilder.cs b/PanasonicCameraEpi/PanasonicCmdBuilder.cs
@@ -6,8 +6,8 @@ namespace PanasonicCameraEpi
 {
     public class PanasonicCmdBuilder
     {
-        private static readonly string CmdHeader = "cgi-bin/aw_ptz?cmd=%23";
-        private static readonly string CmdSuffix = "&res=1";
+        private const string CmdHeader = "cgi-bin/aw_ptz?cmd=%23";
+        private const string CmdSuffix = "&res=1";
 
         public string PanStopCommand { get; private set; }
         public string TiltStopCommand { get; private set; }

diff --git a/epi-panasonic-camera.nuspec → ...onicCameraEpi/epi-panasonic-camera.nuspec b/epi-panasonic-camera.nuspec → ...onicCameraEpi/epi-panasonic-camera.nuspec
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package >
   <metadata>
-    <!-- Update ID with a plugin ID representative of the plugin being built-->
     <id>PepperDash.Essentials.Plugin.EpiPanasonicCamera</id>
+    <readme>docs\README.md</readme>
     <version>1.1.0</version>
-    <!-- Update Title with the plugin name that users will see-->
     <title>Epi Panasonic Camera</title>
     <authors>PepperDash Technologies</authors>
     <owners>pepperdash</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
-    <!-- Update projectUrl with the actual URL of the plugin repo-->
     <projectUrl>https://github.com/PepperDash-Engineering/epi-panasonic-camera-http</projectUrl>
-    <copyright>Copyright 2021</copyright>
-    <!-- Update description-->
+    <copyright>Copyright 2022</copyright>
     <description>Essentials Plugin for Panasonic Cameras used with PepperDash Essentials to expose functionality in SIMPL Windows programs using Bridges.</description>
     <tags>crestron 3series 4series</tags>
-    <!-- Update repository url with the actual URL of the plugin repo-->
     <repository type="git" url="https://github.com/PepperDash-Engineering/epi-panasonic-camera-http"/>
   </metadata>
     <files>
       <file src="**" target="lib\net35"/>
       <file src="**" target="lib\net47"/>
+      <file src="README.md" target="docs\"/>
     </files>
 </package>
diff --git a/packages.config b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashEssentials" version="1.8.5-pr701-1363" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+  <package id="PepperDashEssentials" version="1.9.0" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>