pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-15 01:22:04 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Add support for CONFIG_NIMBLE_CPP_IDF in NimbleBluetooth callbacks

Browse Source 
Add support 1.x.x version of NimBLE-Arduino
This commit is contained in:
Alexander Begoon 2025-04-29 18:43:41 +02:00
parent 19fa899627
commit 685c8c1df7
No known key found for this signature in database
GPG Key ID: 9F7D401F3E061FF5
1 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/nimble/NimbleBluetooth.cpp
View File

@ -49,8 +49,12 @@ static uint8_t lastToRadio[MAX_TO_FROM_RADIO_SIZE];
class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
{ {
#ifdef CONFIG_NIMBLE_CPP_IDF
virtual void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo){
#else
virtual void onWrite(NimBLECharacteristic *pCharacteristic) virtual void onWrite(NimBLECharacteristic *pCharacteristic)
{ {
#endif
LOG_DEBUG("To Radio onwrite"); LOG_DEBUG("To Radio onwrite");
auto val = pCharacteristic->getValue(); auto val = pCharacteristic->getValue();
@ -61,26 +65,37 @@ class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
} else { } else {
LOG_DEBUG("Drop dup ToRadio packet we just saw"); LOG_DEBUG("Drop dup ToRadio packet we just saw");
} }
} }
}; }
;
class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
{ {
#ifdef CONFIG_NIMBLE_CPP_IDF
virtual void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo){
#else
virtual void onRead(NimBLECharacteristic *pCharacteristic) virtual void onRead(NimBLECharacteristic *pCharacteristic)
{ {
#endif
uint8_t fromRadioBytes[meshtastic_FromRadio_size]; uint8_t fromRadioBytes[meshtastic_FromRadio_size];
size_t numBytes = bluetoothPhoneAPI->getFromRadio(fromRadioBytes); size_t numBytes = bluetoothPhoneAPI->getFromRadio(fromRadioBytes);
std::string fromRadioByteString(fromRadioBytes, fromRadioBytes + numBytes); std::string fromRadioByteString(fromRadioBytes, fromRadioBytes + numBytes);
pCharacteristic->setValue(fromRadioByteString); pCharacteristic->setValue(fromRadioByteString);
} }
}; }
;
class NimbleBluetoothServerCallback : public NimBLEServerCallbacks class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
{ {
#ifdef CONFIG_NIMBLE_CPP_IDF
virtual uint32_t onPassKeyDisplay()
{
#else
virtual uint32_t onPassKeyRequest() virtual uint32_t onPassKeyRequest()
{ {
#endif
uint32_t passkey = config.bluetooth.fixed_pin; uint32_t passkey = config.bluetooth.fixed_pin;
if (config.bluetooth.mode == meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN) { if (config.bluetooth.mode == meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN) {
@ -124,9 +139,13 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
return passkey; return passkey;
} }
#ifdef CONFIG_NIMBLE_CPP_IDF
virtual void onAuthenticationComplete(NimBLEConnInfo &connInfo)
{
#else
virtual void onAuthenticationComplete(ble_gap_conn_desc *desc) virtual void onAuthenticationComplete(ble_gap_conn_desc *desc)
{ {
#endif
LOG_INFO("BLE authentication complete"); LOG_INFO("BLE authentication complete");
bluetoothStatus->updateStatus(new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::CONNECTED)); bluetoothStatus->updateStatus(new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::CONNECTED));
@ -138,10 +157,15 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
} }
} }
#ifdef CONFIG_NIMBLE_CPP_IDF
virtual void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason)
{
LOG_INFO("BLE disconnect. Reason: %i", reason);
#else
virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc) virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc)
{ {
LOG_INFO("BLE disconnect"); LOG_INFO("BLE disconnect");
#endif
bluetoothStatus->updateStatus( bluetoothStatus->updateStatus(
new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::DISCONNECTED)); new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::DISCONNECTED));
@ -191,7 +215,11 @@ int NimbleBluetooth::getRssi()
if (bleServer && isConnected()) { if (bleServer && isConnected()) {
auto service = bleServer->getServiceByUUID(MESH_SERVICE_UUID); auto service = bleServer->getServiceByUUID(MESH_SERVICE_UUID);
uint16_t handle = service->getHandle(); uint16_t handle = service->getHandle();
#ifdef CONFIG_NIMBLE_CPP_IDF
return NimBLEDevice::getClientByHandle(handle)->getRssi();
#else
return NimBLEDevice::getClientByID(handle)->getRssi(); return NimBLEDevice::getClientByID(handle)->getRssi();
#endif
} }
return 0; // FIXME figure out where to source this return 0; // FIXME figure out where to source this
} }
@ -216,6 +244,9 @@ void NimbleBluetooth::setup()
NimbleBluetoothServerCallback *serverCallbacks = new NimbleBluetoothServerCallback(); NimbleBluetoothServerCallback *serverCallbacks = new NimbleBluetoothServerCallback();
bleServer->setCallbacks(serverCallbacks, true); bleServer->setCallbacks(serverCallbacks, true);
#ifdef CONFIG_NIMBLE_CPP_IDF
bleServer->advertiseOnDisconnect(true);
#endif
setupService(); setupService();
startAdvertising(); startAdvertising();
} }
@ -259,7 +290,11 @@ void NimbleBluetooth::setupService()
BatteryCharacteristic = batteryService->createCharacteristic( // 0x2A19 is the Battery Level characteristic) BatteryCharacteristic = batteryService->createCharacteristic( // 0x2A19 is the Battery Level characteristic)
(uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY, 1); (uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY, 1);
#ifdef CONFIG_NIMBLE_CPP_IDF
NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->create2904();
#else
NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->createDescriptor((uint16_t)0x2904); NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->createDescriptor((uint16_t)0x2904);
#endif
batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8); batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8);
batteryLevelDescriptor->setNamespace(1); batteryLevelDescriptor->setNamespace(1);
batteryLevelDescriptor->setUnit(0x27ad); batteryLevelDescriptor->setUnit(0x27ad);