;z0R%fcJZy#szo}!(q{OK
z>N8E!RJDj)19JM~F=G>kO_^f!wdvhFrO08_%}YjHR
diff --git a/data_embed/style.css.out b/data_embed/style.css.out
index b59c1b4ab7a4b32ca88f10efd3ad1a698ef5196a..dd62340c85057af694c5b0b531203b9380c8bbea 100644
GIT binary patch
delta 17
ZcmaF3jq%|&MmG6w4u*TTHnK%W0{}z;2Mz!L
delta 17
ZcmaF3jq%|&MmG6w4u*@9HnK%W0{}ux2DtzL
diff --git a/include/version.h b/include/version.h
index dd44c6b..7c871a8 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,10 +1,10 @@
#ifndef BUILD_NUMBER
- #define BUILD_NUMBER "66"
+ #define BUILD_NUMBER "127"
#endif
#ifndef VERSION
- #define VERSION "v0.3.66- - 2023-09-09 17:44:17.377051"
+ #define VERSION "v0.4.127- - 2023-09-09 22:51:42.144437"
#endif
#ifndef VERSION_SHORT
- #define VERSION_SHORT "v0.3.66-"
+ #define VERSION_SHORT "v0.4.127-"
#endif
diff --git a/platformio.ini b/platformio.ini
index 1db5ea9..4bf3387 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -70,10 +70,9 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
- pau6.21.3lstoffregen/OneWire@^2.3.7
+ paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
- bblanchon/ArduinoJson@^
+ bblanchon/ArduinoJson@^6.21.3
[env:ttgo-t-beam-v1_2]
platform = espressif32 @ 3.0.0
@@ -91,7 +90,6 @@ lib_deps =
adafruit/Adafruit GFX Library@^1.11.7
paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
- lewisxhe/AXP202X_Library@^1.1.3
bblanchon/ArduinoJson@^6.21.3
[env:ttgo-t-beam-v0_7]
@@ -107,8 +105,6 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
- paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
bblanchon/ArduinoJson@^6.21.3
@@ -125,7 +121,6 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
bblanchon/ArduinoJson@^6.21.3
@@ -143,7 +138,6 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
bblanchon/ArduinoJson@^6.21.3
@@ -161,7 +155,6 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
bblanchon/ArduinoJson@^6.21.3
@@ -179,7 +172,6 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
bblanchon/ArduinoJson@^6.21.3
@@ -197,7 +189,6 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
bblanchon/ArduinoJson@^6.21.3
@@ -221,7 +212,6 @@ lib_deps =
mikalhart/TinyGPSPlus@^1.0.3
adafruit/Adafruit SSD1306@^2.5.7
adafruit/Adafruit GFX Library@^1.11.7
- lewisxhe/AXP202X_Library@^1.1.3
paulstoffregen/OneWire@^2.3.7
sparkfun/SparkFun u-blox Arduino Library@^1.8.11
bblanchon/ArduinoJson@^6.21.3
diff --git a/src/TTGO_T-Beam_LoRa_APRS.ino b/src/TTGO_T-Beam_LoRa_APRS.ino
index 1d5f95c..f0ae098 100644
--- a/src/TTGO_T-Beam_LoRa_APRS.ino
+++ b/src/TTGO_T-Beam_LoRa_APRS.ino
@@ -19,7 +19,6 @@
#include
#include
#include
-#include
#include "taskGPS.h"
#include "version.h"
#include "preference_storage.h"
@@ -51,6 +50,7 @@
#define BUZZER 15 // enter your buzzer pin gpio
const byte TXLED = 4;
#elif T_BEAM_V1_0
+ #define XPOWERS_CHIP_AXP192
#define I2C_SDA 21
#define I2C_SCL 22
#define BUTTON 38 //pin number for Button on TTGO T-Beam
@@ -189,6 +189,7 @@ byte lora_FDeviceError; //flag, set to 1 if RFM98 device error
byte lora_TXPacketL; //length of packet to send, includes source, destination and packet type.
unsigned long lastTX = 0L;
+float ConvertToV;
float BattVolts;
float InpVolts;
@@ -248,7 +249,13 @@ uint8_t txPower = TXdbmW;
static const adc_atten_t atten = ADC_ATTEN_DB_6;
static const adc_unit_t unit = ADC_UNIT_1;
#ifdef T_BEAM_V1_0
- AXP20X_Class axp;
+ bool pmu_flag = 0;
+XPowersAXP192 PMU;
+
+void setFlag(void)
+{
+ pmu_flag = true;
+}
#elif T_BEAM_V1_2 //PMU TBEAM 1.2
bool pmu_flag = 0;
XPowersAXP2101 PMU;
@@ -282,6 +289,43 @@ char *ax25_base91enc(char *s, uint8_t n, uint32_t v){
return(s);
}
+#if defined(KISS_PROTOCOL)
+/**
+ *
+ * @param TNC2FormatedFrame
+ */
+void sendToTNC(const String& TNC2FormatedFrame) {
+ if (tncToSendQueue){
+ auto *buffer = new String();
+ buffer->concat(TNC2FormatedFrame);
+ if (xQueueSend(tncReceivedQueue, &buffer, (1000 / portTICK_PERIOD_MS)) != pdPASS){
+ // remove buffer on error
+ delete buffer;
+ }
+ }
+}
+#endif
+void enablepins(){
+ #ifdef T_BEAM_V1_2
+ PMU.enableBattDetection();
+ PMU.enableVbusVoltageMeasure();
+ PMU.enableBattVoltageMeasure();
+ PMU.enableSystemVoltageMeasure();
+#elif T_BEAM_V1_0
+ PMU.enableBattDetection();
+ PMU.enableVbusVoltageMeasure();
+ PMU.enableBattVoltageMeasure();
+ PMU.enableSystemVoltageMeasure();
+#elif T_BEAM_V0_7 /*
+ adcAttachPin(35);
+ adcStart(35);
+ analogReadResolution(10);
+ analogSetAttenuation(ADC_6db); */
+ pinMode(35, INPUT);
+ //adc1_config_width(ADC_WIDTH_BIT_12);
+ //adc1_config_channel_atten(ADC1_CHANNEL_7,ADC_ATTEN_DB_11);
+#endif
+}
void prepareAPRSFrame(){
String helper;
String Altx;
@@ -374,15 +418,6 @@ void buzzer(int* melody, int array_size){
}
#endif
-void sendpacket(){
- #ifdef BUZZER
- int melody[] = {1000, 50, 800, 100};
- buzzer(melody, sizeof(melody)/sizeof(int));
- #endif
- batt_read();
- prepareAPRSFrame();
- loraSend(txPower, lora_freq, outString); //send the packet, data is in TXbuff from lora_TXStart to lora_TXEnd
-}
/**
* Send message as APRS LoRa packet
@@ -426,18 +461,30 @@ void loraSend(byte lora_LTXPower, float lora_FREQ, const String &message) {
}
void batt_read(){
-#ifdef T_BEAM_v1_2
- BattVolts = PMU.getBattVoltage() / 1000;
- InpVolts = PMU.getVbusVoltage() / 1000;
+ ConvertToV = 1000;
+#ifdef T_BEAM_V1_2
+ BattVolts = PMU.getBattVoltage()/ConvertToV;
+ InpVolts = PMU.getVbusVoltage()/ConvertToV;
#elif T_BEAM_V1_0
- BattVolts = axp.getBattVoltage()/1000;
- InpVolts = axp.getVbusVoltage()/1000;
+ BattVolts = PMU.getBattVoltage()/ConvertToV;
+ InpVolts = PMU.getVbusVoltage()/ConvertToV;
#elif T_BEAM_V0_7
BattVolts = (((float)analogRead(35) / 8192.0) * 2.0 * 3.3 * (1100.0 / 1000.0))+0.41; // fixed thanks to Luca IU2FRL
//BattVolts = adc1_get_raw(ADC1_CHANNEL_7)/1000;
#else
BattVolts = analogRead(35)*7.221/4096;
#endif
+Serial.print(BattVolts);
+}
+
+void sendpacket(){
+ #ifdef BUZZER
+ int melody[] = {1000, 50, 800, 100};
+ buzzer(melody, sizeof(melody)/sizeof(int));
+ #endif
+ batt_read();
+ prepareAPRSFrame();
+ loraSend(txPower, lora_freq, outString); //send the packet, data is in TXbuff from lora_TXStart to lora_TXEnd
}
void writedisplaytext(String HeaderTxt, String Line1, String Line2, String Line3, String Line4, String Line5) {
@@ -449,17 +496,22 @@ void writedisplaytext(String HeaderTxt, String Line1, String Line2, String Line3
#endif
#elif T_BEAM_V1_0
# ifdef ENABLE_LED_SIGNALING
- axp.setChgLEDMode(AXP20X_LED_BLINK_4HZ);
+ PMU.setChargingLedMode(XPOWERS_CHG_LED_BLINK_1HZ);
#endif
#endif
}
else if(BattVolts <= 3.3){
#ifdef T_BEAM_V1_2
PMU.setChargingLedMode(XPOWERS_CHG_LED_BLINK_4HZ);
+ #elif T_BEAM_V1_0
+ PMU.setChargingLedMode(XPOWERS_CHG_LED_BLINK_4HZ);
+ #endif
+ }
+ else if(BattVolts <=3.0){
+ #ifdef T_BEAM_V1_2
//PMU.shutdown();
#elif T_BEAM_V1_0
- axp.setChgLEDMode(AXP20X_LED_OFF);
- //axp.shutdown(); <-we need fix this
+ PMU.shutdown();
#endif
}
display.clearDisplay();
@@ -519,22 +571,22 @@ void displayInvalidGPS() {
writedisplaytext(" " + Tcall, nextTxInfo, "LAT: not valid", "LON: not valid", "SPD: --- CRS: ---", getSatAndBatInfo());
}
-#if defined(KISS_PROTOCOL)
-/**
- *
- * @param TNC2FormatedFrame
- */
-void sendToTNC(const String& TNC2FormatedFrame) {
- if (tncToSendQueue){
- auto *buffer = new String();
- buffer->concat(TNC2FormatedFrame);
- if (xQueueSend(tncReceivedQueue, &buffer, (1000 / portTICK_PERIOD_MS)) != pdPASS){
- // remove buffer on error
- delete buffer;
- }
- }
-}
-#endif
+//#if defined(KISS_PROTOCOL)
+//**
+// *
+// * @param TNC2FormatedFrame
+// *
+//void sendToTNC(const String& TNC2FormatedFrame) {
+// if (tncToSendQueue){
+// auto *buffer = new String();
+// buffer->concat(TNC2FormatedFrame);
+// if (xQueueSend(tncReceivedQueue, &buffer, (1000 / portTICK_PERIOD_MS)) != pdPASS){
+// // remove buffer on error
+// delete buffer;
+// }
+// }
+//}
+//#endif
#if defined(ENABLE_WIFI)
/**
*
@@ -631,11 +683,11 @@ String prepareCallsign(const String& callsign){
}
preferences.putUInt(PREF_TNC_SELF_TELEMETRY_SEQ, tel_sequence);
#elif T_BEAM_V1_0
- uint8_t b_volt = (axp.getBattVoltage() - 3000) / 5.1;
- uint8_t b_in_c = (axp.getBattChargeCurrent()) / 10;
- uint8_t b_out_c = (axp.getBattDischargeCurrent()) / 10;
- uint8_t ac_volt = (axp.getVbusVoltage() - 3000) / 28;
- uint8_t ac_c = (axp.getVbusCurrent()) / 10;
+ uint8_t b_volt = (PMU.getBattVoltage() - 3000) / 5.1;
+ uint8_t b_in_c = (PMU.getBatteryChargeCurrent()) / 10;
+ uint8_t b_out_c = (PMU.getBattDischargeCurrent()) / 10;
+ uint8_t ac_volt = (PMU.getVbusVoltage() - 3000) / 28;
+ uint8_t ac_c = (PMU.getVbusCurrent()) / 10;
// Pad telemetry message address to 9 characters
char Tcall_message_char[9];
sprintf_P(Tcall_message_char, "%-9s", Tcall);
@@ -699,20 +751,6 @@ String prepareCallsign(const String& callsign){
// + SETUP --------------------------------------------------------------+//
void setup(){
-#ifdef T_BEAM_V1_2
- //PMU.enableBattDetection();
- PMU.enableVbusVoltageMeasure();
- PMU.enableBattVoltageMeasure();
- PMU.enableSystemVoltageMeasure();
-#elif T_BEAM_V0_7 /*
- adcAttachPin(35);
- adcStart(35);
- analogReadResolution(10);
- analogSetAttenuation(ADC_6db); */
- pinMode(35, INPUT);
- //adc1_config_width(ADC_WIDTH_BIT_12);
- //adc1_config_channel_atten(ADC1_CHANNEL_7,ADC_ATTEN_DB_11);
-#endif
SPI.begin(SPI_sck,SPI_miso,SPI_mosi,SPI_ss); //DO2JMG Heltec Patch
Serial.begin(115200);
@@ -980,23 +1018,24 @@ void setup(){
PMU.setChargingLedMode(XPOWERS_CHG_LED_OFF);
PMU.enableDC1(); // oled do not turn off
#elif T_BEAM_V1_0
- if (!axp.begin(Wire, AXP192_SLAVE_ADDRESS)) {
+ if (!PMU.begin(Wire, AXP192_SLAVE_ADDRESS, I2C_SDA, I2C_SCL)) {
}
- axp.setLowTemp(0xFF); //SP6VWX Set low charging temperature
- axp.setPowerOutPut(AXP192_LDO2, AXP202_ON); // LoRa
+ //axp.setLowTemp(0xFF); //SP6VWX Set low charging temperature need to convert
+ PMU.setLDO2Voltage(3300);
+ PMU.enableLDO2(); // LoRa
if (gps_state){
- axp.setPowerOutPut(AXP192_LDO3, AXP202_ON); // switch on GPS
+ PMU.enableLDO3(); // switch on GPS
} else {
- axp.setPowerOutPut(AXP192_LDO3, AXP202_OFF); // switch off GPS
+ PMU.disableLDO3(); // switch off GPS
}
- axp.setPowerOutPut(AXP192_DCDC2, AXP202_ON);
- axp.setPowerOutPut(AXP192_EXTEN, AXP202_ON);
- axp.setDCDC1Voltage(3300);
+ PMU.enableDC2();
+ //axp.setPowerOutPut(AXP192_EXTEN, AXP202_ON); NC
+ PMU.setDC1Voltage(3300);
// Enable ADC to measure battery current, USB voltage etc.
- axp.adc1Enable(0xfe, true);
- axp.adc2Enable(0x80, true);
- axp.setChgLEDMode(AXP20X_LED_OFF);
- axp.setPowerOutPut(AXP192_DCDC1, AXP202_ON); // oled do not turn off
+ //axp.adc1Enable(0xfe, true);
+ //axp.adc2Enable(0x80, true);
+ PMU.setChargingLedMode(XPOWERS_CHG_LED_OFF);
+ PMU.enableDC1(); // oled do not turn off
#endif
if(!display.begin(SSD1306_SWITCHCAPVCC, SSD1306_ADDRESS)) {
@@ -1184,7 +1223,7 @@ void loop() {
#ifdef T_BEAM_V1_2
PMU.disableALDO3(); //GPS OFF
#elif T_BEAM_V1_0
- axp.setPowerOutPut(AXP192_LDO3, AXP202_OFF); // GPS OFF
+ PMU.disableLDO3(); // GPS OFF
#endif
writedisplaytext("((GPSOFF))","","","","","");
next_fixed_beacon = millis() + fix_beacon_interval;
@@ -1196,7 +1235,7 @@ void loop() {
#ifdef T_BEAM_v1_2
PMU.enableALDO3(); // GPS ON
#elif T_BEAM_V1_0
- axp.setPowerOutPut(AXP192_LDO3, AXP202_ON);
+ PMU.enableLDO3();
#endif
writedisplaytext("((GPS ON))","","","","",""); // GPS ON
#ifdef ENABLE_PREFERENCES
@@ -1254,8 +1293,8 @@ void loop() {
if(shutdown_countdown_timer_enable){
if(millis() >= shutdown_countdown_timer){
- axp.setChgLEDMode(AXP20X_LED_OFF);
- axp.shutdown();
+ PMU.setChargingLedMode(XPOWERS_CHG_LED_OFF);
+ PMU.shutdown();
}
}
}
@@ -1281,7 +1320,7 @@ void loop() {
#endif
#elif T_BEAM_V1_0
#ifdef ENABLE_LED_SIGNALING
- axp.setChgLEDMode(AXP20X_LED_LOW_LEVEL);
+ PMU.setChargingLedMode(XPOWERS_CHG_LED_ON);
#endif
#endif
#ifdef BUZZER
@@ -1314,7 +1353,7 @@ void loop() {
#endif
#elif T_BEAM_V1_0
#ifdef ENABLE_LED_SIGNALING
- axp.setChgLEDMode(AXP20X_LED_OFF);
+ PMU.setChargingLedMode(XPOWERS_CHG_LED_OFF);
#endif
#endif
}
@@ -1405,19 +1444,19 @@ void loop() {
debug_message += ", ";
debug_message += "Temp C: " + String(PMU.getTemperature());
#elif T_BEAM_V1_0
- debug_message += "Bat V: " + String(axp.getBattVoltage());
+ debug_message += "Bat V: " + String(PMU.getBattVoltage());
debug_message += ", ";
- debug_message += "Bat IN A: " + String(axp.getBattChargeCurrent());
+ debug_message += "Bat IN A: " + String(PMU.getBatteryChargeCurrent());
debug_message += ", ";
- debug_message += "Bat OUT A: " + String(axp.getBattDischargeCurrent());
+ debug_message += "Bat OUT A: " + String(PMU.getBattDischargeCurrent());
debug_message += ", ";
- debug_message += "USB Plugged: " + String(axp.isVBUSPlug());
+ debug_message += "USB Plugged: " + String(PMU.isVBUSin());
debug_message += ", ";
- debug_message += "USB V: " + String(axp.getVbusVoltage());
+ debug_message += "USB V: " + String(PMU.getVbusVoltage());
debug_message += ", ";
- debug_message += "USB A: " + String(axp.getVbusCurrent());
+ debug_message += "USB A: " + String(PMU.getVbusCurrent());
debug_message += ", ";
- debug_message += "Temp C: " + String(axp.getTemp());
+ debug_message += "Temp C: " + String(PMU.getTemperature());
#else
debug_message += "Bat V: " + String(BattVolts);
#endif
diff --git a/src/taskWebServer.cpp b/src/taskWebServer.cpp
index 155053a..1a3418b 100644
--- a/src/taskWebServer.cpp
+++ b/src/taskWebServer.cpp
@@ -52,8 +52,8 @@ WiFiServer gpsServer(NETWORK_GPS_PORT);
#include
extern XPowersAXP2101 PMU;
#elif T_BEAM_V1_0
- #include
- extern AXP20X_Class axp;
+ #include
+ extern XPowersAXP192 PMU;
#endif
@@ -180,8 +180,8 @@ void handle_Shutdown() {
PMU.shutdown();
#elif T_BEAM_V1_0
server.send(200,"text/html", "Shutdown");
- axp.setChgLEDMode(AXP20X_LED_OFF);
- axp.shutdown();
+ PMU.setChargingLedMode(XPOWERS_CHG_LED_OFF);
+ PMU.shutdown();
#else
server.send(404,"text/html", "Not supported");
#endif
diff --git a/tools/buildscript_versioning.py b/tools/buildscript_versioning.py
index c66e1db..bbe61f6 100644
--- a/tools/buildscript_versioning.py
+++ b/tools/buildscript_versioning.py
@@ -1,6 +1,6 @@
FILENAME_BUILDNO = '.pio/versioning'
FILENAME_VERSION_H = 'include/version.h'
-version = 'v0.3.'
+version = 'v0.4.'
import datetime
from subprocess import *
From 6f4b7fb363a45e77e2d914b75a204c0b791cae81 Mon Sep 17 00:00:00 2001
From: SP6NYA <144551515+SP6NYA@users.noreply.github.com>
Date: Sat, 9 Sep 2023 22:56:29 +0200
Subject: [PATCH 3/4] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5add2c4..fbf71f2 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ After connection with APRX based DIGI it can be used as KISS-TNC
* Lora32 board support: DJ1AN
* Self-telemetry improvement: KB1GIM
* T-beam v1.2 board support: SP6NYA
-* New XPowersib Library: SP6NYA
+* New XPowersLib Library Implementation: SP6NYA
## Supported boards
* TTGO T-beam v.0.7
From 8fb6bc37d27201f82532b657d432d563298b2aa9 Mon Sep 17 00:00:00 2001
From: SP6NYA <144551515+SP6NYA@users.noreply.github.com>
Date: Sun, 10 Sep 2023 00:02:48 +0200
Subject: [PATCH 4/4] Add files via upload
---
README.md | 2 +-
data_embed/index.html.out | Bin 3085 -> 3085 bytes
data_embed/js.js.out | Bin 1321 -> 1321 bytes
data_embed/style.css.out | Bin 23393 -> 23393 bytes
include/version.h | 6 +++---
platformio.ini | 13 ++++++-------
src/TTGO_T-Beam_LoRa_APRS.ino | 16 ----------------
7 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index fbf71f2..a1b99b8 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ After connection with APRX based DIGI it can be used as KISS-TNC
* Lora32 board support: DJ1AN
* Self-telemetry improvement: KB1GIM
* T-beam v1.2 board support: SP6NYA
-* New XPowersLib Library Implementation: SP6NYA
+* New XPowersLib Library: SP6NYA
## Supported boards
* TTGO T-beam v.0.7
diff --git a/data_embed/index.html.out b/data_embed/index.html.out
index 47b149e844f6da99962ea3e6b386a4c7e4b21451..560587bf5f12eef170f2f7c4d231faf9e702c2b9 100644
GIT binary patch
delta 2383
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
delta 15
WcmZ3concat(TNC2FormatedFrame);
-// if (xQueueSend(tncReceivedQueue, &buffer, (1000 / portTICK_PERIOD_MS)) != pdPASS){
-// // remove buffer on error
-// delete buffer;
-// }
-// }
-//}
-//#endif
#if defined(ENABLE_WIFI)
/**
*