One more step in the same direction...

2 files changed, 2 insertions, 16 deletions

diff --git a/src/components/ble/BleController.h b/src/components/ble/BleController.h
index 675ede2..05112dc 100644
--- a/src/components/ble/BleController.h
+++ b/src/components/ble/BleController.h
@@ -9,7 +9,7 @@ namespace Pinetime {
     public:
       using BleAddress = std::array<uint8_t, 6>;
       enum class FirmwareUpdateStates { Idle, Running, Validated, Error };
-      enum class AddressTypes { Public, Random, RPA_Public, RPA_Random };
+      enum class AddressTypes { Public, Random };
 
       Ble() = default;
       bool IsConnected() const;
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index ee9509b..79880e9 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -107,22 +107,8 @@ void NimbleController::Init() {
   Pinetime::Controllers::Ble::BleAddress address;
   rc = ble_hs_id_copy_addr(addrType, address.data(), nullptr);
   ASSERT(rc == 0);
-
+  bleController.AddressType((addrType == 0) ? Ble::AddressTypes::Public : Ble::AddressTypes::Random);
   bleController.Address(std::move(address));
-  switch (addrType) {
-    case BLE_OWN_ADDR_PUBLIC:
-      bleController.AddressType(Ble::AddressTypes::Public);
-      break;
-    case BLE_OWN_ADDR_RANDOM:
-      bleController.AddressType(Ble::AddressTypes::Random);
-      break;
-    case BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT:
-      bleController.AddressType(Ble::AddressTypes::RPA_Public);
-      break;
-    case BLE_OWN_ADDR_RPA_RANDOM_DEFAULT:
-      bleController.AddressType(Ble::AddressTypes::RPA_Random);
-      break;
-  }
 
   rc = ble_gatts_start();
   ASSERT(rc == 0);