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

small digirepeater improvement

This commit is contained in:
richonguzman 2023-11-15 01:26:29 -03:00
parent 61478a717a
commit 3ba33bb696
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LoRa_APRS_Tracker.cpp
View File

@ -34,7 +34,7 @@ TinyGPSPlus gps;
BluetoothSerial SerialBT; BluetoothSerial SerialBT;
OneButton userButton = OneButton(BUTTON_PIN, true, true); OneButton userButton = OneButton(BUTTON_PIN, true, true);
String versionDate = "2023.11.13"; String versionDate = "2023.11.15";
int myBeaconsIndex = 0; int myBeaconsIndex = 0;
int myBeaconsSize = Config.beacons.size(); int myBeaconsSize = Config.beacons.size();

9
src/ble_utils.cpp
View File

@ -4,8 +4,9 @@
#include "display.h" #include "display.h"
#include "logger.h" #include "logger.h"
#define SERVICE_UUID "6ba1b218-15a8-461f-9fa8-5dcae273eafd" #define SERVICE_UUID "00000001-ba2a-46c9-ae49-01b0961f68bb"
#define CHARACTERISTIC_UUID "ed9da18c-a800-4f66-a670-aa7547e34453" #define CHARACTERISTIC_UUID "00000003-ba2a-46c9-ae49-01b0961f68bb"
//#define CHARACTERISTIC_UUID "00000002-ba2a-46c9-ae49-01b0961f68bb"
NimBLEServer* pServer; NimBLEServer* pServer;
NimBLECharacteristic* pCharacteristic; NimBLECharacteristic* pCharacteristic;
@ -73,7 +74,9 @@ namespace BLE_Utils {
NimBLEDevice::init("LoRa APRS Tracker"); NimBLEDevice::init("LoRa APRS Tracker");
NimBLEServer* pServer = NimBLEDevice::createServer(); NimBLEServer* pServer = NimBLEDevice::createServer();
NimBLEService* pService = pServer->createService(SERVICE_UUID); NimBLEService* pService = pServer->createService(SERVICE_UUID);
pCharacteristic = pService->createCharacteristic(CHARACTERISTIC_UUID, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::NOTIFY); pCharacteristic = pService->createCharacteristic(
CHARACTERISTIC_UUID,
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::NOTIFY);
pCharacteristic->setCallbacks(new MyCallbacks()); pCharacteristic->setCallbacks(new MyCallbacks());
pService->start(); pService->start();

2
src/msg_utils.cpp
View File

@ -169,7 +169,7 @@ namespace MSG_Utils {
//BLUETOOTH_Utils::sendPacket(packetReceived.substring(3)); //BLUETOOTH_Utils::sendPacket(packetReceived.substring(3));
BLE_Utils::sendToPhone(packetReceived.substring(3)); BLE_Utils::sendToPhone(packetReceived.substring(3));
if (digirepeaterActive) { if (digirepeaterActive && aprsPacket.addressee!=currentBeacon->callsign) {
String digiRepeatedPacket = APRSPacketLib::generateDigiRepeatedPacket(aprsPacket, currentBeacon->callsign); String digiRepeatedPacket = APRSPacketLib::generateDigiRepeatedPacket(aprsPacket, currentBeacon->callsign);
if (digiRepeatedPacket == "X") { if (digiRepeatedPacket == "X") {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "Packet won't be Repeated (Missing WIDE1-X)"); logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "Packet won't be Repeated (Missing WIDE1-X)");