From 20b8a8ea17a138094d2feee802e6afe3ca6bc59c Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Tue, 28 Nov 2023 22:37:49 -0300
Subject: [PATCH] test now Tx to phone

---
 src/ax25_utils.cpp | 98 +++++++++++++++++++---------------------------
 src/ax25_utils.h   |  1 +
 src/ble_utils.cpp  | 20 ++--------
 3 files changed, 46 insertions(+), 73 deletions(-)

diff --git a/src/ax25_utils.cpp b/src/ax25_utils.cpp
index 82cdeac..753c82a 100644
--- a/src/ax25_utils.cpp
+++ b/src/ax25_utils.cpp
@@ -73,77 +73,61 @@ namespace AX25_Utils {
     }
   }
 
-///
-  String encodeFrame(String frame) { /// NOT READY YET!!!
-    String packet = "";
-    for (int a=0;a<6;a++) {
-      uint16_t shiftedValue = frame[a] >> 1;
-      if (shiftedValue == 32) { // space or null
-        a=10;
-      } else {
-        Serial.print(char(shiftedValue));
-        packet += char(shiftedValue);
+  String frameCleaning(String frame) {
+    if (frame.length()>6) {
+        frame = frame.substring(0,6);
+    } else if (frame.length()<6) {
+      for (int i=0;frame.length()<6;i++) { 
+        frame += " ";
       }
     }
-    uint16_t ssid = frame[6] >> 1;
-    if (isdigit(char(ssid))) {
-      Serial.print("-");
-      Serial.print(char(ssid));
-      packet += "-";
-      packet += char(ssid);
+    return frame;
+  }
+
+  String encodeFrame(String frame) {
+    String packet = "";
+    String address;
+    int ssid;
+    if (frame.indexOf("-")>0) {
+      address = frameCleaning(frame.substring(0,frame.indexOf("-")));
+      int ssid = frame.substring(frame.indexOf("-")+1).toInt();
+      if (ssid>15) {
+        ssid = 0;   //String binaryString = "011" + generateSSIDBinary(ssid,4) + "0"; // ssid =  C + RR + SSSS + 0 = 011 + ssss + 0     
+      }
+    } else {
+      address = frameCleaning(frame);
+      ssid = 0;
     }
+    for (int j=0;j<6;j++) {
+      char c = address[j];
+      packet += c<<1;
+    }
+    packet += ssid << 1;
     return packet;
   }
 
-
   String LoRaPacketToAX25Frame(String packet) {
-    String decodedPacket = "";
-    //String sender =  packet.substring(3,packet.indexOf(">"));
-    //String tocall = "";
+    String encodedPacket = "";
     String payload = packet.substring(packet.indexOf(":")+1);
-    String temp1 = packet.substring(packet.indexOf(">")+1, packet.indexOf(":"));
+    String temp = packet.substring(packet.indexOf(">")+1, packet.indexOf(":"));
 
-    /*
-    CD2RXU-7>APLRT1,WIDE1-1,WIDE2-2:GPS
-    */
-
-    // 1 A sacar primer tocall
-    if (temp1.indexOf(",")) {
-      decodedPacket = encodeFrame(temp1.substring(0,temp1.indexOf(",")));
-      temp1 = temp1.substring(temp1.indexOf(",")+1);
+    if (temp.indexOf(",")!=-1) {    // tocall
+      encodedPacket = encodeFrame(temp.substring(0,temp.indexOf(",")));
+      temp = temp.substring(temp.indexOf(",")+1);
     } else {
-      decodedPacket = encodeFrame(temp1);
-      temp1 = "";
+      encodedPacket = encodeFrame(temp);
+      temp = "";
     }
-    // 2 sender
-    decodedPacket += encodeFrame(packet.substring(3,packet.indexOf(">")));
-
-    // 1 B resto pasa a los paths--> 3 paths
-    if (temp1.length() > 0) { // si hay mas paths
-
+    encodedPacket += encodeFrame(packet.substring(3,packet.indexOf(">")));    // sender
 
+    if (temp.length() > 0) { // si hay mas paths
 
+    // aqui el encode para los restantes path
     }
-    
-
-    // 4 payload
-    decodedPacket += packet.substring(packet.indexOf(":")+1);
-
-   
-
-  
-
-    // aqui separamos lo que recibimos
-    
-    // decodificar entre ","
-    return "0";
-
-
-
-
-
-
-
+    encodedPacket += char(0x03);
+    encodedPacket += char(0xF0);
+    encodedPacket += packet.substring(packet.indexOf(":")+1);   // payload
+    return encodedPacket;
   }
 
 }
\ No newline at end of file
diff --git a/src/ax25_utils.h b/src/ax25_utils.h
index 8ada20e..a50e038 100644
--- a/src/ax25_utils.h
+++ b/src/ax25_utils.h
@@ -38,6 +38,7 @@ namespace AX25_Utils {
   String decodeFrame(String frame);
   bool decodeAX25(String frame, int frameSize, AX25Frame* decodedFrame);
   String AX25FrameToLoRaPacket(String frame);
+  String frameCleaning(String frame);
   String encodeFrame(String frame);
   String LoRaPacketToAX25Frame(String packet);
 
diff --git a/src/ble_utils.cpp b/src/ble_utils.cpp
index 9ddfb0d..465a92e 100644
--- a/src/ble_utils.cpp
+++ b/src/ble_utils.cpp
@@ -105,19 +105,8 @@ namespace BLE_Utils {
       for (int i=0; i<packet.length();i++) {
         receivedPacketString += packet[i];
       }
-      String test1 = AX25_Utils::LoRaPacketToAX25Frame(receivedPacketString);
-      Serial.println(test1);
-      //pCharacteristicTx->setValue(receivedPacketString.c_str());
-      //pCharacteristicTx->setValue((const uint8_t*)receivedPacketStrin, strlen(receivedPacketStrin));
-      //pCharacteristicTx->setValue((uint8_t *)receivedPacketString.c_str(), 20);
-      //pCharacteristicTx->setValue((uint8_t *)receivedPacketString.c_str(), receivedPacketString.length());
-      
-      /*int parts = (receivedPacketString.length()/20) + 1;
-      for(int n=0;n<parts;n++) {   
-        pCharacteristicTx->setValue(receivedPacketString.substring(n*20, 20)); 
-        pCharacteristicTx->notify();
-        delay(10);                          // Bluetooth stack will go into congestion, if too many packets are sent
-      }*/
+      String AX25Packet = AX25_Utils::LoRaPacketToAX25Frame(receivedPacketString);
+      Serial.println(AX25Packet);
 
       pCharacteristicTx->setValue((byte)KissSpecialCharacter::Fend);
       pCharacteristicTx->notify();
@@ -126,9 +115,8 @@ namespace BLE_Utils {
       pCharacteristicTx->notify();
       delay(3);
 
-
-      for(int n=0;n<receivedPacketString.length();n++) {   
-        uint8_t _c = receivedPacketString[n];
+      for(int n=0;n<AX25Packet.length();n++) {   
+        uint8_t _c = AX25Packet[n];
         if (_c == KissSpecialCharacter::Fend) {
           pCharacteristicTx->setValue((byte)KissSpecialCharacter::Fesc);
           pCharacteristicTx->notify();