From 8f9a0c8d3c9ba237c10284278dc9016715932806 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Sun, 4 Feb 2024 10:17:45 -0300
Subject: [PATCH] login successfull

---
 lib/APRSPacketLib/APRSPacketLib.cpp |  9 ++++-----
 src/keyboard_utils.cpp              |  4 ----
 src/menu_utils.cpp                  |  6 +++++-
 src/msg_utils.cpp                   | 22 ++++++++++------------
 src/winlink_utils.cpp               |  4 +++-
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/lib/APRSPacketLib/APRSPacketLib.cpp b/lib/APRSPacketLib/APRSPacketLib.cpp
index 9988eec..14fe216 100644
--- a/lib/APRSPacketLib/APRSPacketLib.cpp
+++ b/lib/APRSPacketLib/APRSPacketLib.cpp
@@ -645,11 +645,10 @@ namespace APRSPacketLib {
       }
     } else if (receivedPacket.indexOf("::") > 10) {
       aprsPacket.type = 1;
-      String temp1 = receivedPacket.substring(receivedPacket.indexOf("::")+2);
-      String temp2 = temp1.substring(0,temp1.indexOf(":"));
-      temp2.trim();
-      aprsPacket.addressee = temp2;
-      aprsPacket.message = temp1.substring(temp1.indexOf(":")+1);
+      String temp1 = receivedPacket.substring(receivedPacket.indexOf("::")+2,receivedPacket.indexOf("::")+11);
+      temp1.trim();
+      aprsPacket.addressee = temp1;
+      aprsPacket.message = receivedPacket.substring(receivedPacket.indexOf("::")+12);
       aprsPacket.latitude = 0;
       aprsPacket.longitude = 0;
     } else if (receivedPacket.indexOf(":>") > 10) {
diff --git a/src/keyboard_utils.cpp b/src/keyboard_utils.cpp
index b279b49..f1a200b 100644
--- a/src/keyboard_utils.cpp
+++ b/src/keyboard_utils.cpp
@@ -278,10 +278,6 @@ namespace KEYBOARD_Utils {
     }
 
 
-
-
-
-
     else if (menuDisplay == 6) {
       menuDisplay = 60;
     } else if (menuDisplay == 60) {
diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp
index f2cd8e7..72927aa 100644
--- a/src/menu_utils.cpp
+++ b/src/menu_utils.cpp
@@ -63,7 +63,7 @@ namespace MENU_Utils {
     void showOnScreen() {
         String lastLine, firstLineDecoder, courseSpeedAltitude, speedPacketDec, coursePacketDec, pathDec;
         uint32_t lastMenuTime = millis() - menuTime;
-        if (!(menuDisplay==0) && !(menuDisplay==300) && !(menuDisplay==310) && !(menuDisplay==40) && lastMenuTime > 30*1000) {
+        if (!(menuDisplay==0) && !(menuDisplay==300) && !(menuDisplay==310) && !(menuDisplay==40) && !(menuDisplay>=500 && menuDisplay<=5000) && lastMenuTime > 30*1000) {
             menuDisplay = 0;
             messageCallsign = "";
             messageText = "";
@@ -329,6 +329,10 @@ namespace MENU_Utils {
                 show_display("__WINLINK_", "" , "Login Initiation ...", "Challenge -> ack ...", "" , "<Back");
                 break;
 
+            case 5000:   // 5.Winlink ---> Logged!!!
+                show_display("__WINLINK_", "" , "Logged !!! ", "", "" , "<Back");
+                break;
+
                 /* si esta loggeado (5000)
                 5010) write mail
                 5020) list pending mails
diff --git a/src/msg_utils.cpp b/src/msg_utils.cpp
index 9a3a1a7..4e1e2d6 100644
--- a/src/msg_utils.cpp
+++ b/src/msg_utils.cpp
@@ -199,9 +199,7 @@ namespace MSG_Utils {
             ackMessage.trim();
             delay(4000);
             sendMessage(0, lastReceivedPacket.sender, ackMessage);
-            lastReceivedPacket.message = lastReceivedPacket.message.substring(lastReceivedPacket.message.indexOf(":")+1, lastReceivedPacket.message.indexOf("{"));
-          } else {
-            lastReceivedPacket.message = lastReceivedPacket.message.substring(lastReceivedPacket.message.indexOf(":")+1);
+            lastReceivedPacket.message = lastReceivedPacket.message.substring(0, lastReceivedPacket.message.indexOf("{"));
           }
           if (Config.notification.buzzerActive && Config.notification.messageRxBeep) {
             NOTIFICATION_Utils::messageBeep();
@@ -235,29 +233,29 @@ namespace MSG_Utils {
           } else if (lastReceivedPacket.sender == "WLNK-1") {
             String winlinkAckAnswer = lastReceivedPacket.message.substring(lastReceivedPacket.message.indexOf("ack")+3);
             if (winlinkStatus == 1 && winlinkAckAnswer.toInt() == ackNumberSend) {
-              winlinkStatus = 2;  // recibió ack de nuestro mensaje
-              Serial.println("waiting for Challenge");
+              winlinkStatus = 2;
+              logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Winlink","---> Waiting Challenge");
               menuDisplay = 500;
             } else if (winlinkStatus <= 2 && lastReceivedPacket.message.indexOf("Login [") == 0) {
-              Serial.println("Challenge received");
+              logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Winlink","---> Challenge received");
               String winlinkChallenge = lastReceivedPacket.message.substring(lastReceivedPacket.message.indexOf("[")+1,lastReceivedPacket.message.indexOf("]"));
-              Serial.println("el challenge es " + winlinkChallenge);
+              //Serial.println("the challenge is " + winlinkChallenge);
               WINLINK_Utils::processWinlinkChallenge(winlinkChallenge);              
               winlinkStatus = 3;
               menuDisplay = 501;
-            } else if (winlinkStatus == 2 && lastReceivedPacket.message.indexOf("Login [") == -1) {
+            } /*else if (winlinkStatus == 2 && lastReceivedPacket.message.indexOf("Login [") == -1) {
               Serial.println("Estamos conetados a WINLINK!!!!");
               show_display("__WINLINK_", "", " LOGGED !!!!", 2000);
               winlinkStatus = 5;
               //menuDisplay = 800;
-            } else if (winlinkStatus == 3 && winlinkAckAnswer.toInt() == ackNumberSend) {
+            } */else if (winlinkStatus == 3 && winlinkAckAnswer.toInt() == ackNumberSend) {
               winlinkStatus = 4;
-              Serial.println("llego ack de recepcion challenge");
+              logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Winlink","---> Challenge Reception ACK");
               menuDisplay = 502;
             } else if (lastReceivedPacket.message.indexOf("Login valid") > 0) {
               winlinkStatus = 5;
-              Serial.println("Estamos conetados a WINLINK!!!!");
-              //menuDisplay = 800;
+              logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Winlink","---> Login Succesfull");
+              menuDisplay = 5000;
             } 
             // que se hace con los mensajes recibidos desde Winlink cuando ya estamos conectados
           } else {
diff --git a/src/winlink_utils.cpp b/src/winlink_utils.cpp
index 1511159..4c78ed3 100644
--- a/src/winlink_utils.cpp
+++ b/src/winlink_utils.cpp
@@ -2,10 +2,12 @@
 #include "configuration.h"
 #include "msg_utils.h"
 #include "display.h"
+#include "logger.h"
 
 extern Configuration    Config;
 extern int              winlinkStatus;
 extern int              menuDisplay;
+extern logging::Logger  logger;
 
 namespace WINLINK_Utils {
 
@@ -23,7 +25,7 @@ namespace WINLINK_Utils {
   }
 
   void login() {
-    Serial.println("Starting Winlink Login"); // por borrar
+    logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Winlink","---> Start Login");
     show_display("__WINLINK_", "" , "Login Initiation ...", "", "" , "<Back");
     if (winlinkStatus == 5) {
       //menuDisplay = 800;