From 6e221a14494ba837f5aa5d8aa06bca0a163fe256 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Thu, 3 Oct 2024 21:09:14 -0300 Subject: [PATCH] aprsThursday changed --- src/keyboard_utils.cpp | 12 ++++++------ src/menu_utils.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/keyboard_utils.cpp b/src/keyboard_utils.cpp index 32ecb1e..869b97f 100644 --- a/src/keyboard_utils.cpp +++ b/src/keyboard_utils.cpp @@ -309,14 +309,14 @@ namespace KEYBOARD_Utils { menuDisplay = 1300; } else { displayShow(" APRS Thu.", "Sending:", "Happy #APRSThursday", "from LoRa Tracker 73!", "", "", 2000); - MSG_Utils::addToOutputBuffer(0, "ANSRVR", "CQ HOTG Happy #APRSThursday from LoRa Tracker 73!"); + MSG_Utils::addToOutputBuffer(0, "APRSPH" , "HOTG Happy #APRSThursday from LoRa Tracker 73!"); } } else if (menuDisplay == 131) { if (keyDetected) { menuDisplay = 1310; } else { displayShow(" APRS Thu.", "Sending:", "Happy #APRSThursday", "from LoRa Tracker 73!", "", "", 2000); - MSG_Utils::addToOutputBuffer(0, "APRSPH" , "HOTG Happy #APRSThursday from LoRa Tracker 73!"); + MSG_Utils::addToOutputBuffer(0, "ANSRVR", "CQ HOTG Happy #APRSThursday from LoRa Tracker 73!"); } } else if (menuDisplay == 132) { displayShow(" APRS Thu.", "", " Unsubscribe", " from APRS Thursday", "", "", 2000); @@ -538,12 +538,12 @@ namespace KEYBOARD_Utils { MSG_Utils::addToOutputBuffer(0, messageCallsign, messageText); menuDisplay = 11; } else if (menuDisplay == 1300) { - messageCallsign = "ANSRVR"; - MSG_Utils::addToOutputBuffer(0, messageCallsign, "CQ HOTG " + messageText); + messageCallsign = "APRSPH"; + MSG_Utils::addToOutputBuffer(0, messageCallsign, "HOTG " + messageText); menuDisplay = 130; } else if (menuDisplay == 1310) { - messageCallsign = "APRSPH"; - MSG_Utils::addToOutputBuffer(0, messageCallsign, "HOTG " + messageText); + messageCallsign = "ANSRVR"; + MSG_Utils::addToOutputBuffer(0, messageCallsign, "CQ HOTG " + messageText); menuDisplay = 131; } messageCallsign = ""; diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp index 49f1bc2..1e8a07a 100644 --- a/src/menu_utils.cpp +++ b/src/menu_utils.cpp @@ -162,7 +162,7 @@ namespace MENU_Utils { displayShow("_MESSAGES_", " Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", " Write", " Delete", "> APRSThursday", lastLine); break; case 130: // 1.Messages ---> APRSThursday ---> Delete: ALL - displayShow("APRS Thu._", "> Join APRSThursday", " Check In", " Unsubscribe", " KeepSubscribed+12h", lastLine); + displayShow("APRS Thu._", "> Check In", " Join", " Unsubscribe", " KeepSubscribed+12h", lastLine); break; case 1300: if (messageText.length() <= 67) { @@ -176,7 +176,7 @@ namespace MENU_Utils { } break; case 131: // 1.Messages ---> APRSThursday ---> Delete: ALL - displayShow("APRS Thu._", " Join APRSThursday", "> Check In", " Unsubscribe", " KeepSubscribed+12h", lastLine); + displayShow("APRS Thu._", " Check In", "> Join", " Unsubscribe", " KeepSubscribed+12h", lastLine); break; case 1310: if (messageText.length() <= 67) { @@ -190,10 +190,10 @@ namespace MENU_Utils { } break; case 132: // 1.Messages ---> APRSThursday ---> Delete: ALL - displayShow("APRS Thu._", " Join APRSThursday", " Check In", "> Unsubscribe", " KeepSubscribed+12h", lastLine); + displayShow("APRS Thu._", " Check In", " Join", "> Unsubscribe", " KeepSubscribed+12h", lastLine); break; case 133: // 1.Messages ---> APRSThursday ---> Delete: ALL - displayShow("APRS Thu._", " Join APRSThursday", " Check In", " Unsubscribe", "> KeepSubscribed+12h", lastLine); + displayShow("APRS Thu._", " Check In", " Join", " Unsubscribe", "> KeepSubscribed+12h", lastLine); break; //////////