Merge pull request #186 from PepperDash/feature-2/camera-list-config

Feature 2/camera list config

.gitignore

@@ -397,3 +397,5 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 *.projectinfo
+
+output/

src/Comm/GenericSshClient.cs

@@ -182,14 +182,6 @@ namespace PepperDash.Core
             }, System.Threading.Timeout.Infinite);
 		}
 
-		/// <summary>
-		/// Just to help S+ set the key
-		/// </summary>
-		public void Initialize(string key)
-		{
-			Key = key;
-		}
-
 		/// <summary>
 		/// Handles closing this up when the program shuts down
 		/// </summary>

src/CommunicationExtras.cs

@@ -90,7 +90,7 @@ namespace PepperDash.Core
         /// <summary>
         /// The current socket status of the client
         /// </summary>
-        [JsonProperty("clinetStatus")]
+        [JsonProperty("clientStatus")]
         [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
         SocketStatus ClientStatus { get; }
 	}

src/Config/PortalConfigReader.cs

@@ -98,6 +98,19 @@ namespace PepperDash.Core.Config
 		        merged.Add("destinationLists",
 		            Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
 
+
+            if (system["cameraLists"] == null)
+                merged.Add("cameraLists", template["cameraLists"]);
+            else
+                merged.Add("cameraLists", Merge(template["cameraLists"], system["cameraLists"], "cameraLists"));
+
+            if (system["audioControlPointLists"] == null)
+                merged.Add("audioControlPointLists", template["audioControlPointLists"]);
+            else
+                merged.Add("audioControlPointLists",
+                    Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
+
+
             // Template tie lines take precedence.  Config tool doesn't do them at system
             // level anyway...
             if (template["tieLines"] != null)

src/PepperDash.Core.4Series.csproj

@@ -13,6 +13,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/PepperDash/PepperDashCore</RepositoryUrl>
     <PackageTags>crestron;4series;</PackageTags>   
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>        
     <InformationalVersion>$(Version)</InformationalVersion>    
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
   </PropertyGroup>