From 3841a9bad156255954717ad4d5cc479e9aa70176 Mon Sep 17 00:00:00 2001 From: Heath Volmer Date: Fri, 20 Jul 2018 15:44:59 -0600 Subject: [PATCH 1/2] Added power-on semaphore to Sammy display to prevent power on glitches --- PepperDashEssentials/Room/Cotija/CotijaSystemController.cs | 5 +++++ essentials-framework | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs b/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs index 7141a577..ab06a774 100644 --- a/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs +++ b/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs @@ -450,6 +450,11 @@ namespace PepperDash.Essentials /// void HandleHeartBeat(JToken content) { + SendMessageToServer(JObject.FromObject(new + { + type = "/heartbeat-ack" + })); + var code = content["userCode"]; if(code != null) { diff --git a/essentials-framework b/essentials-framework index 8dbb67fd..5b411024 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit 8dbb67fda753e126de3f99e8814153410f8834bb +Subproject commit 5b4110246f47344c1a4e2dd119a9cd0c4019898b From 9eb9485bba5031961cb68819949761a20027ac9e Mon Sep 17 00:00:00 2001 From: Heath Volmer Date: Fri, 27 Jul 2018 07:36:09 -0600 Subject: [PATCH 2/2] Recommit after merging framework sub --- essentials-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework b/essentials-framework index 570eda3f..4eb31deb 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit 570eda3fbd2bd8f8b40c112d065b2932573acc1e +Subproject commit 4eb31deba608e0ba59deca4a244cf03032a0305f