Merge pull request #1086 from PepperDash/hotfix/pd-core-update-ssh-issues

Update PD Core to 1.2.1 DEV
Merge branch 'development' into hotfix/pd-core-update-ssh-issues
2026-01-18 06:54:58 +00:00 · 2023-04-07 11:52:23 -06:00 · 2023-04-07 11:37:31 -06:00 · 2023-04-07 11:25:01 -06:00 · 2023-04-07 11:20:08 -06:00 · 2023-03-28 16:26:32 -04:00
4 changed files with 36 additions and 352 deletions
--- a/Core/PepperDashEssentialsBase/File/FileIO.cs
+++ b/Core/PepperDashEssentialsBase/File/FileIO.cs
@@ -21,35 +21,37 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		/// <param name="fileName"></param>
 		/// <returns></returns>
-		public static FileInfo[] GetFiles(string fileName)
-		{
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
-			if (files.Count() > 0)
-			{
-				return files;
-			}
-			else
-			{
-				return null;
-			}
-		}
+        public static FileInfo[] GetFiles(string fileName)
+        {
+            string fullFilePath = Global.FilePathPrefix + fileName;
+            DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath));
+            var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath));
+            Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fullFilePath);
+            if (files.Count() > 0)
+            {
+                return files;
+            }
+            else
+            {
+                return null;
+            }
+        }

-		public static FileInfo GetFile(string fileName)
-		{
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
-			if (files.Count() > 0)
-			{
-				return files.FirstOrDefault();
-			}
-			else
-			{
-				return null;
-			}
-		}
+        public static FileInfo GetFile(string fileName)
+        {
+            string fullFilePath = Global.FilePathPrefix + fileName;
+            DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath));
+            var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath));
+            Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fullFilePath);
+            if (files.Count() > 0)
+            {
+                return files.FirstOrDefault();
+            }
+            else
+            {
+                return null;
+            }
+        }


 		/// <summary>
@@ -81,7 +83,7 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
-					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
+					DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName);
 					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);

 					if (File.Exists(file.FullName))
