diff --git a/README.md b/README.md index f546e8d..4c1a2ad 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ ____________________________________________________ - 2023.12.06 T-Beam V1.2 as default board. - 2023.12.05 Updated packets recognition (+Objects + Mic-E). - 2023.11.28 Adding BLE connection to use it as TNC with APRS.fi app for iOS. -- 2023.11.07 DigiRepeater Mode added in Emergency Menu. +- 2023.11.07 Digipeater Mode added in Emergency Menu. - 2023.10.23 COMPLETE New Menu for Keyboard add-on. - 2023.10.22 Added Keyboard Support over I2C ( CARDKB from https://m5stack.com ) - 2023.10.07 Screen Brightness control added. diff --git a/data_embed/script.js b/data_embed/script.js index 843b42e..e75973e 100644 --- a/data_embed/script.js +++ b/data_embed/script.js @@ -281,8 +281,6 @@ document.getElementById('reboot').addEventListener('click', function (e) { //const bmeCheckbox = document.querySelector("input[name='bme.active']"); -const stationModeSelect = document.querySelector("select[name='stationMode']"); - function toggleFields() { /* // Display - timeout box enable diff --git a/lib/APRSPacketLib/APRSPacketLib.cpp b/lib/APRSPacketLib/APRSPacketLib.cpp index e207788..b48b76b 100644 --- a/lib/APRSPacketLib/APRSPacketLib.cpp +++ b/lib/APRSPacketLib/APRSPacketLib.cpp @@ -267,7 +267,7 @@ namespace APRSPacketLib { return packetToRepeat; } - String generateDigiRepeatedPacket(const String& packet, const String &callsign, const String& path) { + String generateDigipeatedPacket(const String& packet, const String &callsign, const String& path) { bool thirdParty = false; int firstColonIndex = packet.indexOf(":"); diff --git a/lib/APRSPacketLib/APRSPacketLib.h b/lib/APRSPacketLib/APRSPacketLib.h index bb9ef07..dcc2639 100644 --- a/lib/APRSPacketLib/APRSPacketLib.h +++ b/lib/APRSPacketLib/APRSPacketLib.h @@ -58,7 +58,7 @@ namespace APRSPacketLib { String generateMessagePacket(const String& callsign, const String& tocall, const String& path, const String& addressee, const String& message); String buildDigiPacket(const String& packet, const String& callsign, const String& path, bool thirdParty); - String generateDigiRepeatedPacket(const String& packet, const String &callsign, const String& path); + String generateDigipeatedPacket(const String& packet, const String &callsign, const String& path); char *ax25_base91enc(char *s, uint8_t n, uint32_t v); String encodeGPS(float latitude, float longitude, float course, float speed, const String& symbol, bool sendAltitude, int altitude, bool sendStandingUpdate, const String& packetType); diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index 09935cd..2bcfb9f 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -56,7 +56,7 @@ TinyGPSPlus gps; OneButton userButton = OneButton(BUTTON_PIN, true, true); #endif -String versionDate = "2024.10.30"; +String versionDate = "2024.11.06"; uint8_t myBeaconsIndex = 0; int myBeaconsSize = Config.beacons.size(); @@ -88,7 +88,7 @@ double lastTxDistance = 0.0; uint32_t menuTime = millis(); bool flashlight = false; -bool digirepeaterActive = false; +bool digipeaterActive = false; bool sosActive = false; bool miceActive = false; diff --git a/src/keyboard_utils.cpp b/src/keyboard_utils.cpp index a251bef..ab4535c 100644 --- a/src/keyboard_utils.cpp +++ b/src/keyboard_utils.cpp @@ -41,7 +41,7 @@ extern String messageCallsign; extern String messageText; extern bool sendStandingUpdate; extern bool flashlight; -extern bool digirepeaterActive; +extern bool digipeaterActive; extern bool sosActive; extern uint8_t winlinkStatus; extern String winlinkMailNumber; @@ -452,14 +452,14 @@ namespace KEYBOARD_Utils { displayShow("__EXTRAS__", ""," Flashlight","NOT ACTIVE IN CONFIG!", "", "", 2000); } } else if (menuDisplay == 61) { - if (digirepeaterActive) { - displayShow("__EXTRAS__", ""," DigiRepeater"," Status --> OFF", "", "", 2000); - logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "DigiRepeater OFF"); - digirepeaterActive = false; + if (digipeaterActive) { + displayShow("__EXTRAS__", ""," Digipeater"," Status --> OFF", "", "", 2000); + logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "Digipeater OFF"); + digipeaterActive = false; } else { - displayShow("__EXTRAS__", ""," DigiRepeater"," Status --> ON","", "", 2000); - logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "DigiRepeater ON"); - digirepeaterActive = true; + displayShow("__EXTRAS__", ""," Digipeater"," Status --> ON","", "", 2000); + logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "Digipeater ON"); + digipeaterActive = true; } } else if (menuDisplay == 62) { if (sosActive) { diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp index 71581e0..33bbdef 100644 --- a/src/menu_utils.cpp +++ b/src/menu_utils.cpp @@ -28,7 +28,7 @@ extern bool keyDetected; extern String messageCallsign; extern String messageText; extern bool flashlight; -extern bool digirepeaterActive; +extern bool digipeaterActive; extern bool sosActive; extern bool bluetoothActive; extern bool displayEcoMode; @@ -482,16 +482,16 @@ namespace MENU_Utils { ////////// case 60: // 6. Extras ---> Flashlight - displayShow("__EXTRAS__", "> Flashlight (" + checkProcessActive(flashlight) + ")", " DigiRepeater (" + checkProcessActive(digirepeaterActive) + ")", " S.O.S. (" + checkProcessActive(sosActive) + ")"," Send GPS + Comment",lastLine); + displayShow("__EXTRAS__", "> Flashlight (" + checkProcessActive(flashlight) + ")", " Digipeater (" + checkProcessActive(digipeaterActive) + ")", " S.O.S. (" + checkProcessActive(sosActive) + ")"," Send GPS + Comment",lastLine); break; - case 61: // 6. Extras ---> Digirepeater - displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", "> DigiRepeater (" + checkProcessActive(digirepeaterActive) + ")", " S.O.S. (" + checkProcessActive(sosActive) + ")"," Send GPS + Comment",lastLine); + case 61: // 6. Extras ---> Digipeater + displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", "> Digipeater (" + checkProcessActive(digipeaterActive) + ")", " S.O.S. (" + checkProcessActive(sosActive) + ")"," Send GPS + Comment",lastLine); break; case 62: // 6. Extras ---> S.O.S. - displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", " DigiRepeater (" + checkProcessActive(digirepeaterActive) + ")", "> S.O.S. (" + checkProcessActive(sosActive) + ")"," Send GPS + Comment",lastLine); + displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", " Digipeater (" + checkProcessActive(digipeaterActive) + ")", "> S.O.S. (" + checkProcessActive(sosActive) + ")"," Send GPS + Comment",lastLine); break; case 63: // 6. Extras ---> Extra Comment. - displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", " DigiRepeater (" + checkProcessActive(digirepeaterActive) + ")", " S.O.S. (" + checkProcessActive(sosActive) + ")","> Send GPS + Comment",lastLine); + displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", " Digipeater (" + checkProcessActive(digipeaterActive) + ")", " S.O.S. (" + checkProcessActive(sosActive) + ")","> Send GPS + Comment",lastLine); break; case 630: if (messageText.length() <= 67) { diff --git a/src/msg_utils.cpp b/src/msg_utils.cpp index 7c34187..fc7821c 100644 --- a/src/msg_utils.cpp +++ b/src/msg_utils.cpp @@ -22,7 +22,7 @@ extern uint32_t menuTime; extern bool messageLed; extern uint32_t messageLedTime; -extern bool digirepeaterActive; +extern bool digipeaterActive; extern int ackRequestNumber; @@ -418,13 +418,13 @@ namespace MSG_Utils { if (check25SegBuffer(lastReceivedPacket.sender, lastReceivedPacket.message)) { - if (digirepeaterActive && lastReceivedPacket.addressee != currentBeacon->callsign) { - String digiRepeatedPacket = APRSPacketLib::generateDigiRepeatedPacket(packet.text, currentBeacon->callsign, Config.path); - if (digiRepeatedPacket == "X") { + if (digipeaterActive && lastReceivedPacket.addressee != currentBeacon->callsign) { + String digipeatedPacket = APRSPacketLib::generateDigipeatedPacket(packet.text, currentBeacon->callsign, Config.path); + if (digipeatedPacket == "X") { logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "%s", "Packet won't be Repeated (Missing WIDEn-N)"); } else { delay(500); - LoRa_Utils::sendNewPacket(digiRepeatedPacket); + LoRa_Utils::sendNewPacket(digipeatedPacket); } } lastHeardTracker = lastReceivedPacket.sender; @@ -541,7 +541,7 @@ namespace MSG_Utils { if ((lastReceivedPacket.type == 0 || lastReceivedPacket.type == 4) && !Config.simplifiedTrackerMode) { GPS_Utils::calculateDistanceCourse(lastReceivedPacket.sender, lastReceivedPacket.latitude, lastReceivedPacket.longitude); } - if (Config.notification.buzzerActive && Config.notification.stationBeep && !digirepeaterActive) { + if (Config.notification.buzzerActive && Config.notification.stationBeep && !digipeaterActive) { NOTIFICATION_Utils::stationHeardBeep(); } } diff --git a/src/notification_utils.cpp b/src/notification_utils.cpp index c09a2db..2979fec 100644 --- a/src/notification_utils.cpp +++ b/src/notification_utils.cpp @@ -12,7 +12,7 @@ int shutDownSound[] = {1720, 880, 400}; uint8_t shutDownSoundDuration[] = {60, 60, 200}; extern Configuration Config; -extern bool digirepeaterActive; +extern bool digipeaterActive; namespace NOTIFICATION_Utils { @@ -28,7 +28,7 @@ namespace NOTIFICATION_Utils { void beaconTxBeep() { digitalWrite(Config.notification.buzzerPinVcc, HIGH); playTone(1320,100); - if (digirepeaterActive) { + if (digipeaterActive) { playTone(1560,100); } digitalWrite(Config.notification.buzzerPinVcc, LOW);