From 4820b2ffe8be0b8d1abefd307a4c0fe6d4d41a73 Mon Sep 17 00:00:00 2001
From: "James A. Jerkins" <evergreen@jamesjerkinscomputer.com>
Date: Sun, 5 Sep 2021 15:52:01 -0500
Subject: Revert "Linear decrease of advert rate to conserve battery"

This reverts commit c32ba844e04017a3fd31444c384deb3542bd76be.
---
 src/components/ble/NimbleController.cpp | 5 -----
 src/components/ble/NimbleController.h   | 1 -
 2 files changed, 6 deletions(-)

(limited to 'src')

diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index bebca2d3..8e0fe756 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -122,8 +122,6 @@ void NimbleController::StartAdvertising() {
 
   adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
   adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
-  adv_params.itvl_min = advInterval;
-  adv_params.itvl_max = advInterval + 100;
 
   fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP;
   fields.uuids128 = &dfuServiceUuid;
@@ -150,8 +148,6 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
     case BLE_GAP_EVENT_ADV_COMPLETE:
       NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_ADV_COMPLETE");
       NRF_LOG_INFO("reason=%d; status=%d", event->adv_complete.reason, event->connect.status);
-      if (advInterval < 7100)
-        advInterval += 500;
       StartAdvertising();
       break;
 
@@ -185,7 +181,6 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
       alertNotificationClient.Reset();
       connectionHandle = BLE_HS_CONN_HANDLE_NONE;
       bleController.Disconnect();
-      advInterval = 100;
       StartAdvertising();
       break;
 
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 79761108..078d6158 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -94,7 +94,6 @@ namespace Pinetime {
 
       uint8_t addrType; // 1 = Random, 0 = PUBLIC
       uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
-      uint16_t advInterval = 100; // multiplied by 0.625ms, must be in 32..16384
 
       ble_uuid128_t dfuServiceUuid {
         .u {.type = BLE_UUID_TYPE_128},
-- 
cgit v1.2.3