Merge pull request #169 from PepperDash/feature-2/adds-web-classes

Update debugging and add web stuff
PepperDash · Feb 5, 2024 · 277dccd · 277dccd
2 parents 2b95857 + b13a178
commit 277dccd
Show file tree

Hide file tree

Showing 13 changed files with 1,352 additions and 68 deletions.
diff --git a/src/Pepperdash Core/Config/PortalConfigReader.cs b/src/Pepperdash Core/Config/PortalConfigReader.cs
@@ -79,7 +79,7 @@ public static JObject MergeConfigs(JObject doubleConfig)
 				merged.Add("info", template["info"]);
 
 			merged.Add("devices", MergeArraysOnTopLevelProperty(template["devices"] as JArray,
-				system["devices"] as JArray, "uid", "devices"));
+				system["devices"] as JArray, "key", "devices"));
 
 			if (system["rooms"] == null)
 				merged.Add("rooms", template["rooms"]);
@@ -117,7 +117,7 @@ public static JObject MergeConfigs(JObject doubleConfig)
 			else
 				merged.Add("global", template["global"]);
 
-			Debug.Console(2, "MERGED CONFIG RESULT: \x0d\x0a{0}", merged);
+			//Debug.Console(2, "MERGED CONFIG RESULT: \x0d\x0a{0}", merged);
 			return merged;
 		}
 

diff --git a/src/Pepperdash Core/CoreInterfaces.cs b/src/Pepperdash Core/CoreInterfaces.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using Serilog;
 
 namespace PepperDash.Core
 {
@@ -15,16 +16,17 @@ public interface IKeyed
         /// Unique Key
         /// </summary>
 		string Key { get; }
-	}
+    }
 
     /// <summary>
-    /// Named Keyed device interface. Forces the devie to have a Unique Key and a name. 
+    /// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
     /// </summary>
 	public interface IKeyName : IKeyed
-	{
+    {
         /// <summary>
         /// Isn't it obvious :)
         /// </summary>
 		string Name { get; }
-	}
+    }
+
 }
diff --git a/src/Pepperdash Core/Device.cs b/src/Pepperdash Core/Device.cs
@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Serilog;
+using Serilog.Core;
+using Serilog.Sinks.SystemConsole;
 
 namespace PepperDash.Core
 {
@@ -10,6 +13,7 @@ namespace PepperDash.Core
 	/// </summary>
 	public class Device : IKeyName
 	{
+
         /// <summary>
         /// Unique Key
         /// </summary>
@@ -51,7 +55,6 @@ public Device(string key)
 			Key = key;
 			if (key.Contains('.')) Debug.Console(0, this, "WARNING: Device name's should not include '.'");
 			Name = "";
-
 		}
 
         /// <summary>

diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs
@@ -194,7 +194,7 @@ public void EvaluateFile(string filepath)
         /// Sets the debug level
         /// </summary>
         /// <param name="level"></param>
-        public void setDebugLevel(int level)
+        public void setDebugLevel(uint level)
         {
             Debug.SetDebugLevel(level);
         }

diff --git a/src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs b/src/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs
@@ -128,7 +128,7 @@ FileInfo GetActualFileInfoFromPath(string path)
 		/// 
 		/// </summary>
 		/// <param name="level"></param>
-		public void setDebugLevel(int level)
+		public void setDebugLevel(uint level)
 		{
 			Debug.SetDebugLevel(level);
 		}