diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index 6d24984..46fde01 100644 Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo index 15cb560..9d720ef 100644 Binary files a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-01-24 10-34-11).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-01-24 10-34-11).log new file mode 100644 index 0000000..e9ade86 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-01-24 10-34-11).log @@ -0,0 +1,3 @@ +1/24/2017 10:34:11 AM, Info: Initializing SIMPLSharp Services... +1/24/2017 10:34:11 AM, Info: ProjectInfo successfully initialized. +1/24/2017 1:02:44 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-09 14-54-30).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-09 14-54-30).log new file mode 100644 index 0000000..f8dbc56 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-09 14-54-30).log @@ -0,0 +1,3 @@ +2/9/2017 2:54:30 PM, Info: Initializing SIMPLSharp Services... +2/9/2017 2:54:30 PM, Info: ProjectInfo successfully initialized. +2/9/2017 2:55:59 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-10 11-04-32).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-10 11-04-32).log new file mode 100644 index 0000000..701f928 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-10 11-04-32).log @@ -0,0 +1,3 @@ +2/10/2017 11:04:32 AM, Info: Initializing SIMPLSharp Services... +2/10/2017 11:04:32 AM, Info: ProjectInfo successfully initialized. +2/10/2017 1:09:48 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 08-30-12).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 08-30-12).log new file mode 100644 index 0000000..5fd29c0 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 08-30-12).log @@ -0,0 +1,3 @@ +2/13/2017 8:30:12 AM, Info: Initializing SIMPLSharp Services... +2/13/2017 8:30:12 AM, Info: ProjectInfo successfully initialized. +2/13/2017 9:48:40 AM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs b/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs index 6d0613d..365db1e 100644 --- a/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs +++ b/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs @@ -125,12 +125,13 @@ namespace PepperDash.Core.WebApi.Presets var client = new HttpsClient(); client.HostVerification = false; client.PeerVerification = false; + + // ask for the preset var resp = client.Dispatch(req); - if (resp.Code == 200) + if (resp.Code == 200) // got it { Debug.Console(1, this, "Received: {0}", resp.ContentString); var preset = JsonConvert.DeserializeObject(resp.ContentString); - CurrentPreset = preset; //if there's no preset data, load the template @@ -145,6 +146,11 @@ namespace PepperDash.Core.WebApi.Presets var handler = PresetReceived; if (handler != null) PresetReceived(this, new PresetReceivedEventArgs(preset)); + } + else // no existing preset + { + CurrentPreset = new Preset(); + LoadDefaultPresetData(); } } catch (HttpException e) diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz deleted file mode 100644 index 0f0bf11..0000000 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and /dev/null differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config index f66f7f9..e7108ac 100644 --- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config +++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config @@ -10,8 +10,8 @@ - 1/11/2017 3:24:24 PM - 1.0.6220.27731 + 2/13/2017 1:50:03 PM + 1.0.6253.24901 Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10 diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll index 0e3b531..ea0b250 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb index 5e24834..1ea22a5 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb differ diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info index c70917c..b318c1c 100644 --- a/Pepperdash Core/Pepperdash Core/bin/manifest.info +++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info @@ -1,4 +1,4 @@ -MainAssembly=PepperDash_Core.dll:2ce705d0617973f5c800064ef6bd32cd +MainAssembly=PepperDash_Core.dll:376f0c0b11f57cee97fbee77c6d5579f MainAssemblyMinFirmwareVersion=1.007.0017 MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e ü diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser index ff50fd7..d1bb685 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll index 325d650..066f88b 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb index cc9a3c4..a9afd6a 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb differ