From 3ba33bb696223f80aa72f55605df869aa7639d99 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Wed, 15 Nov 2023 01:26:29 -0300 Subject: [PATCH] small digirepeater improvement --- src/LoRa_APRS_Tracker.cpp | 2 +- src/ble_utils.cpp | 9 ++++++--- src/msg_utils.cpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index fe56b33..f6d8894 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -34,7 +34,7 @@ TinyGPSPlus gps; BluetoothSerial SerialBT; OneButton userButton = OneButton(BUTTON_PIN, true, true); -String versionDate = "2023.11.13"; +String versionDate = "2023.11.15"; int myBeaconsIndex = 0; int myBeaconsSize = Config.beacons.size(); diff --git a/src/ble_utils.cpp b/src/ble_utils.cpp index a3de727..95c2647 100644 --- a/src/ble_utils.cpp +++ b/src/ble_utils.cpp @@ -4,8 +4,9 @@ #include "display.h" #include "logger.h" -#define SERVICE_UUID "6ba1b218-15a8-461f-9fa8-5dcae273eafd" -#define CHARACTERISTIC_UUID "ed9da18c-a800-4f66-a670-aa7547e34453" + #define SERVICE_UUID "00000001-ba2a-46c9-ae49-01b0961f68bb" + #define CHARACTERISTIC_UUID "00000003-ba2a-46c9-ae49-01b0961f68bb" +//#define CHARACTERISTIC_UUID "00000002-ba2a-46c9-ae49-01b0961f68bb" NimBLEServer* pServer; NimBLECharacteristic* pCharacteristic; @@ -73,7 +74,9 @@ namespace BLE_Utils { NimBLEDevice::init("LoRa APRS Tracker"); NimBLEServer* pServer = NimBLEDevice::createServer(); 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()); pService->start(); diff --git a/src/msg_utils.cpp b/src/msg_utils.cpp index 75e9b62..8b69ad4 100644 --- a/src/msg_utils.cpp +++ b/src/msg_utils.cpp @@ -169,7 +169,7 @@ namespace MSG_Utils { //BLUETOOTH_Utils::sendPacket(packetReceived.substring(3)); BLE_Utils::sendToPhone(packetReceived.substring(3)); - if (digirepeaterActive) { + if (digirepeaterActive && aprsPacket.addressee!=currentBeacon->callsign) { String digiRepeatedPacket = APRSPacketLib::generateDigiRepeatedPacket(aprsPacket, currentBeacon->callsign); if (digiRepeatedPacket == "X") { logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "Packet won't be Repeated (Missing WIDE1-X)");