ua1zbe
/
TTGO-T-Beam-LoRa-APRS
mirror of https://github.com/SQ9MDD/TTGO-T-Beam-LoRa-APRS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix in BT connected detection

This commit is contained in:
Łukasz Nidecki 2021-02-15 18:05:45 +01:00
parent dffb860e40
commit d396ff7c69
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/TTGO_T-Beam_LoRa_APRS.ino
View File

@ -36,13 +36,9 @@
#define SSD1306_ADDRESS 0x3C #define SSD1306_ADDRESS 0x3C
//other global Variables //other global Variables
String Textzeile1, Textzeile2;
#ifdef KISS_PROTOCOL #ifdef KISS_PROTOCOL
String inTNCData = ""; String inTNCData = "";
#endif #endif
//int button=0;
//int button_ctr=0;
// LED for signalling // LED for signalling
@ -117,7 +113,6 @@ static const adc_unit_t unit = ADC_UNIT_1;
void recalcGPS(void); void recalcGPS(void);
void sendpacket(void); void sendpacket(void);
void loraSend(byte, byte, byte, byte, byte, long, byte, float);
void batt_read(void); void batt_read(void);
void writedisplaytext(String, String, String, String, String, String, int); void writedisplaytext(String, String, String, String, String, String, int);
void setup_data(void); void setup_data(void);
@ -242,7 +237,7 @@ void recalcGPS(){
#ifdef KISS_PROTOCOL #ifdef KISS_PROTOCOL
Serial.print(encode_kiss(outString)); Serial.print(encode_kiss(outString));
#ifdef ENABLE_BLUETOOTH #ifdef ENABLE_BLUETOOTH
if (SerialBT.connected()) { if (SerialBT.hasClient()) {
SerialBT.print(encode_kiss(outString)); SerialBT.print(encode_kiss(outString));
} }
#endif #endif
@ -339,7 +334,7 @@ void handleKISSData(char character) {
Serial.print(inTNCData); Serial.print(inTNCData);
#endif #endif
#ifdef ENABLE_BLUETOOTH #ifdef ENABLE_BLUETOOTH
if (SerialBT.connected()) { if (SerialBT.hasClient()) {
#ifdef LOCAL_KISS_ECHO #ifdef LOCAL_KISS_ECHO
SerialBT.print(inTNCData); SerialBT.print(inTNCData);
#endif #endif
@ -359,7 +354,7 @@ String getSatAndBatInfo() {
line5 = "SAT: X BAT: " + String(BattVolts, 1) + "V"; line5 = "SAT: X BAT: " + String(BattVolts, 1) + "V";
} }
#ifdef ENABLE_BLUETOOTH #ifdef ENABLE_BLUETOOTH
if (SerialBT.connected()){ if (SerialBT.hasClient()){
line5 += "BT"; line5 += "BT";
} }
#endif #endif
@ -369,7 +364,7 @@ String getSatAndBatInfo() {
void displayInvalidGPS() { void displayInvalidGPS() {
writedisplaytext(" " + Tcall, "(TX) at valid GPS", "LAT: not valid", "LON: not valid", "SPD: --- CRS: ---", getSatAndBatInfo(), 1); writedisplaytext(" " + Tcall, "(TX) at valid GPS", "LAT: not valid", "LON: not valid", "SPD: --- CRS: ---", getSatAndBatInfo(), 1);
#ifdef SHOW_GPS_DATA #ifdef SHOW_GPS_DATA
Serial.print("(TX) at valid GPS / LAT: not valid / Lon: not valid / SPD: --- / CRS: ---"); Serial.print("(TX) at valid GPS / LAT: not valid / Lon: not valid / SPD: --- / CRS: ---");
Serial.print(" / SAT: "); Serial.print(" / SAT: ");
Serial.print(String(gps.satellites.value())); Serial.print(String(gps.satellites.value()));
Serial.print(" / BAT: "); Serial.print(" / BAT: ");
@ -508,7 +503,7 @@ void loop() {
handleKISSData(character); handleKISSData(character);
} }
#ifdef ENABLE_BLUETOOTH #ifdef ENABLE_BLUETOOTH
if (SerialBT.connected()) { if (SerialBT.hasClient()) {
while (SerialBT.available() > 0 ){ while (SerialBT.available() > 0 ){
char character = SerialBT.read(); char character = SerialBT.read();
handleKISSData(character); handleKISSData(character);
@ -531,7 +526,7 @@ void loop() {
#ifdef KISS_PROTOCOL #ifdef KISS_PROTOCOL
Serial.print(encode_kiss(loraReceivedFrameString)); Serial.print(encode_kiss(loraReceivedFrameString));
#ifdef ENABLE_BLUETOOTH #ifdef ENABLE_BLUETOOTH
if (SerialBT.connected()){ if (SerialBT.hasClient()){
SerialBT.print(encode_kiss(loraReceivedFrameString)); SerialBT.print(encode_kiss(loraReceivedFrameString));
} }
#endif #endif