@@ -202,7 +204,7 @@ namespace PepperDash.Essentials.Core
 		public static void WriteDataToFile(string data, string filePath)
 		{
 			Thread _WriteFileThread;
-			_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
+            _WriteFileThread = new Thread((O) => _WriteFileMethod(data, Global.FilePathPrefix + "/" + filePath), null, Thread.eThreadStartOptions.CreateSuspended);
 			_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
 			_WriteFileThread.Start();
 			Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
@@ -217,7 +219,8 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
-					using (StreamWriter sw = new StreamWriter(filePath))
+
+                    using (StreamWriter sw = new StreamWriter(filePath))
 					{
 						sw.Write(data);
 						sw.Flush();
--- a/DM/Essentials_DM/Endpoints/DGEs/DgeBaseController.cs
+++ b/DM/Essentials_DM/Endpoints/DGEs/DgeBaseController.cs
@@ -1,259 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.UI;
-
-using Crestron.SimplSharpPro.DM;
-
-
-using Newtonsoft.Json;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-using Crestron.SimplSharpPro.DeviceSupport;
-using PepperDash.Essentials.Core.DeviceInfo;
-
-namespace PepperDash.Essentials.DM.Endpoints.DGEs
-{
-    public class DgeBaseController : CrestronGenericBridgeableBaseDevice, IComPorts, IIROutputPorts, IHasBasicTriListWithSmartObject, ICec, IDeviceInfoProvider, IDgeRoutingWithFeedback
-    {
-        private const int CtpPort = 41795;
-        private readonly Dge100 _dge;
-
-        public RoutingInputPort HdmiIn { get; protected set; }
-        public RoutingInputPort ProjectViewIn { get; protected set; }
-        public RoutingOutputPort HdmiOut { get; protected set; }
-
-        protected readonly ushort DmInputJoin;
-        protected readonly ushort HdmiInputJoin;
-        protected readonly ushort ProjectViewJoin;
-
-        private int SwitchValue;
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts
-        {
-            get;
-            private set;
-        }
-
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts
-        {
-            get;
-            private set;
-        }
-
-        private readonly TsxCcsUcCodec100EthernetReservedSigs _dgeEthernetInfo;
-
-        public BasicTriListWithSmartObject Panel { get { return _dge; } }
-
-        private DeviceConfig _dc;
-
-        CrestronDgePropertiesConfig PropertiesConfig;
-
-        public DgeBaseController(string key, string name, Dge100 device, DeviceConfig dc, CrestronDgePropertiesConfig props)
-            :base(key, name, device)
-        {
-            _dge = device;
-            _dc = dc;
-
-            PropertiesConfig = props;
-
-            DmInputJoin = (ushort)PropertiesConfig.DmInputJoin;
-            HdmiInputJoin = (ushort)PropertiesConfig.HdmiInputJoin;
-            ProjectViewJoin = (ushort)PropertiesConfig.ProjectViewVirtualInputJoin;
-
-            // Set Ports for CEC
-            HdmiOut = new RoutingOutputPort(DmPortName.HdmiOut, eRoutingSignalType.AudioVideo,
-                eRoutingPortConnectionType.Hdmi, null, this);
-
-            HdmiOut.Port = _dge.HdmiOut;
-
-
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort> { HdmiOut };
-
-
-            _dgeEthernetInfo = _dge.ExtenderEthernetReservedSigs;
-            //_dgeEthernetInfo.DeviceExtenderSigChange += (extender, args) => UpdateDeviceInfo();
-            _dgeEthernetInfo.Use();
-
-            DeviceInfo = new DeviceInfo();
-
-            AudioVideoSourceNumericFeedback = new IntFeedback(() => SwitchValue);
-
-
-            _dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };
-
-            _dge.SigChange += TrilistChange;
-
-        }
-
-        public virtual void TrilistChange(BasicTriList currentDevice, SigEventArgs args)
-        {
-
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-
-        }
-
-
-        #region IComPorts Members
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _dge.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _dge.NumberOfComPorts; }
-        }
-
-        #endregion
-
-        #region IIROutputPorts Members
-
-        public CrestronCollection<IROutputPort> IROutputPorts
-        {
-            get { return _dge.IROutputPorts; }
-        }
-
-        public int NumberOfIROutputPorts
-        {
-            get { return _dge.NumberOfIROutputPorts; }
-        }
-
-        #endregion
-
-        #region ICec Members
-        public Cec StreamCec { get { return _dge.HdmiOut.StreamCec; } }
-        #endregion
-
-        #region Implementation of IDeviceInfoProvider
-
-        public DeviceInfo DeviceInfo { get; private set; }
-
-        public event DeviceInfoChangeHandler DeviceInfoChanged;
-
-        public void UpdateDeviceInfo()
-        {
-            DeviceInfo.IpAddress = _dgeEthernetInfo.IpAddressFeedback.StringValue;
-            DeviceInfo.MacAddress = _dgeEthernetInfo.MacAddressFeedback.StringValue;
-
-            GetFirmwareAndSerialInfo();
-
-            OnDeviceInfoChange();
-        }
-
-        private void GetFirmwareAndSerialInfo()
-        {
-            if (String.IsNullOrEmpty(_dgeEthernetInfo.IpAddressFeedback.StringValue))
-            {
-                Debug.Console(1, this, "IP Address information not yet received. No device is online");
-                return;
-            }
-
-            var tcpClient = new GenericTcpIpClient("", _dgeEthernetInfo.IpAddressFeedback.StringValue, CtpPort, 1024) { AutoReconnect = false };
-
-            var gather = new CommunicationGather(tcpClient, "\r\n\r\n");
-
-            tcpClient.ConnectionChange += (sender, args) =>
-            {
-                if (!args.Client.IsConnected)
-                {
-                    return;
-                }
-
-                args.Client.SendText("ver\r\n");
-            };
-
-            gather.LineReceived += (sender, args) =>
-            {
-                try
-                {
-                    Debug.Console(1, this, "{0}", args.Text);
-
-                    if (args.Text.ToLower().Contains("host"))
-                    {
-                        DeviceInfo.HostName = args.Text.Split(':')[1].Trim();
-
-                        Debug.Console(1, this, "hostname: {0}", DeviceInfo.HostName);
-                        tcpClient.Disconnect();
-                        return;
-                    }
-
-                    if (!args.Text.Contains('['))
-                    {
-                        return;
-                    }
-                    var splitResponse = args.Text.Split('[');
-
-                    foreach (string t in splitResponse)
-                    {
-                        Debug.Console(1, this, "{0}", t);
-                    }
-
-                    DeviceInfo.SerialNumber = splitResponse[1].Split(' ')[4].Replace("#", "");
-                    DeviceInfo.FirmwareVersion = splitResponse[1].Split(' ')[0];
-
-                    Debug.Console(1, this, "Firmware: {0} SerialNumber: {1}", DeviceInfo.FirmwareVersion,
-                        DeviceInfo.SerialNumber);
-
-                    tcpClient.SendText("host\r\n");
-                }
-                catch (Exception ex)
-                {
-                    Debug.Console(0, this, "Exception getting data: {0}", ex.Message);
-                    Debug.Console(0, this, "response: {0}", args.Text);
-                }
-            };
-
-            tcpClient.Connect();
-        }
-
-        private void OnDeviceInfoChange()
-        {
-            var handler = DeviceInfoChanged;
-
-            if (handler == null) return;
-
-            handler(this, new DeviceInfoEventArgs(DeviceInfo));
-        }
-
-        #endregion
-
-
-
-
-        #region IDgeRouting Members
-
-        public IntFeedback AudioVideoSourceNumericFeedback { get; set; }
-
-        #endregion
-
-        #region IRoutingNumeric Members
-
-        public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-
-        #region IRouting Members
-
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-    }
-}
--- a/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
+++ b/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
@@ -40,8 +40,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco

        private CTimer _brandingTimer;

-        private CTimer _registrationCheckTimer;
-
        public CommunicationGather PortGather { get; private set; }

        public StatusMonitorBase CommunicationMonitor { get; private set; }
@@ -264,10 +262,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco

        private StringBuilder _jsonMessage;

