Merge branch 'development' into hotfix/missing-logo-info-in-room-config

#497 Add logic to set checksum value

PepperDashEssentials/ControlSystem.cs

@@ -536,23 +536,31 @@ namespace PepperDash.Essentials
             string logoLight = null;
             string logo = null;
 
-            if (c.Properties["logoDark"] != null)
+            try
             {
-                logoDark = c.Properties["logoDark"].Value<string>("type");
-            }
+                if (c.Properties["logoDark"] != null)
+                {
+                    logoDark = c.Properties["logoDark"].Value<string>("type");
+                }
 
-            if (c.Properties["logoLight"] != null)
+                if (c.Properties["logoLight"] != null)
+                {
+                    logoLight = c.Properties["logoLight"].Value<string>("type");
+                }
+
+                if (c.Properties["logo"] != null)
+                {
+                    logo = c.Properties["logo"].Value<string>("type");
+                }
+
+                return ((logoDark != null && logoDark == "system") ||
+                        (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
+            }
+            catch (Exception e)
             {
-                logoLight = c.Properties["logoLight"].Value<string>("type");
+                Debug.Console(1, Debug.ErrorLogLevel.Notice, "Unable to find logo information in any room config");
+                return false;
             }
-
-            if (c.Properties["logo"] != null)
-            {
-                logo = c.Properties["logo"].Value<string>("type");
-            }
-
-            return ((logoDark != null && logoDark == "system") ||
-                    (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
         }
     }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -516,12 +516,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText("xconfiguration userinterface custommessage: \"Scan the QR code with a mobile phone to get started\"");
             SendText("xconfiguration userinterface osd halfwakemessage: \"Tap the touch panel or scan the QR code with a mobile phone to get started\"");
 
+            var checksum = !String.IsNullOrEmpty(mcBridge.QrCodeChecksum)
+                ? String.Format("checksum: {0} ", mcBridge.QrCodeChecksum)
+                : String.Empty;
+
             SendText(String.Format(
-                            "xcommand userinterface branding fetch type: branding url: {0}",
-                            mcBridge.QrCodeUrl));
+                "xcommand userinterface branding fetch {1}type: branding url: {0}",
+                mcBridge.QrCodeUrl, checksum));
             SendText(String.Format(
-                "xcommand userinterface branding fetch type: halfwakebranding url: {0}",
-                mcBridge.QrCodeUrl));
+                "xcommand userinterface branding fetch {1}type: halfwakebranding url: {0}",
+                mcBridge.QrCodeUrl, checksum));
         }
 
         private void SendBrandingUrl()