Browse Source

Fix crc error on Winlink B2 Proto

KISS_TNC
US1GHQ 2 months ago
parent
commit
40a6237df5
  1. BIN
      data_embed/index.html.out
  2. BIN
      data_embed/js.js.out
  3. BIN
      data_embed/style.css.out
  4. 20
      include/version.h
  5. 22
      lib/KISS_TO_TNC2/KISS_TO_PKT.cpp
  6. 10
      src/TTGO_T-Beam_LoRa_APRS.ino

BIN
data_embed/index.html.out

Binary file not shown.

BIN
data_embed/js.js.out

Binary file not shown.

BIN
data_embed/style.css.out

Binary file not shown.

20
include/version.h

@ -1,10 +1,10 @@
#ifndef BUILD_NUMBER
#define BUILD_NUMBER "6"
#endif
#ifndef VERSION
#define VERSION "v0.3.2.6-cdbff4d - 2021-09-09 10:10:57.865053"
#endif
#ifndef VERSION_SHORT
#define VERSION_SHORT "v0.3.2.6-cdbff4d"
#endif
#ifndef BUILD_NUMBER
#define BUILD_NUMBER "134"
#endif
#ifndef VERSION
#define VERSION "v0.3.2.134-0b37f35 - 2021-09-11 01:20:06.902654"
#endif
#ifndef VERSION_SHORT
#define VERSION_SHORT "v0.3.2.134-0b37f35"
#endif

22
lib/KISS_TO_TNC2/KISS_TO_PKT.cpp

@ -71,16 +71,18 @@ String decapsulateKISS_pkt(const String &frame, uint8_t TNCCmd)
for (int i = 2; i < frame.length() - 1; ++i)
{
char currentChar = frame.charAt(i);
if (currentChar == (char) FEND)
{
ax25Frame += (char) FESC;
ax25Frame += (char) TFEND;
}
else if (currentChar == (char) FESC)
{
ax25Frame += (char) FESC;
ax25Frame += (char) TFESC;
}
if (currentChar == (char)FESC)
{
char nextChar = frame.charAt(i+1);
if (nextChar == (char)TFEND)
{
ax25Frame += (char)FEND;
}
else if (nextChar == (char)TFESC)
{
ax25Frame += (char)FESC;
}
}
else
{
ax25Frame += currentChar;

10
src/TTGO_T-Beam_LoRa_APRS.ino

@ -161,6 +161,7 @@ boolean show_cmt = true;
// Variables and Constants
String loraReceivedFrameString = ""; //data on buff is copied to this string
String loraSendFrameString = ""; //data on buff is copied to this string
String Outputstring = "";
String outString=""; //The new Output String with GPS Conversion RAW
String LongShown="";
@ -422,7 +423,7 @@ void sendpacket(){
* @param aprsFreq
* @param message
*/
void loraSend(byte txPower, float aprsFreq, const String &message) {
void loraSend(byte txPower, float aprsFreq, const String message) {
#ifdef TX_RX_LNA
digitalWrite(TXPIN, HIGH);
digitalWrite(RXPIN, LOW);
@ -434,7 +435,12 @@ void loraSend(byte txPower, float aprsFreq, const String &message) {
lastTX = millis();
int messageSize = min(message.length(), sizeof(lora_TXBUFF) - 1);
message.toCharArray((char*)lora_TXBUFF, messageSize + 1, 0);
// message.getBytes(lora_TXBUFF, messageSize + 1, 0);
loraSendFrameString = message;
for (int i = 0 ; i < messageSize ; i++) {
lora_TXBUFF[i] = (char)loraSendFrameString[i];
}
if (aprsMode == 1200)
{
rf95.setModemConfig(BG_RF95::Bw125Cr47Sf512);

Loading…
Cancel
Save