-        private StringBuilder _feedbackListMessage;
-
-        private bool _feedbackListMessageIncoming;
-
        private bool _jsonFeedbackMessageIsIncoming;

        public bool CommDebuggingIsOn;
@@ -708,8 +702,6 @@ ConnectorID: {2}"

            // Fire the ready event
            SetIsReady();
-
-            _registrationCheckTimer = new CTimer(EnqueueCommand, "xFeedback list",  90000, 90000);
        }

        public void SetCommDebug(string s)
@@ -786,29 +778,6 @@ ConnectorID: {2}"
                return;
            }

-            if (!args.Text.StartsWith("/") && _feedbackListMessage != null)
-            {
-                _feedbackListMessageIncoming = false;
-
-                var feedbackListString = _feedbackListMessage.ToString();
-                _feedbackListMessage = null;
-
-                ProcessFeedbackList(feedbackListString);
-
-            }
-
-            if (args.Text.StartsWith("/"))
-            {
-                _feedbackListMessageIncoming = true;
-                if(_feedbackListMessage == null) _feedbackListMessage = new StringBuilder();
-            }
-
-            if (_feedbackListMessageIncoming && _feedbackListMessage != null)
-            {
-                _feedbackListMessage.Append(args.Text);
-                return;
-            }
-
            if (args.Text == "{" + Delimiter)        // Check for the beginning of a new JSON message
            {
                _jsonFeedbackMessageIsIncoming = true;
@@ -877,19 +846,6 @@ ConnectorID: {2}"
            }
        }

-        private void ProcessFeedbackList(string data)
-        {
-            Debug.Console(1, this, "Feedback List : ");
-            Debug.Console(1, this, data);
-
-            if (data.Split('\n').Count() == _cliFeedbackRegistrationExpression.Split('\n').Count()) return;
-            Debug.Console(0, this, "Codec Feedback Registrations Lost - Registering Feedbacks");
-            ErrorLog.Error(String.Format("[{0}] :: Codec Feedback Registrations Lost - Registering Feedbacks", Key));
-            //var updateRegistrationString = "xFeedback deregisterall" + Delimiter + _cliFeedbackRegistrationExpression;
-
-            EnqueueCommand(_cliFeedbackRegistrationExpression);
-        }
-
        /// <summary>
        /// Enqueues a command to be sent to the codec.
        /// </summary>
@@ -898,12 +854,6 @@ ConnectorID: {2}"
        {
            _syncState.AddCommandToQueue(command);
        }
-        private void EnqueueCommand(object cmd)
-        {
-            var command = cmd as string;
-            if (String.IsNullOrEmpty(command)) return;
-            _syncState.AddCommandToQueue(command);
-        }

        /// <summary>
        /// Appends the delimiter and send the command to the codec.
@@ -919,16 +869,6 @@ ConnectorID: {2}"
            Communication.SendText(command + Delimiter);
        }

-        public void SendText(object cmd)
-        {
-            var command = cmd as string;
-            if (String.IsNullOrEmpty(command)) return;
-            if (CommDebuggingIsOn)
-                Debug.Console(1, this, "Sending: '{0}'", ComTextHelper.GetDebugText(command + Delimiter));
-
-            Communication.SendText(command + Delimiter);
-        }
-
        void DeserializeResponse(string response)
        {
            try
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-	<package id="PepperDashCore" version="1.2.0" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
-</packages>
+	<package id="PepperDashCore" version="1.2.1" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+</packages>
Author	SHA1	Message	Date
Andrew Welker	c53cad8119	Merge pull request #1086 from PepperDash/hotfix/pd-core-update-ssh-issues Update PD Core to 1.2.1 DEV	2023-04-07 11:52:23 -06:00
Andrew Welker	82e8b4b203	Merge branch 'development' into hotfix/pd-core-update-ssh-issues	2023-04-07 11:37:31 -06:00
Andrew Welker	8c3b891255	Merge pull request #1082 from PepperDash/feature/vc4-fileio Update VC4 file handling	2023-04-07 11:25:01 -06:00
Andrew Welker	51bd95937a	build: update PD Core version SSH issues were found in PD Core 1.2.0 that were causing issues with manual disconnection/reconnection instead of using the autoreconnect timer. The fix for this issue was added in PD COre 1.2.1	2023-04-07 11:20:08 -06:00
jtalborough	10fc8ee30b	Merge remote-tracking branch 'origin/feature/vc4-fileio' into development	2023-03-28 16:26:32 -04:00
Neil Dorin	845978c741	Merge pull request #1079 from PepperDash/hotfix/dge-hdcp Add HDCP & Bridging support for DGE Devices	2023-03-27 15:01:54 -06:00
jta	3b2fa8aec5	fix: issue with file path on four sereis refactor: remove redundnet /	2023-01-09 17:16:03 -05:00
jta	ffa864c71b	Merge remote-tracking branch 'origin/development' into feature/vc4-fileio	2023-01-09 15:45:38 -05:00
jta	112a2b7382	feature: fileio now uses Global.FilePathPrefix as its directory All read wirtes now use the current working essentials directory. This resolves issues between 3 series, 4 series, and VC-4	2022-12-20 15:16:18 -05:00