Git-Mirrors/RNode_Firmware
1
0
Fork 0
mirror of https://github.com/markqvist/RNode_Firmware.git synced 2025-05-15 04:52:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #104 from jacobeva/nrf52-ble-fix

Browse source 
Guard against BT power cycle object duplication bug
This commit is contained in:
markqvist 2025-04-12 21:02:01 +02:00 • committed by GitHub
commit 6e38a1317b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Bluetooth.h
View file

@ -38,6 +38,7 @@
BLEUart SerialBT(BLE_RX_BUF); BLEUart SerialBT(BLE_RX_BUF);
BLEDis bledis; BLEDis bledis;
BLEBas blebas; BLEBas blebas;
bool SerialBT_init = false;
#endif #endif
#define BT_PAIRING_TIMEOUT 35000 #define BT_PAIRING_TIMEOUT 35000
@ -511,12 +512,14 @@ char bt_devname[11];
// start device information service // start device information service
bledis.begin(); bledis.begin();
SerialBT.bufferTXD(true); // enable buffering // Guard to ensure SerialBT service is not duplicated through BT being power cycled
if (!SerialBT_init) {
SerialBT.bufferTXD(true); // enable buffering
SerialBT.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM); // enable encryption for BLE serial SerialBT.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM); // enable encryption for BLE serial
SerialBT.begin(); SerialBT.begin();
SerialBT_init = true;
blebas.begin(); }
Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE); Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
Bluefruit.Advertising.addTxPower(); Bluefruit.Advertising.addTxPower();