From 172e9697dacd599c67e5a588ff6f5c1332aafdcc Mon Sep 17 00:00:00 2001 From: Paul Szczepanek Date: Wed, 28 Apr 2021 16:29:26 +0100 Subject: [PATCH 1/2] avoid init in header for compatibility --- connectivity/FEATURE_BLE/source/generic/GapImpl.cpp | 3 +++ connectivity/FEATURE_BLE/source/generic/GapImpl.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp index f4661bd6afc..5296ae690f9 100644 --- a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp +++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp @@ -369,6 +369,9 @@ Gap::Gap( _advertising_timeout(), _scan_timeout(), _user_manage_connection_parameter_requests(false) +#if BLE_ROLE_OBSERVER + , _scan_parameters_set(false) +#endif // BLE_ROLE_OBSERVER { _pal_gap.initialize(); diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.h b/connectivity/FEATURE_BLE/source/generic/GapImpl.h index 5e8a08bcd41..2f53562dfa1 100644 --- a/connectivity/FEATURE_BLE/source/generic/GapImpl.h +++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.h @@ -992,7 +992,7 @@ class Gap : bool _user_manage_connection_parameter_requests : 1; #if BLE_ROLE_OBSERVER - bool _scan_parameters_set : 1 = false; + bool _scan_parameters_set : 1; #endif // BLE_ROLE_OBSERVER }; From f872dfa5ca8a55e5ac4dde71469f5a402321b095 Mon Sep 17 00:00:00 2001 From: Paul Szczepanek Date: Thu, 29 Apr 2021 19:07:31 +0100 Subject: [PATCH 2/2] convert bitfield to bools --- connectivity/FEATURE_BLE/source/generic/GapImpl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.h b/connectivity/FEATURE_BLE/source/generic/GapImpl.h index 2f53562dfa1..d006738975a 100644 --- a/connectivity/FEATURE_BLE/source/generic/GapImpl.h +++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.h @@ -990,9 +990,9 @@ class Gap : BitArray _adv_started_from_refresh; - bool _user_manage_connection_parameter_requests : 1; + bool _user_manage_connection_parameter_requests; #if BLE_ROLE_OBSERVER - bool _scan_parameters_set : 1; + bool _scan_parameters_set; #endif // BLE_ROLE_OBSERVER };