Ignore tie lines if none present in config

Essentials/PepperDashEssentials/Config/ConfigReader.cs

@@ -64,6 +64,8 @@ namespace PepperDash.Essentials
 			var merged = new JObject();
 
 			// Put together top-level objects
+			// skip any objects that don't have template objects
+
 			if (system["info"] != null)
 				merged.Add("info", Merge(template["info"], system["info"]));
 			else
@@ -72,25 +74,31 @@ namespace PepperDash.Essentials
 			merged.Add("devices", MergeArraysOnTopLevelProperty(template["devices"] as JArray, 
                 system["devices"] as JArray, "uid"));
 
-			if (system["rooms"] == null)
+			if (template["rooms"] != null)
-				merged.Add("rooms", template["rooms"]);
+			{
-			else
+				if (system["rooms"] == null)
-				merged.Add("rooms", MergeArraysOnTopLevelProperty(template["rooms"] as JArray, 
+					merged.Add("rooms", template["rooms"]);
-                    system["rooms"] as JArray, "key"));
+				else
+					merged.Add("rooms", MergeArraysOnTopLevelProperty(template["rooms"] as JArray,
+						system["rooms"] as JArray, "key"));
+			}
 
-			if (system["sourceLists"] == null)
+			if (template["sourceLists"] != null)
-				merged.Add("sourceLists", template["sourceLists"]);
+			{
-			else
+				if (system["sourceLists"] == null)
-				merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"]));
+					merged.Add("sourceLists", template["sourceLists"]);
+				else
+					merged.Add("sourceLists", Merge(template["sourceLists"], system["sourceLists"]));
+			}
 
             // Template tie lines take precdence.  Config tool doesn't do them at system
             // level anyway...
 			if (template["tieLines"] != null)
 				merged.Add("tieLines", template["tieLines"]);
-			else if (system["tieLines"] != null)
+			//else if (system["tieLines"] != null)
-				merged.Add("tieLines", system["tieLines"]);
+			//    merged.Add("tieLines", system["tieLines"]);
-			else
+			//else
-				merged.Add("tieLines", new JArray());
+			//    merged.Add("tieLines", new JArray());
 
 			Debug.Console(2, "MERGED CONFIG RESULT: \x0d\x0a{0}", merged);
 			return merged;

Essentials/PepperDashEssentials/Config/DeviceFactory.cs

@@ -69,14 +69,14 @@ namespace PepperDash.Essentials
                 return new CotijaSystemController(key, name, props);
             }
 
-			else if (typeName == "mobileControlBridge-ddvc01")
+			else if (typeName == "mobilecontrolbridge-ddvc01")
 			{
 				var comm = CommFactory.GetControlPropertiesConfig(dc);
 
 				var bridge = new PepperDash.Essentials.Room.Cotija.CotijaDdvc01RoomBridge(key, name, comm.IpIdInt);
 				bridge.AddPreActivationAction(() =>
 				{
-					var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "cotijaServer") as CotijaSystemController;
+					var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as CotijaSystemController;
 					if (parent == null)
 					{
 						Debug.Console(0, bridge, "ERROR: Cannot connect bridge. System controller not present");

Essentials/PepperDashEssentials/ControlSystem.cs

@@ -210,6 +210,11 @@ namespace PepperDash.Essentials
 
 			var tlc = TieLineCollection.Default;
 			//tlc.Clear();
+			if (ConfigReader.ConfigObject.TieLines == null)
+			{
+				return;
+			}
+
 			foreach (var tieLineConfig in ConfigReader.ConfigObject.TieLines)
 			{
 				var newTL = tieLineConfig.GetTieLine();
@@ -273,7 +278,7 @@ namespace PepperDash.Essentials
 		{
 			bridge.AddPostActivationAction(() =>
 			{
-				var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "cotijaServer") as CotijaSystemController;
+				var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as CotijaSystemController;
 				if (parent == null)
 				{
 					Debug.Console(0, bridge, "ERROR: Cannot connect bridge. System controller not present");

Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs

@@ -213,7 +213,7 @@ namespace PepperDash.Essentials.Room.Cotija
 					}
 
 				}
-			}, "cotijabridgedump", "Dumps DDVC01 bridge EISC data b,u,s", ConsoleAccessLevelEnum.AccessOperator);
+			}, "mobilebridgedump", "Dumps DDVC01 bridge EISC data b,u,s", ConsoleAccessLevelEnum.AccessOperator);
 
 			CrestronConsole.AddNewConsoleCommand(s => LoadConfigValues(), "loadddvc", "", ConsoleAccessLevelEnum.AccessOperator);
 

Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs

@@ -32,7 +32,7 @@ namespace PepperDash.Essentials
 		/// <param name="parent"></param>
 		/// <param name="room"></param>
         public CotijaEssentialsHuddleSpaceRoomBridge(EssentialsHuddleSpaceRoom room):
-			base("cotijaController", "Cotija Controller")
+			base("mobileControlBridge-essentialsHuddle", "Essentials Mobile Control Bridge-Huddle")
         {
             Room = room;   
         }