From 0f9a117149bfa56104c0b64be870fadb71cd6b6e Mon Sep 17 00:00:00 2001
From: Martin Boonk <martin@boonk.info>
Date: Sun, 6 Nov 2022 15:47:54 +0100
Subject: [PATCH] bthrm - Always use a grace period to force some steps into
 next idle period

---
 apps/bthrm/lib.js | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/apps/bthrm/lib.js b/apps/bthrm/lib.js
index d9acce90c..3b9e9faa5 100644
--- a/apps/bthrm/lib.js
+++ b/apps/bthrm/lib.js
@@ -312,13 +312,13 @@ exports.enable = () => {
         result = result.then(()=>{
           log("Starting notifications", newCharacteristic);
           var startPromise = newCharacteristic.startNotifications().then(()=>log("Notifications started", newCharacteristic));
-          if (settings.gracePeriodNotification > 0){
-            log("Add " + settings.gracePeriodNotification + "ms grace period after starting notifications");
-            startPromise = startPromise.then(()=>{
-              log("Wait after connect");
-              return waitingPromise(settings.gracePeriodNotification);
-            });
-          }
+          
+          log("Add " + settings.gracePeriodNotification + "ms grace period after starting notifications");
+          startPromise = startPromise.then(()=>{
+            log("Wait after connect");
+            return waitingPromise(settings.gracePeriodNotification);
+          });
+          
           return startPromise;
         });
       }
@@ -429,13 +429,11 @@ exports.enable = () => {
           var connectPromise = gatt.connect(connectSettings).then(function() {
             log("Connected.");
           });
-          if (settings.gracePeriodConnect > 0){
-            log("Add " + settings.gracePeriodConnect + "ms grace period after connecting");
-            connectPromise = connectPromise.then(()=>{
-              log("Wait after connect");
-              return waitingPromise(settings.gracePeriodConnect);
-            });
-          }
+          log("Add " + settings.gracePeriodConnect + "ms grace period after connecting");
+          connectPromise = connectPromise.then(()=>{
+            log("Wait after connect");
+            return waitingPromise(settings.gracePeriodConnect);
+          });
           return connectPromise;
         } else {
           return Promise.resolve();
@@ -476,13 +474,11 @@ exports.enable = () => {
               log("Supporting service", service.uuid);
               result = attachServicePromise(result, service);
             }
-            if (settings.gracePeriodService > 0) {
-              log("Add " + settings.gracePeriodService + "ms grace period after services");
-              result = result.then(()=>{
-                log("Wait after services");
-                return waitingPromise(settings.gracePeriodService);
-              });
-            }
+            log("Add " + settings.gracePeriodService + "ms grace period after services");
+            result = result.then(()=>{
+              log("Wait after services");
+              return waitingPromise(settings.gracePeriodService);
+            });
             return result;
           });
         } else {