diff --git a/lib/APRSPacketLib/APRSPacketLib.cpp b/lib/APRSPacketLib/APRSPacketLib.cpp index b48b76b5..b1201b80 100644 --- a/lib/APRSPacketLib/APRSPacketLib.cpp +++ b/lib/APRSPacketLib/APRSPacketLib.cpp @@ -626,18 +626,20 @@ namespace APRSPacketLib { } int encodedBytePosition = temp0.indexOf(gpsChar) + 14; aprsPacket.message = temp0.substring(temp0.indexOf(gpsChar) + 2); - if (String(temp0[encodedBytePosition]) == "G" || String(temp0[encodedBytePosition]) == "Q" || String(temp0[encodedBytePosition]) == "[" || String(temp0[encodedBytePosition]) == "H") { - aprsPacket.latitude = decodeEncodedLatitude(temp0.substring(temp0.indexOf(gpsChar) + 3, temp0.indexOf(gpsChar) + 7)); - aprsPacket.longitude = decodeEncodedLongitude(temp0.substring(temp0.indexOf(gpsChar) + 7, temp0.indexOf(gpsChar) + 11)); - aprsPacket.symbol = temp0.substring(temp0.indexOf(gpsChar) + 11, temp0.indexOf(gpsChar) + 12); - aprsPacket.overlay = temp0.substring(temp0.indexOf(gpsChar) + 2, temp0.indexOf(gpsChar) + 3); + char currentChar = temp0[encodedBytePosition]; + if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X') { + aprsPacket.latitude = decodeEncodedLatitude(temp0.substring(temp0.indexOf(gpsChar) + 3, temp0.indexOf(gpsChar) + 7)); + aprsPacket.longitude = decodeEncodedLongitude(temp0.substring(temp0.indexOf(gpsChar) + 7, temp0.indexOf(gpsChar) + 11)); + aprsPacket.symbol = temp0.substring(temp0.indexOf(gpsChar) + 11, temp0.indexOf(gpsChar) + 12); + aprsPacket.overlay = temp0.substring(temp0.indexOf(gpsChar) + 2, temp0.indexOf(gpsChar) + 3); + if (temp0.substring(temp0.indexOf(gpsChar) + 12, temp0.indexOf(gpsChar) + 13) == " ") { aprsPacket.course = 0; aprsPacket.speed = 0; aprsPacket.altitude = 0; } else { - if (String(temp0[encodedBytePosition]) == "Q") { // altitude csT - aprsPacket.altitude = decodeEncodedAltitude(temp0.substring(temp0.indexOf(gpsChar)+12, temp0.indexOf(gpsChar)+14)); + if (currentChar == 'Q') { // altitude csT + aprsPacket.altitude = decodeEncodedAltitude(temp0.substring(temp0.indexOf(gpsChar) + 12, temp0.indexOf(gpsChar) + 14)); aprsPacket.course = 0; aprsPacket.speed = 0; } else { // normal csT diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index fa51ad3a..c16a19e4 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -57,7 +57,7 @@ TinyGPSPlus gps; BluetoothSerial SerialBT; #endif -String versionDate = "2024.12.10"; +String versionDate = "2024.12.15"; uint8_t myBeaconsIndex = 0; int myBeaconsSize = Config.beacons.size(); diff --git a/src/display.cpp b/src/display.cpp index b4511dee..533a48f8 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -519,12 +519,14 @@ void displayShow(const String& header, const String& line1, const String& line2, #else display.setTextColor(SH110X_WHITE); #endif + display.drawLine(0, 16, 128, 16, WHITE); + display.drawLine(0, 17, 128, 17, WHITE); display.setTextSize(2); display.setCursor(0, 0); display.println(header); display.setTextSize(1); for (int i = 0; i < 5; i++) { - display.setCursor(0, 16 + (10 * i)); + display.setCursor(0, 20 + (9 * i)); display.println(*lines[i]); } #ifdef ssd1306 diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp index fb879327..00bc958c 100644 --- a/src/menu_utils.cpp +++ b/src/menu_utils.cpp @@ -132,27 +132,27 @@ namespace MENU_Utils { switch (menuDisplay) { // Graphic Menu is in here!!!! case 1: // 1. Messages - displayShow("__MENU____"," 6.Extras", "> 1.Messages", " 2.Configuration", " 3.Stations", lastLine); + displayShow("<< MENU >>"," 6.Extras", "> 1.Messages", " 2.Configuration", " 3.Stations", lastLine); break; case 2: // 2. Configuration - displayShow("__MENU____", " 1.Messages", "> 2.Configuration", " 3.Stations", " 4.Weather Report", lastLine); + displayShow("<< MENU >>", " 1.Messages", "> 2.Configuration", " 3.Stations", " 4.Weather Report", lastLine); break; case 3: //3. Stations - displayShow("__MENU____", " 2.Configuration", "> 3.Stations", " 4.Weather Report", " 5.Winlink/Mail", lastLine); + displayShow("<< MENU >>", " 2.Configuration", "> 3.Stations", " 4.Weather Report", " 5.Winlink/Mail", lastLine); break; case 4: //4. Weather - displayShow("__MENU____", " 3.Stations", "> 4.Weather Report", " 5.Winlink/Mail", " 6.Extras", lastLine); + displayShow("<< MENU >>", " 3.Stations", "> 4.Weather Report", " 5.Winlink/Mail", " 6.Extras", lastLine); break; case 5: //5. Winlink - displayShow("__MENU____", " 4.Weather Report", "> 5.Winlink/Mail", " 6.Extras", " 1.Messages", lastLine); + displayShow("<< MENU >>", " 4.Weather Report", "> 5.Winlink/Mail", " 6.Extras", " 1.Messages", lastLine); break; case 6: //6. Extras - displayShow("__MENU____", " 5.Winlink/Mail", "> 6.Extras", " 1.Messages", " 2.Configuration", lastLine); + displayShow("<< MENU >>", " 5.Winlink/Mail", "> 6.Extras", " 1.Messages", " 2.Configuration", lastLine); break; ////////// case 10: // 1.Messages ---> Messages Read - displayShow("_MESSAGES_", "> Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", " Write", " Delete", " APRSThursday", lastLine); + displayShow("MESSAGES>", "> Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", " Write", " Delete", " APRSThursday", lastLine); break; case 100: // 1.Messages ---> Messages Read ---> Display Received/Saved APRS Messages { @@ -162,104 +162,104 @@ namespace MENU_Utils { #ifdef HAS_TFT displayMessage(msgSender, msgText, 26, true); #else - displayShow("MSG_APRS>", "From --> " + msgSender, msgText, "", "", " Next=Down"); + displayShow("MSG APRS>", "From --> " + msgSender, msgText, "", "", " Next=Down"); #endif } break; case 11: // 1.Messages ---> Messages Write - displayShow("_MESSAGES_", " Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", "> Write", " Delete", " APRSThursday", lastLine); + displayShow("MESSAGES>", " Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", "> Write", " Delete", " APRSThursday", lastLine); break; case 110: // 1.Messages ---> Messages Write ---> Write if (keyDetected) { - displayShow("WRITE_MSG>", "", "CALLSIGN = " + String(messageCallsign), "", "", ""); + displayShow("WRITE MSG>", "", "CALLSIGN = " + String(messageCallsign), "", "", ""); } else { - displayShow("WRITE_MSG>", "", "No Keyboard Detected", "Can't write Message", "", "1P = Back"); + displayShow("WRITE MSG>", "", "No Keyboard Detected", "Can't write Message", "", "1P = Back"); } break; case 111: if (messageText.length() <= 67) { if (messageText.length() < 10) { - displayShow("WRITE_MSG>", "CALLSIGN -> " + messageCallsign, "MSG -> " + messageText, "", "", ""); + displayShow("WRITE MSG>", "CALLSIGN -> " + messageCallsign, "MSG -> " + messageText, "", "", ""); } else { - displayShow("WRITE_MSG>", "CALLSIGN -> " + messageCallsign, "MSG -> " + messageText, "", "", ""); + displayShow("WRITE MSG>", "CALLSIGN -> " + messageCallsign, "MSG -> " + messageText, "", "", ""); } } else { - displayShow("WRITE_MSG>", "--- MSG TO LONG! ---", " -> " + messageText, "", "", "", "--- MSG TO LONG! ---", " -> " + messageText, "", "", " Messages Delete - displayShow("_MESSAGES_", " Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", " Write", "> Delete", " APRSThursday", lastLine); + displayShow("MESSAGES>", " Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", " Write", "> Delete", " APRSThursday", lastLine); break; case 120: // 1.Messages ---> Messages Delete ---> Delete: ALL - displayShow("DELETE_MSG", "", " DELETE APRS MSG?", "", "", " Confirm = LP or '>'"); + displayShow("DELETE MSG", "", " DELETE APRS MSG?", "", "", " Confirm = LP or '>'"); break; case 13: // 1.Messages ---> APRSThursday - displayShow("_MESSAGES_", " Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", " Write", " Delete", "> APRSThursday", lastLine); + displayShow("MESSAGES>", " Read (" + String(MSG_Utils::getNumAPRSMessages()) + ")", " Write", " Delete", "> APRSThursday", lastLine); break; case 130: // 1.Messages ---> APRSThursday ---> Delete: ALL - displayShow("APRS Thu._", "> Check In", " Join", " Unsubscribe", " KeepSubscribed+12h", lastLine); + displayShow("APRS Thu.", "> Check In", " Join", " Unsubscribe", " KeepSubscribed+12h", lastLine); break; case 1300: if (messageText.length() <= 67) { if (messageText.length() < 10) { - displayShow("WRITE_MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); + displayShow("WRITE MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); } else { - displayShow("WRITE_MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); + displayShow("WRITE MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); } } else { - displayShow("WRITE_MSG>", "--- MSG TO LONG! ---", " -> " + messageText, "", "", "", "--- MSG TO LONG! ---", " -> " + messageText, "", "", " APRSThursday ---> Delete: ALL - displayShow("APRS Thu._", " Check In", "> Join", " Unsubscribe", " KeepSubscribed+12h", lastLine); + displayShow("APRS Thu.", " Check In", "> Join", " Unsubscribe", " KeepSubscribed+12h", lastLine); break; case 1310: if (messageText.length() <= 67) { if (messageText.length() < 10) { - displayShow("WRITE_MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); + displayShow("WRITE MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); } else { - displayShow("WRITE_MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); + displayShow("WRITE MSG>", " - APRSThursday -", "MSG -> " + messageText, "", "", ""); } } else { - displayShow("WRITE_MSG>", "--- MSG TO LONG! ---", " -> " + messageText, "", "", "", "--- MSG TO LONG! ---", " -> " + messageText, "", "", " APRSThursday ---> Delete: ALL - displayShow("APRS Thu._", " Check In", " Join", "> 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._", " Check In", " Join", " Unsubscribe", "> KeepSubscribed+12h", lastLine); + displayShow("APRS Thu.", " Check In", " Join", " Unsubscribe", "> KeepSubscribed+12h", lastLine); break; ////////// case 20: // 2.Configuration ---> Callsign - displayShow("_CONFIG___", " Power Off", "> Change Callsign ", " Change Frequency", " Display",lastLine); + displayShow(" CONFIG>", " Power Off", "> Change Callsign ", " Change Frequency", " Display",lastLine); break; case 21: // 2.Configuration ---> Change Freq - displayShow("_CONFIG___", " Change Callsign ", "> Change Frequency", " Display", " " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")",lastLine); + displayShow(" CONFIG>", " Change Callsign ", "> Change Frequency", " Display", " " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")",lastLine); break; case 22: // 2.Configuration ---> Display - displayShow("_CONFIG___", " Change Frequency", "> Display", " " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")", " Status",lastLine); + displayShow(" CONFIG>", " Change Frequency", "> Display", " " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")", " Status",lastLine); break; case 23: // 2.Configuration ---> Bluetooth - displayShow("_CONFIG___", " Display", "> " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")", " Status", " Notifications", lastLine); + displayShow(" CONFIG>", " Display", "> " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")", " Status", " Notifications", lastLine); break; case 24: // 2.Configuration ---> Status - displayShow("_CONFIG___", " " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")", "> Status"," Notifications", " Reboot",lastLine); + displayShow(" CONFIG>", " " + checkBTType() + " (" + checkProcessActive(bluetoothActive) + ")", "> Status"," Notifications", " Reboot",lastLine); break; case 25: // 2.Configuration ---> Notifications - displayShow("_CONFIG___", " Status", "> Notifications", " Reboot", " Power Off",lastLine); + displayShow(" CONFIG>", " Status", "> Notifications", " Reboot", " Power Off",lastLine); break; case 26: // 2.Configuration ---> Reboot - displayShow("_CONFIG___", " Notifications", "> Reboot", " Power Off", " Change Callsign",lastLine); + displayShow(" CONFIG>", " Notifications", "> Reboot", " Power Off", " Change Callsign",lastLine); break; case 27: // 2.Configuration ---> Power Off - displayShow("_CONFIG___", " Reboot", "> Power Off", " Change Callsign", " Change Frequency",lastLine); + displayShow(" CONFIG>", " Reboot", "> Power Off", " Change Callsign", " Change Frequency",lastLine); break; case 200: // 2.Configuration ---> Change Callsign - displayShow("_CALLSIGN_", ""," Confirm Change?","","",""); + displayShow("CALLSIGN>", ""," Confirm Change?","","",""); break; case 210: // 2.Configuration ---> Change Frequency @@ -268,50 +268,50 @@ namespace MENU_Utils { case 1: freqChangeWarning = " PL --> UK"; break; case 2: freqChangeWarning = " UK --> Eu"; break; } - displayShow("LORA__FREQ", ""," Confirm Change?", freqChangeWarning, "", ""); + displayShow("LORA FREQ>", ""," Confirm Change?", freqChangeWarning, "", ""); break; case 220: // 2.Configuration ---> Display ---> ECO Mode - displayShow("_DISPLAY__", "", "> ECO Mode (" + checkProcessActive(displayEcoMode) + ")"," Brightness (" + screenBrightnessAsString(screenBrightness) + ")","",lastLine); + displayShow(" DISPLAY>", "", "> ECO Mode (" + checkProcessActive(displayEcoMode) + ")"," Brightness (" + screenBrightnessAsString(screenBrightness) + ")","",lastLine); break; case 221: // 2.Configuration ---> Display ---> Brightness - displayShow("_DISPLAY__", "", " ECO Mode (" + checkProcessActive(displayEcoMode) + ")","> Brightness (" + screenBrightnessAsString(screenBrightness) + ")","",lastLine); + displayShow(" DISPLAY>", "", " ECO Mode (" + checkProcessActive(displayEcoMode) + ")","> Brightness (" + screenBrightnessAsString(screenBrightness) + ")","",lastLine); break; case 230: if (bluetoothActive) { bluetoothActive = false; - displayShow("BLUETOOTH", "", " Bluetooth --> OFF", 1000); + displayShow("BLUETOOTH>", "", " Bluetooth --> OFF", 1000); } else { bluetoothActive = true; - displayShow("BLUETOOTH", "", " Bluetooth --> ON", 1000); + displayShow("BLUETOOTH>", "", " Bluetooth --> ON", 1000); } menuDisplay = 23; break; case 240: // 2.Configuration ---> Status - displayShow("_STATUS___", "", "> Write"," Select","",lastLine); + displayShow(" STATUS>", "", "> Write"," Select","",lastLine); break; case 241: // 2.Configuration ---> Status - displayShow("_STATUS___", "", " Write","> Select","",lastLine); + displayShow(" STATUS>", "", " Write","> Select","",lastLine); break; case 250: // 2.Configuration ---> Notifications - displayShow("_NOTIFIC__", "> Turn Off Sound/Led","","","",lastLine); + displayShow(" NOTIFIC>", "> Turn Off Sound/Led","","","",lastLine); break; case 260: // 2.Configuration ---> Reboot if (keyDetected) { - displayShow("_REBOOT?__", "","Confirm Reboot...","",""," Power Off if (keyDetected) { - displayShow("POWER_OFF?", "","Confirm Power Off...","","","", "> Login" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", " Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); + displayShow(" WINLINK>", "> Login" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", " Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); } break; case 51: // 5.Winlink - displayShow("_WINLINK_>", " Login" , "> Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", " Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); + displayShow(" WINLINK>", " Login" , "> Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", " Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); break; case 52: // 5.Winlink - displayShow("_WINLINK_>", " Login" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", "> Delete SavedMails", " Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); + displayShow(" WINLINK>", " Login" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", "> Delete SavedMails", " Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); break; case 53: // 5.Winlink - displayShow("_WINLINK_>", " Login" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", "> Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); + displayShow(" WINLINK>", " Login" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", "> Wnlk Comment (" + checkProcessActive(winlinkCommentState) + ")" , lastLine); break; case 500: // 5.Winlink ---> Login - displayShow("_WINLINK_>", "" , "Login Initiation ...", "Challenge -> waiting", "" , ""); + displayShow(" WINLINK>", "" , "Login Initiation ...", "Challenge -> waiting", "" , ""); break; case 501: // 5.Winlink ---> Login - displayShow("_WINLINK_>", "" , "Login Initiation ...", "Challenge -> sended", "" , ""); + displayShow(" WINLINK>", "" , "Login Initiation ...", "Challenge -> sended", "" , ""); break; case 502: // 5.Winlink ---> Login - displayShow("_WINLINK_>", "" , "Login Initiation ...", "Challenge -> ack ...", "" , ""); + displayShow(" WINLINK>", "" , "Login Initiation ...", "Challenge -> ack ...", "" , ""); break; case 5000: // WINLINK: List Pend. Mail // - displayShow("WLNK__MENU", " Write Mail" , "> List Pend. Mails", " Downloaded Mails", " Read Mail (R#)", lastLine); + displayShow("WLNK MENU>", " Write Mail" , "> List Pend. Mails", " Downloaded Mails", " Read Mail (R#)", lastLine); break; case 5010: // WINLINK: Downloaded Mails // - displayShow("WLNK__MENU", " List Pend. Mails", "> Downloaded Mails", " Read Mail (R#)", " Reply Mail (Y#)", lastLine); + displayShow("WLNK MENU>", " List Pend. Mails", "> Downloaded Mails", " Read Mail (R#)", " Reply Mail (Y#)", lastLine); break; case 50100: // WINLINK: Downloaded Mails // - displayShow("_WINLINK_>", "" , "> Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", "" , lastLine); + displayShow(" WINLINK>", "" , "> Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", " Delete SavedMails", "" , lastLine); break; case 50101: // WINLINK: Downloaded Mails // { String mailText = loadedWLNKMails[messagesIterator]; - displayShow("WLNK__MAIL", "", mailText, "", "", " Next=Down"); + displayShow("WLNK MAIL>", "", mailText, "", "", " Next=Down"); } break; case 50110: // WINLINK: Downloaded Mails // - displayShow("_WINLINK_>", "" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", "> Delete SavedMails", "" , lastLine); + displayShow(" WINLINK>", "" , " Read SavedMails(" + String(MSG_Utils::getNumWLNKMails()) + ")", "> Delete SavedMails", "" , lastLine); break; case 50111: // WINLINK: Downloaded Mails // - displayShow("WLNK__DEL", "", " DELETE ALL MAILS?", "", "", " Confirm = LP or '>'"); + displayShow("WLNK DEL>", "", " DELETE ALL MAILS?", "", "", " Confirm = LP or '>'"); break; case 5020: // WINLINK: Read Mail // - displayShow("WLNK__MENU", " Downloaded Mails", "> Read Mail (R#)", " Reply Mail (Y#)", " Forward Mail (F#)", lastLine); + displayShow("WLNK MENU>", " Downloaded Mails", "> Read Mail (R#)", " Reply Mail (Y#)", " Forward Mail (F#)", lastLine); break; case 5021: - displayShow("WLNK__READ", "", " READ MAIL N." + winlinkMailNumber, "", "", ""); + displayShow("WLNK READ>", "", " READ MAIL N." + winlinkMailNumber, "", "", ""); break; case 5030: // WINLINK: Reply Mail // - displayShow("WLNK__MENU", " Read Mail (R#)", "> Reply Mail (Y#)", " Forward Mail (F#)", " Delete Mail (K#)", lastLine); + displayShow("WLNK MENU>", " Read Mail (R#)", "> Reply Mail (Y#)", " Forward Mail (F#)", " Delete Mail (K#)", lastLine); break; case 5031: - displayShow("WLNK_REPLY", "", " REPLY MAIL N." + winlinkMailNumber , "", "", ""); + displayShow("WLNK REPLY", "", " REPLY MAIL N." + winlinkMailNumber , "", "", ""); break; case 5040: // WINLINK: Foward Mail // - displayShow("WLNK__MENU", " Reply Mail (Y#)", "> Forward Mail (F#)", " Delete Mail (K#)", " Alias Menu", lastLine); + displayShow("WLNK MENU>", " Reply Mail (Y#)", "> Forward Mail (F#)", " Delete Mail (K#)", " Alias Menu", lastLine); break; case 5041: // WINLINK: Forward Mail // - displayShow("WLNK__FORW", "", " FORWARD MAIL N." + winlinkMailNumber , "", "", ""); + displayShow("WLNK FORW>", "", " FORWARD MAIL N." + winlinkMailNumber , "", "", ""); break; case 5042: // WINLINK: Forward Mail // - displayShow("WLNK_FORW_", " FORWARD MAIL N." + winlinkMailNumber , "To = " + winlinkAddressee, "", "", ""); + displayShow("WLNK FORW>", " FORWARD MAIL N." + winlinkMailNumber , "To = " + winlinkAddressee, "", "", ""); break; case 5050: // WINLINK: Delete Mail // - displayShow("WLNK__MENU", " Forward Mail (F#)", "> Delete Mail (K#)", " Alias Menu", " Log Out", lastLine); + displayShow("WLNK MENU>", " Forward Mail (F#)", "> Delete Mail (K#)", " Alias Menu", " Log Out", lastLine); break; case 5051: // WINLINK: Delete Mail // - displayShow("WLNK___DEL", "", " DELETE MAIL N." + winlinkMailNumber, "", "", ""); + displayShow("WLNK DEL>", "", " DELETE MAIL N." + winlinkMailNumber, "", "", ""); break; case 5060: // WINLINK: Alias Menu // - displayShow("WLNK__MENU", " Delete Mail (K#)", "> Alias Menu", " Log Out", " Write Mail", lastLine); + displayShow("WLNK MENU>", " Delete Mail (K#)", "> Alias Menu", " Log Out", " Write Mail", lastLine); break; case 5061: // WINLINK: Alias Menu : Create Alias // - displayShow("WLNK_ALIAS", "> Create Alias" , " Delete Alias ", " List All Alias", "", lastLine); + displayShow("WLNK ALIAS", "> Create Alias" , " Delete Alias ", " List All Alias", "", lastLine); break; case 50610: // WINLINK: Alias Menu : Create Alias // - displayShow("WLNK_ALIAS", "", "Write Alias to Create", " -> " + winlinkAlias, "", ""); + displayShow("WLNK ALIAS", "", "Write Alias to Create", " -> " + winlinkAlias, "", ""); break; case 50611: // WINLINK: Alias Menu : Create Alias // - displayShow("WLNK_ALIAS", "", " " + winlinkAlias + " =", winlinkAliasComplete, "", ""); + displayShow("WLNK ALIAS", "", " " + winlinkAlias + " =", winlinkAliasComplete, "", ""); break; case 5062: // WINLINK: Alias Menu : Delete Alias // - displayShow("WLNK_ALIAS", " Create Alias" , "> Delete Alias ", " List All Alias", "", lastLine); + displayShow("WLNK ALIAS", " Create Alias" , "> Delete Alias ", " List All Alias", "", lastLine); break; case 50620: // WINLINK: Alias Menu : Delete Alias // - displayShow("WLNK_ALIAS", "Write Alias to Delete", "", " -> " + winlinkAlias, "", ""); + displayShow("WLNK ALIAS", "Write Alias to Delete", "", " -> " + winlinkAlias, "", ""); break; case 5063: // WINLINK: Alias Menu : List Alias// - displayShow("WLNK_ALIAS", " Create Alias" , " Delete Alias ", "> List All Alias", "", lastLine); + displayShow("WLNK ALIAS", " Create Alias" , " Delete Alias ", "> List All Alias", "", lastLine); break; case 5070: // WINLINK: Log Out MAIL // - displayShow("WLNK__MENU", " Alias Menu", "> Log Out", " Write Mail", " List Pend. Mails", lastLine); + displayShow("WLNK MENU>", " Alias Menu", "> Log Out", " Write Mail", " List Pend. Mails", lastLine); break; case 5080: // WINLINK: WRITE MAIL // - displayShow("WLNK__MENU", " Log Out", "> Write Mail", " List Pend. Mails", " Downloaded Mails", lastLine); + displayShow("WLNK MENU>", " Log Out", "> Write Mail", " List Pend. Mails", " Downloaded Mails", lastLine); break; case 5081: // WINLINK: WRITE MAIL: Addressee // - displayShow("WLNK__MAIL", "--- Send Mail to ---", "", "-> " + winlinkAddressee, "", ""); + displayShow("WLNK MAIL>", "--- Send Mail to ---", "", "-> " + winlinkAddressee, "", ""); break; case 5082: // WINLINK: WRITE MAIL: Subject // - displayShow("WLNK__MAIL", "--- Write Subject ---", "", "-> " + winlinkSubject, "", ""); + displayShow("WLNK MAIL>", "--- Write Subject ---", "", "-> " + winlinkSubject, "", ""); break; case 5083: // WINLINK: WRITE MAIL: Body // if (winlinkBody.length() <= 67) { - displayShow("WLNK__MAIL", "-- Body (lenght=" + String(winlinkBody.length()) + ")", "-> " + winlinkBody, "", "", ""); + displayShow("WLNK MAIL>", "-- Body (lenght=" + String(winlinkBody.length()) + ")", "-> " + winlinkBody, "", "", ""); } else { - displayShow("WLNK__MAIL", "-- Body To Long = " + String(winlinkBody.length()) + "!", "-> " + winlinkBody, "", "", "", "-- Body To Long = " + String(winlinkBody.length()) + "!", "-> " + winlinkBody, "", "", " End Mail", " 1 More Line", "", " Up/Down Select>"); + displayShow("WLNK MAIL>", "", "> End Mail", " 1 More Line", "", " Up/Down Select>"); break; case 5085: // WINLINK: WRITE MAIL: One More Line(Body) // - displayShow("WLNK__MAIL", "", " End Mail", "> 1 More Line", "", " Up/Down Select>"); + displayShow("WLNK MAIL>", "", " End Mail", "> 1 More Line", "", " Up/Down Select>"); break; // validar winlinkStatus = 0 @@ -517,35 +517,35 @@ namespace MENU_Utils { ////////// case 60: // 6. Extras ---> Flashlight - displayShow("__EXTRAS__", "> Flashlight (" + checkProcessActive(flashlight) + ")", " Digipeater (" + checkProcessActive(digipeaterActive) + ")", " 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 ---> Digipeater - displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", "> Digipeater (" + checkProcessActive(digipeaterActive) + ")", " 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 62: // 6. Extras ---> S.O.S. - displayShow("__EXTRAS__", " Flashlight (" + checkProcessActive(flashlight) + ")", " Digipeater (" + checkProcessActive(digipeaterActive) + ")", "> 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) + ")", " Digipeater (" + checkProcessActive(digipeaterActive) + ")", " 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) { if (messageText.length() < 10) { - displayShow("_COMMENT_>", "Send this Comment in","the next GPS Beacon :", messageText, "", ""); + displayShow(" COMMENT>", "Send this Comment in","the next GPS Beacon :", messageText, "", ""); } else { - displayShow("_COMMENT_>", "Send this Comment in","the next GPS Beacon :", messageText, "", ""); + displayShow(" COMMENT>", "Send this Comment in","the next GPS Beacon :", messageText, "", ""); } } else { - displayShow("_COMMENT_>", " Comment is to long! ", " -> " + messageText, "", "", "", " Comment is to long! ", " -> " + messageText, "", "", " Turn ON WiFi AP - displayShow("__CONFIG__", "> Turn Tracker Off"," Config. WiFi AP", "","",lastLine); + displayShow(" CONFIG>", "> Turn Tracker Off"," Config. WiFi AP", "","",lastLine); break; case 9001: // 9. multiPress Menu - displayShow("__CONFIG__", " Turn Tracker Off","> Config. WiFi AP", "","",lastLine); + displayShow(" CONFIG>", " Turn Tracker Off","> Config. WiFi AP", "","",lastLine); break;