ua1zbe
/
LoRa_APRS_Tracker111
mirror of https://github.com/richonguzman/LoRa_APRS_Tracker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prueba3

This commit is contained in:
richonguzman 2023-12-01 07:48:21 -03:00
parent 9d15de748f
commit 19d2a03e5d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ax25_utils.cpp
View File

@ -15,7 +15,7 @@ namespace AX25_Utils {
packet += char(shiftedValue);
}
}
uint16_t ssid = frame[6] >> 1;// & 0x0f;
uint16_t ssid = frame[6] >> 1;// & 0x0f;
if (isdigit(char(ssid))) {
Serial.print("-");
Serial.print(char(ssid));
@ -84,8 +84,8 @@ namespace AX25_Utils {
return frame;
}
String intToBinaryString(int value, int bitLength) {
String result = "";
std::string intToBinaryString(int value, int bitLength) {
std::string result = "";
for (int i = bitLength - 1; i >= 0; i--) {
result += ((value >> i) & 1) ? '1' : '0';
}
@ -99,7 +99,8 @@ namespace AX25_Utils {
String encodeFrame(String frame, int type) {
//Serial.println(frame);//
String packet = "";
String address, concatenatedBinary;
String address;
std::string concatenatedBinary;
int ssid;
if (frame.indexOf("-")>0) {
address = frameCleaning(frame.substring(0,frame.indexOf("-")));
@ -122,7 +123,11 @@ namespace AX25_Utils {
} else if (type == 2) {
concatenatedBinary = "011" + intToBinaryString(ssid,4) + "1";
}
packet += binaryStringToUint8(concatenatedBinary);
long decimalValue = strtol(concatenatedBinary.c_str(), NULL, 2);
char hexString[3];
sprintf(hexString, "%02X", (int)decimalValue);
packet += hexString;
return packet;
}

2
src/ax25_utils.h
View File

@ -39,7 +39,7 @@ namespace AX25_Utils {
bool decodeAX25(String frame, int frameSize, AX25Frame* decodedFrame);
String AX25FrameToLoRaPacket(String frame);
String frameCleaning(String frame);
String intToBinaryString(int value, int bitLength);
std::string intToBinaryString(int value, int bitLength);
uint8_t binaryStringToUint8(String binaryString);
String encodeFrame(String frame);
String LoRaPacketToAX25Frame(String packet);