From 1129084078683b07bcccee6a368efdd457f6816f Mon Sep 17 00:00:00 2001 From: adabreuti <76965454+adabreuti@users.noreply.github.com> Date: Fri, 16 Sep 2022 11:22:39 -0500 Subject: [PATCH] Update BLE manager to use correct type/remove unnecessary adv interval in sysconfig (#22694) --- examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg | 2 -- examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg | 2 -- examples/lock-app/cc13x2x7_26x2x7/chip.syscfg | 2 -- examples/pump-app/cc13x2x7_26x2x7/chip.syscfg | 1 - examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg | 1 - examples/shell/cc13x2x7_26x2x7/chip.syscfg | 2 -- src/platform/cc13x2_26x2/BLEManagerImpl.cpp | 4 ++-- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg b/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg index 4bfc7e52cbd5c5..4f02a9fd40da9a 100644 --- a/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg +++ b/examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg @@ -152,8 +152,6 @@ ble.connUpdateParamsPeripheral.reqMaxConnInt = 50; ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0"; ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0"; -ble.advSet1.advParam1.primIntMin = 100; -ble.advSet1.advParam1.primIntMax = 200; /* DMM */ dmm.project = "ti_thread_thermostat_remote_display"; diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg index 4bfc7e52cbd5c5..4f02a9fd40da9a 100644 --- a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg +++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg @@ -152,8 +152,6 @@ ble.connUpdateParamsPeripheral.reqMaxConnInt = 50; ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0"; ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0"; -ble.advSet1.advParam1.primIntMin = 100; -ble.advSet1.advParam1.primIntMax = 200; /* DMM */ dmm.project = "ti_thread_thermostat_remote_display"; diff --git a/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg b/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg index bc2744adbef67d..b55c57b9c364be 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg +++ b/examples/lock-app/cc13x2x7_26x2x7/chip.syscfg @@ -152,8 +152,6 @@ ble.connUpdateParamsPeripheral.reqMaxConnInt = 50; ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0"; ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0"; -ble.advSet1.advParam1.primIntMin = 100; -ble.advSet1.advParam1.primIntMax = 200; /* DMM */ dmm.project = "ti_thread_thermostat_remote_display"; diff --git a/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg b/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg index 6de9f79586816e..6bbd36becbf9cc 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg +++ b/examples/pump-app/cc13x2x7_26x2x7/chip.syscfg @@ -77,7 +77,6 @@ ble.connUpdateParamsPeripheral.reqMinConnInt = 30; ble.connUpdateParamsPeripheral.reqMaxConnInt = 50; ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0"; ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0"; -ble.advSet1.advParam1.primIntMax = 200; ble.advSet1.advData1.$name = "ti_ble5stack_broadcaster_advertisement_data0"; ble.advSet1.scanRes1.$name = "ti_ble5stack_broadcaster_advertisement_data1"; diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg b/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg index 5efd1f6e9728bc..47c7ded81c1b56 100644 --- a/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg +++ b/examples/pump-controller-app/cc13x2x7_26x2x7/chip.syscfg @@ -77,7 +77,6 @@ ble.connUpdateParamsPeripheral.reqMinConnInt = 30; ble.connUpdateParamsPeripheral.reqMaxConnInt = 50; ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0"; ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0"; -ble.advSet1.advParam1.primIntMax = 200; ble.advSet1.advData1.$name = "ti_ble5stack_broadcaster_advertisement_data0"; ble.advSet1.scanRes1.$name = "ti_ble5stack_broadcaster_advertisement_data1"; diff --git a/examples/shell/cc13x2x7_26x2x7/chip.syscfg b/examples/shell/cc13x2x7_26x2x7/chip.syscfg index 4523f5456f7531..738502f344e309 100644 --- a/examples/shell/cc13x2x7_26x2x7/chip.syscfg +++ b/examples/shell/cc13x2x7_26x2x7/chip.syscfg @@ -117,8 +117,6 @@ ble.connUpdateParamsPeripheral.reqMaxConnInt = 50; ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0"; ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0"; -ble.advSet1.advParam1.primIntMin = 100; -ble.advSet1.advParam1.primIntMax = 200; /* DMM */ dmm.project = "ti_thread_thermostat_remote_display"; diff --git a/src/platform/cc13x2_26x2/BLEManagerImpl.cpp b/src/platform/cc13x2_26x2/BLEManagerImpl.cpp index 93cd6f85eb5180..be0bb76603ca6e 100644 --- a/src/platform/cc13x2_26x2/BLEManagerImpl.cpp +++ b/src/platform/cc13x2_26x2/BLEManagerImpl.cpp @@ -467,7 +467,7 @@ void BLEManagerImpl::ConfigureAdvertisements(void) sInstance.mAdvDatachipOBle[advIndex++] = 0x02; sInstance.mAdvDatachipOBle[advIndex++] = GAP_ADTYPE_FLAGS; - sInstance.mAdvDatachipOBle[advIndex++] = GAP_ADTYPE_FLAGS_BREDR_NOT_SUPPORTED | GAP_ADTYPE_FLAGS_LIMITED; + sInstance.mAdvDatachipOBle[advIndex++] = GAP_ADTYPE_FLAGS_BREDR_NOT_SUPPORTED | GAP_ADTYPE_FLAGS_GENERAL; sInstance.mAdvDatachipOBle[advIndex++] = advLength; sInstance.mAdvDatachipOBle[advIndex++] = GAP_ADTYPE_SERVICE_DATA; sInstance.mAdvDatachipOBle[advIndex++] = static_cast(LO_UINT16(CHIPOBLE_SERV_UUID)); @@ -792,7 +792,7 @@ void BLEManagerImpl::ProcessEvtHdrMsg(QueuedEvt_t * pMsg) GapAdv_disable(sInstance.advHandleLegacy); sInstance.mFlags.Clear(Flags::kAdvertising); - uint16_t newParamMax = 0, newParamMin = 0; + uint32_t newParamMax = 0, newParamMin = 0; if (sInstance.mFlags.Has(Flags::kFastAdvertisingEnabled)) { // Update advertising interval