From be31f417db1937032ae440e1cf68cb2971284713 Mon Sep 17 00:00:00 2001
From: "James A. Jerkins" <evergreen@jamesjerkinscomputer.com>
Date: Sun, 29 Aug 2021 15:50:04 -0500
Subject: WIP Refactor ble advertising

Refactor ble advertising based on ble standards and conventions.
Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
---
 src/systemtask/SystemTask.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/systemtask/SystemTask.cpp')

diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 3553f449..2dff9254 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -120,7 +120,6 @@ void SystemTask::Work() {
   fs.Init();
 
   nimbleController.Init();
-  nimbleController.StartAdvertising();
   lcd.Init();
 
   twiMaster.Init();
@@ -226,7 +225,6 @@ void SystemTask::Work() {
             touchPanel.Wakeup();
           }
 
-          nimbleController.StartAdvertising();
           xTimerStart(dimTimer, 0);
           spiNorFlash.Wakeup();
           lcd.Wakeup();
-- 
cgit v1.2.3


From 22571d4b384e40d647cd994202956f08ed32d925 Mon Sep 17 00:00:00 2001
From: "James A. Jerkins" <evergreen@jamesjerkinscomputer.com>
Date: Sun, 5 Sep 2021 15:53:20 -0500
Subject: Advertise fast for at least 30 secs then slow down

On power up, advertise aggressively for at least 30 seconds then switch
to a longer interval to conserve battery life. This fast/slow pattern
is designed to balance connection response time and battery life.

When a disconnect event is received restart the fast/slow pattern.

When a failed connect event is received, restart the fast/slow pattern.

When the screen is activated and ble is not connected, restart the fast/slow pattern.

This pattern is consistent with Apple's BLE developer standards (QA 1931).
---
 src/components/ble/NimbleController.cpp | 13 ++++++++++++-
 src/components/ble/NimbleController.h   |  5 +++++
 src/systemtask/SystemTask.cpp           |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/systemtask/SystemTask.cpp')

diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index 8e0fe756..226f6694 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -122,6 +122,15 @@ void NimbleController::StartAdvertising() {
 
   adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
   adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
+  /* fast advertise for 30 sec */
+  if (fastAdvCount < 15) {
+    adv_params.itvl_min = 32;
+    adv_params.itvl_max = 47;
+    fastAdvCount++;
+  } else {
+    adv_params.itvl_min = 1636;
+    adv_params.itvl_max = 1651;
+  }
 
   fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP;
   fields.uuids128 = &dfuServiceUuid;
@@ -139,7 +148,7 @@ void NimbleController::StartAdvertising() {
   rc = ble_gap_adv_rsp_set_fields(&rsp_fields);
   ASSERT(rc == 0);
 
-  rc = ble_gap_adv_start(addrType, NULL, 5000, &adv_params, GAPEventCallback, this);
+  rc = ble_gap_adv_start(addrType, NULL, 2000, &adv_params, GAPEventCallback, this);
   ASSERT(rc == 0);
 }
 
@@ -163,6 +172,7 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
         alertNotificationClient.Reset();
         connectionHandle = BLE_HS_CONN_HANDLE_NONE;
         bleController.Disconnect();
+        fastAdvCount = 0;
         StartAdvertising();
       } else {
         connectionHandle = event->connect.conn_handle;
@@ -181,6 +191,7 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
       alertNotificationClient.Reset();
       connectionHandle = BLE_HS_CONN_HANDLE_NONE;
       bleController.Disconnect();
+      fastAdvCount = 0;
       StartAdvertising();
       break;
 
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 078d6158..473bb1af 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -72,6 +72,10 @@ namespace Pinetime {
       uint16_t connHandle();
       void NotifyBatteryLevel(uint8_t level);
 
+      void RestartFastAdv() {
+        fastAdvCount = 0;
+      }
+
     private:
       static constexpr const char* deviceName = "InfiniTime";
       Pinetime::System::SystemTask& systemTask;
@@ -94,6 +98,7 @@ namespace Pinetime {
 
       uint8_t addrType; // 1 = Random, 0 = PUBLIC
       uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
+      uint8_t fastAdvCount = 0;
 
       ble_uuid128_t dfuServiceUuid {
         .u {.type = BLE_UUID_TYPE_128},
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 2dff9254..41f346ae 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -233,6 +233,9 @@ void SystemTask::Work() {
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::UpdateBatteryLevel);
           heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::WakeUp);
 
+          if (!bleController.IsConnected())
+            nimbleController.RestartFastAdv();
+
           isSleeping = false;
           isWakingUp = false;
           isDimmed = false;
-- 
cgit v1.2.3