Revert "Merge upstream"

This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.

1 files changed, 0 insertions, 7 deletions

diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 473bb1af..0cfe983c 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -72,10 +72,6 @@ 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;
@@ -98,7 +94,6 @@ 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},
@@ -106,7 +101,5 @@ namespace Pinetime {
 
       ServiceDiscovery serviceDiscovery;
     };
-
-  static NimbleController* nptr;
   }
 }