Merge remote-tracking branch 'origin/feature/add-screenLiftControl' i…

…nto fix/mobile-control-system-controller-fix
PepperDash · May 11, 2024 · dc15481 · dc15481
2 parents 5dac5a6 + aedb8f7
commit dc15481
Show file tree

Hide file tree

Showing 11 changed files with 2,359 additions and 1,629 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/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()