From 850302d5316cc648123281173b6ef53acb64b442 Mon Sep 17 00:00:00 2001
From: Mahesh <92411857+pimpalemahesh@users.noreply.github.com>
Date: Tue, 25 Jun 2024 21:43:45 +0530
Subject: [PATCH 1/3] [ESP32] Replaced FreeRTOS timer with CHIP timers in
nimble BLEManagerImpl. (#34050)
* Replace free RTOS timer with ChipTimer
* Replaced FreeRTOS timer with CHIP timer
---
src/platform/ESP32/BLEManagerImpl.h | 2 +-
src/platform/ESP32/nimble/BLEManagerImpl.cpp | 41 +++++---------------
2 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/src/platform/ESP32/BLEManagerImpl.h b/src/platform/ESP32/BLEManagerImpl.h
index 8265b36f177028..2baa2a04836c8b 100644
--- a/src/platform/ESP32/BLEManagerImpl.h
+++ b/src/platform/ESP32/BLEManagerImpl.h
@@ -302,7 +302,7 @@ class BLEManagerImpl final : public BLEManager,
CHIP_ERROR StartAdvertising(void);
void StartBleAdvTimeoutTimer(uint32_t aTimeoutInMs);
void CancelBleAdvTimeoutTimer(void);
- static void BleAdvTimeoutHandler(TimerHandle_t xTimer);
+ static void BleAdvTimeoutHandler(System::Layer *, void *);
#if CONFIG_BT_BLUEDROID_ENABLED
void HandleGATTControlEvent(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t * param);
diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index 9ee4476c39730c..7282a043e490bf 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -76,8 +76,7 @@ namespace Internal {
namespace {
-TimerHandle_t sbleAdvTimeoutTimer; // FreeRTOS sw timer.
-#if CONFIG_ENABLE_ESP32_BLE_CONTROLLER
+#ifdef CONFIG_ENABLE_ESP32_BLE_CONTROLLER
static constexpr uint16_t kNewConnectionScanTimeout = 60;
static constexpr uint16_t kConnectTimeout = 20;
#endif
@@ -212,16 +211,6 @@ CHIP_ERROR BLEManagerImpl::_Init()
{
CHIP_ERROR err;
- // Create FreeRTOS sw timer for BLE timeouts and interval change.
- sbleAdvTimeoutTimer = xTimerCreate("BleAdvTimer", // Just a text name, not used by the RTOS kernel
- 1, // == default timer period
- false, // no timer reload (==one-shot)
- (void *) this, // init timer id = ble obj context
- BleAdvTimeoutHandler // timer callback handler
- );
-
- VerifyOrReturnError(sbleAdvTimeoutTimer != nullptr, CHIP_ERROR_NO_MEMORY);
-
// Initialize the Chip BleLayer.
#if CONFIG_ENABLE_ESP32_BLE_CONTROLLER
err = BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer());
@@ -257,9 +246,7 @@ CHIP_ERROR BLEManagerImpl::_Init()
void BLEManagerImpl::_Shutdown()
{
- VerifyOrReturn(sbleAdvTimeoutTimer != nullptr);
- xTimerDelete(sbleAdvTimeoutTimer, portMAX_DELAY);
- sbleAdvTimeoutTimer = nullptr;
+ CancelBleAdvTimeoutTimer();
BleLayer::Shutdown();
@@ -294,7 +281,7 @@ CHIP_ERROR BLEManagerImpl::_SetAdvertisingEnabled(bool val)
return err;
}
-void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
+void BLEManagerImpl::BleAdvTimeoutHandler(System::Layer *, void *)
{
if (BLEMgrImpl().mFlags.Has(Flags::kFastAdvertisingEnabled))
{
@@ -306,7 +293,6 @@ void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
BLEMgrImpl().mFlags.Clear(Flags::kExtAdvertisingEnabled);
BLEMgrImpl().StartBleAdvTimeoutTimer(CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_CHANGE_TIME_MS);
#endif
- PlatformMgr().ScheduleWork(DriveBLEState, 0);
}
#if CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
else
@@ -316,9 +302,9 @@ void BLEManagerImpl::BleAdvTimeoutHandler(TimerHandle_t xTimer)
BLEMgrImpl().mFlags.Set(Flags::kExtAdvertisingEnabled);
BLEMgr().SetAdvertisingMode(BLEAdvertisingMode::kSlowAdvertising);
BLEMgrImpl().mFlags.Set(Flags::kAdvertisingRefreshNeeded, 1);
- PlatformMgr().ScheduleWork(DriveBLEState, 0);
}
#endif
+ PlatformMgr().ScheduleWork(DriveBLEState, 0);
}
CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode)
@@ -729,26 +715,17 @@ CHIP_ERROR BLEManagerImpl::MapBLEError(int bleErr)
}
void BLEManagerImpl::CancelBleAdvTimeoutTimer(void)
{
- VerifyOrReturn(sbleAdvTimeoutTimer != nullptr);
-
- if (xTimerStop(sbleAdvTimeoutTimer, pdMS_TO_TICKS(0)) == pdFAIL)
+ if (SystemLayer().IsTimerActive(BleAdvTimeoutHandler, nullptr))
{
- ChipLogError(DeviceLayer, "Failed to stop BledAdv timeout timer");
+ SystemLayer().CancelTimer(BleAdvTimeoutHandler, nullptr);
}
}
void BLEManagerImpl::StartBleAdvTimeoutTimer(uint32_t aTimeoutInMs)
{
- VerifyOrReturn(sbleAdvTimeoutTimer != nullptr);
-
- if (xTimerIsTimerActive(sbleAdvTimeoutTimer))
- {
- CancelBleAdvTimeoutTimer();
- }
+ CancelBleAdvTimeoutTimer();
- // timer is not active, change its period to required value (== restart).
- // FreeRTOS- Block for a maximum of 100 ticks if the change period command
- // cannot immediately be sent to the timer command queue.
- if (xTimerChangePeriod(sbleAdvTimeoutTimer, pdMS_TO_TICKS(aTimeoutInMs), pdMS_TO_TICKS(100)) != pdPASS)
+ CHIP_ERROR err = SystemLayer().StartTimer(System::Clock::Milliseconds32(aTimeoutInMs), BleAdvTimeoutHandler, nullptr);
+ if ((err != CHIP_NO_ERROR))
{
ChipLogError(DeviceLayer, "Failed to start BledAdv timeout timer");
}
From 9b4cd840d45799d0d7344bc94b2f293a68702d08 Mon Sep 17 00:00:00 2001
From: Shubham Patil <shubham.patil@espressif.com>
Date: Thu, 27 Jun 2024 02:00:10 +0530
Subject: [PATCH 2/3] ESP32: Fixes in BLEManager (#34082)
- Fix the ble re-advertisement if invalid bytes are written on the
characteristic.
- cancel the ble advertisement timer on ble connection
- remove the unnecessary if check
---
.../ESP32/bluedroid/BLEManagerImpl.cpp | 1 +
src/platform/ESP32/nimble/BLEManagerImpl.cpp | 30 ++++++++++---------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
index 06c95b3b45f153..e86f7dfd3cd805 100644
--- a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
@@ -916,6 +916,7 @@ bool BLEManagerImpl::SendReadResponse(BLE_CONNECTION_OBJECT conId, BLE_READ_REQU
void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId)
{
ChipLogProgress(Ble, "Got notification regarding chip connection closure");
+ CloseConnection(conId);
}
CHIP_ERROR BLEManagerImpl::MapBLEError(int bleErr)
diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index 7282a043e490bf..4ced4cc5aa0f83 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -682,7 +682,11 @@ bool BLEManagerImpl::SendReadResponse(BLE_CONNECTION_OBJECT conId, BLE_READ_REQU
return false;
}
-void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId) {}
+void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId)
+{
+ ChipLogDetail(Ble, "Received notification of closed CHIPoBLE connection (con %u)", conId);
+ CloseConnection(conId);
+}
CHIP_ERROR BLEManagerImpl::MapBLEError(int bleErr)
{
@@ -820,23 +824,21 @@ void BLEManagerImpl::DriveBLEState(void)
ExitNow();
}
}
- // mFlags.Clear(Flags::kAdvertisingRefreshNeeded);
// Transition to the not Advertising state...
- if (mFlags.Has(Flags::kAdvertising))
- {
- mFlags.Clear(Flags::kAdvertising);
- mFlags.Set(Flags::kFastAdvertisingEnabled, true);
+ mFlags.Clear(Flags::kAdvertising);
+ mFlags.Set(Flags::kFastAdvertisingEnabled, true);
- ChipLogProgress(DeviceLayer, "CHIPoBLE advertising stopped");
+ ChipLogProgress(DeviceLayer, "CHIPoBLE advertising stopped");
- // Post a CHIPoBLEAdvertisingChange(Stopped) event.
- {
- ChipDeviceEvent advChange;
- advChange.Type = DeviceEventType::kCHIPoBLEAdvertisingChange;
- advChange.CHIPoBLEAdvertisingChange.Result = kActivity_Stopped;
- err = PlatformMgr().PostEvent(&advChange);
- }
+ CancelBleAdvTimeoutTimer();
+
+ // Post a CHIPoBLEAdvertisingChange(Stopped) event.
+ {
+ ChipDeviceEvent advChange;
+ advChange.Type = DeviceEventType::kCHIPoBLEAdvertisingChange;
+ advChange.CHIPoBLEAdvertisingChange.Result = kActivity_Stopped;
+ err = PlatformMgr().PostEvent(&advChange);
}
ExitNow();
From b71e4f02031584f088781e40ca8bbc454c5d7685 Mon Sep 17 00:00:00 2001
From: cdj <45139296+DejinChen@users.noreply.github.com>
Date: Wed, 8 May 2024 03:15:24 +0800
Subject: [PATCH 3/3] Fix crash for eps32 commissioner if ble disconnect during
commissioning (#33332)
---
src/platform/ESP32/nimble/BLEManagerImpl.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index 4ced4cc5aa0f83..997e36bc53dcac 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -499,6 +499,10 @@ bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const
uint8_t value[2];
int rc;
struct peer * peer = peer_find(conId);
+ if (peer == nullptr)
+ {
+ return false;
+ }
dsc = peer_dsc_find_uuid(peer, (ble_uuid_t *) (&ShortUUID_CHIPoBLEService), (ble_uuid_t *) (&UUID_CHIPoBLEChar_TX),
(ble_uuid_t *) (&ShortUUID_CHIPoBLE_CharTx_Desc));
@@ -533,6 +537,10 @@ bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, cons
uint8_t value[2];
int rc;
struct peer * peer = peer_find(conId);
+ if (peer == nullptr)
+ {
+ return false;
+ }
dsc = peer_dsc_find_uuid(peer, (ble_uuid_t *) (&ShortUUID_CHIPoBLEService), (ble_uuid_t *) (&UUID_CHIPoBLEChar_TX),
(ble_uuid_t *) (&ShortUUID_CHIPoBLE_CharTx_Desc));