From d0eccf3e5f7b7bcc23eb3d24cfc5ddba04733b5c Mon Sep 17 00:00:00 2001 From: richonguzman Date: Mon, 19 Jun 2023 01:39:20 -0400 Subject: [PATCH] updated screen size --- src/LoRa_APRS_iGate.cpp | 2 +- src/aprs_is_utils.cpp | 11 ++++++++--- src/lora_utils.cpp | 2 +- src/utils.cpp | 9 ++++----- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 91b1aca..fa50409 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -20,7 +20,7 @@ Configuration Config; WiFiClient espClient; -String versionDate = "2023.06.18"; +String versionDate = "2023.06.19"; int myWiFiAPIndex = 0; int myWiFiAPSize = Config.wifiAPs.size(); WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex]; diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp index 4b1c309..d511294 100644 --- a/src/aprs_is_utils.cpp +++ b/src/aprs_is_utils.cpp @@ -171,8 +171,13 @@ void processAPRSISPacket(String packet) { lastScreenOn = millis(); delay(500); espClient.write(queryAnswer.c_str()); - sixthLine = "Callsign = " + Sender; - seventhLine = "TYPE --> QUERY"; + fifthLine = "APRS-IS ----> APRS-IS"; + sixthLine = Config.callsign; + for (int j=sixthLine.length();j<9;j++) { + sixthLine += " "; + } + sixthLine += "> " + Sender; + seventhLine = "QUERY = " + receivedMessage; } } else { Serial.print("Received from APRS-IS : " + packet); @@ -181,9 +186,9 @@ void processAPRSISPacket(String packet) { display_toggle(true); lastScreenOn = millis(); Utils::typeOfPacket(packet, "APRS-LoRa"); - show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0); } } + show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0); } } } diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index 523970c..b5e40ef 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -30,7 +30,7 @@ void setup() { LoRa.setCodingRate4(Config.loramodule.codingRate4); LoRa.enableCrc(); LoRa.setTxPower(Config.loramodule.power); - Serial.println("init : LoRa Module ... done!"); + Serial.print("init : LoRa Module ... done!"); } void sendNewPacket(const String &typeOfMessage, const String &newPacket) { diff --git a/src/utils.cpp b/src/utils.cpp index ba473c9..821c9af 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -136,9 +136,9 @@ void checkBeaconInterval() { beacon_update = false; } - /*if (statusAfterBoot) { + if (statusAfterBoot) { processStatus(); - }*/ + } } void checkDisplayInterval() { @@ -181,10 +181,9 @@ void typeOfPacket(String packet, String packetType) { String addresseeAndMessage = packet.substring(packet.indexOf("::")+2); String addressee = addresseeAndMessage.substring(0, addresseeAndMessage.indexOf(":")); addressee.trim(); - seventhLine = sender + " > " + addressee; - Serial.println("mensaje desde " + seventhLine); + sixthLine = sender + " > " + addressee; } else { - seventhLine = sender + "> MESSAGE"; + sixthLine = sender + "> MESSAGE"; } seventhLine = "RSSI: 38dBm SNR: 6dBm"; } else if (packet.indexOf(":>") >= 10) {