Merge pull request #108 from PepperDash/feature/add-levelControlListT…

…oRoom Feature/add level control list to room
PepperDash · Aug 1, 2024 · 0ae279b · 0ae279b
2 parents 10fcac2 + 43e1d5b
commit 0ae279b
Show file tree

Hide file tree

Showing 16 changed files with 1,801 additions and 613 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -363,3 +363,4 @@ MigrationBackup/
 # Build Outputs
 output/
 /exampleConfigs/essentials-mc-test-configurationFile.json
+/.DS_Store
diff --git a/3-series/Messengers/DeviceVolumeMessenger.cs b/3-series/Messengers/DeviceVolumeMessenger.cs
@@ -77,7 +77,7 @@ protected override void CustomRegisterWithAppServer(MobileControlSystemControlle
 
             AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => 
             {
-                this.LogVerbose("Calling {localDevice} volume up with {value}", DeviceKey, b);
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b);
                 try
                 {
                     _localDevice.VolumeUp(b);
@@ -89,8 +89,9 @@ protected override void CustomRegisterWithAppServer(MobileControlSystemControlle
 
 
 
-            AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => {
-                this.LogVerbose("Calling {localDevice} volume down with {value}", DeviceKey, b);
+            AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => 
+            {
+                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume down with {value}", DeviceKey, b);
 
                 try
                 {

diff --git a/3-series/MobileControlConfig.cs b/3-series/MobileControlConfig.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using System;
 using System.Collections.Generic;
 
 namespace PepperDash.Essentials
@@ -27,6 +28,7 @@ public class MobileControlConfig
 #endif
 
         [JsonProperty("roomBridges")]
+        [Obsolete("No longer necessary")]
         public List<MobileControlRoomBridgePropertiesConfig> RoomBridges { get; set; }
 
         public MobileControlConfig()

diff --git a/3-series/MobileControlEssentialsConfig.cs b/3-series/MobileControlEssentialsConfig.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using PepperDash.Essentials.Core.Config;
+using System.Collections.Generic;
 
 
 namespace PepperDash.Essentials
@@ -40,5 +41,14 @@ public class MobileControlRuntimeInfo
     {
         [JsonProperty("pluginVersion")]
         public string PluginVersion { get; set; }
+
+        [JsonProperty("essentialsVersion")]
+        public string EssentialsVersion { get; set; }
+
+        [JsonProperty("pepperDashCoreVersion")]
+        public string PepperDashCoreVersion { get; set; }
+
+        [JsonProperty("essentialsPlugins")]
+        public List<LoadedAssembly> EssentialsPlugins { get; set; }
     }
 }