ua1zbe
/
LoRa_APRS_Tracker111
mirror of https://github.com/richonguzman/LoRa_APRS_Tracker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BLE updated for Android also

This commit is contained in:
richonguzman 2024-08-16 11:58:29 -04:00
parent 75ca1d72ab
commit 2e5f1c3623
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/ble_utils.cpp
View File

@ -7,9 +7,15 @@
#include "logger.h" #include "logger.h"
#define SERVICE_UUID "00000001-ba2a-46c9-ae49-01b0961f68bb" // APPLE - APRS.fi app
#define CHARACTERISTIC_UUID_TX "00000003-ba2a-46c9-ae49-01b0961f68bb" #define SERVICE_UUID_0 "00000001-ba2a-46c9-ae49-01b0961f68bb"
#define CHARACTERISTIC_UUID_RX "00000002-ba2a-46c9-ae49-01b0961f68bb" #define CHARACTERISTIC_UUID_TX_0 "00000003-ba2a-46c9-ae49-01b0961f68bb"
#define CHARACTERISTIC_UUID_RX_0 "00000002-ba2a-46c9-ae49-01b0961f68bb"
// ANDROID - BLE Terminal app (Serial Bluetooth Terminal from Playstore)
#define SERVICE_UUID_2 "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"
#define CHARACTERISTIC_UUID_TX_2 "6E400002-B5A3-F393-E0A9-E50E24DCCA9E"
#define CHARACTERISTIC_UUID_RX_2 "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"
BLEServer *pServer; BLEServer *pServer;
BLECharacteristic *pCharacteristicTx; BLECharacteristic *pCharacteristicTx;
@ -26,11 +32,13 @@ class MyServerCallbacks : public NimBLEServerCallbacks {
void onConnect(NimBLEServer* pServer) { void onConnect(NimBLEServer* pServer) {
bluetoothConnected = true; bluetoothConnected = true;
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BLE", "%s", "BLE Client Connected"); logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BLE", "%s", "BLE Client Connected");
delay(100);
} }
void onDisconnect(NimBLEServer* pServer) { void onDisconnect(NimBLEServer* pServer) {
bluetoothConnected = false; bluetoothConnected = false;
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BLE", "%s", "BLE client Disconnected, Started Advertising"); logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "BLE", "%s", "BLE client Disconnected, Started Advertising");
delay(100);
pServer->startAdvertising(); pServer->startAdvertising();
} }
}; };
@ -68,30 +76,37 @@ namespace BLE_Utils {
pServer = BLEDevice::createServer(); pServer = BLEDevice::createServer();
pServer->setCallbacks(new MyServerCallbacks()); pServer->setCallbacks(new MyServerCallbacks());
BLEService *pService = pServer->createService(SERVICE_UUID); BLEService *pService = nullptr;
pCharacteristicTx = pService->createCharacteristic( if (Config.bluetoothType == 0) {
CHARACTERISTIC_UUID_TX, pService = pServer->createService(SERVICE_UUID_0);
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY pCharacteristicTx = pService->createCharacteristic(CHARACTERISTIC_UUID_TX_0, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
); pCharacteristicRx = pService->createCharacteristic(CHARACTERISTIC_UUID_RX_0, NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
pCharacteristicRx = pService->createCharacteristic( } else if (Config.bluetoothType == 2) {
CHARACTERISTIC_UUID_RX, pService = pServer->createService(SERVICE_UUID_2);
NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR pCharacteristicTx = pService->createCharacteristic(CHARACTERISTIC_UUID_TX_2, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
); pCharacteristicRx = pService->createCharacteristic(CHARACTERISTIC_UUID_RX_2, NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
}
pCharacteristicRx->setCallbacks(new MyCallbacks()); if (pService != nullptr) {
pCharacteristicRx->setCallbacks(new MyCallbacks());
pService->start();
pService->start(); BLEAdvertising* pAdvertising = BLEDevice::getAdvertising();
BLEAdvertising* pAdvertising = BLEDevice::getAdvertising(); if (Config.bluetoothType == 0) {
pAdvertising->addServiceUUID(SERVICE_UUID); pAdvertising->addServiceUUID(SERVICE_UUID_0);
pServer->getAdvertising()->setScanResponse(true); } else if (Config.bluetoothType == 2) {
pServer->getAdvertising()->setMinPreferred(0x06); pAdvertising->addServiceUUID(SERVICE_UUID_2);
pServer->getAdvertising()->setMaxPreferred(0x0C); }
pServer->getAdvertising()->setScanResponse(true);
pAdvertising->start(); pServer->getAdvertising()->setMinPreferred(0x06);
pServer->getAdvertising()->setMaxPreferred(0x0C);
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "BLE", "%s", "Waiting for BLE central to connect..."); pAdvertising->start();
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "BLE", "%s", "Waiting for BLE central to connect...");
} else {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, "BLE", "Failed to create BLE service. Invalid bluetoothType: %d", Config.bluetoothType);
}
} }
void sendToLoRa() { void sendToLoRa() {