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

symbols on TFT

This commit is contained in:
richonguzman 2024-04-17 23:50:05 -04:00
parent 5521286d69
commit f4771546bb
1 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/display.cpp
View File

@ -12,14 +12,14 @@
TFT_eSPI tft = TFT_eSPI();
#ifdef HELTEC_WIRELESS_TRACKER
#define bigSizeFont 2
#define smallSizeFont 1
#define lineSpacing 9
#define bigSizeFont 2
#define smallSizeFont 1
#define lineSpacing 9
#endif
#ifdef TTGO_T_DECK_GPS
#define bigSizeFont 4
#define smallSizeFont 2
#define lineSpacing 18
#define bigSizeFont 4
#define smallSizeFont 2
#define lineSpacing 18
#endif
#else
@ -41,12 +41,11 @@ Adafruit_SSD1306 display(128, 64, &Wire, OLED_RST);
#include <Adafruit_SH110X.h>
Adafruit_SH1106G display(128, 64, &Wire, OLED_RST);
#endif
#define SYM_HEIGHT 14
#define SYM_WIDTH 16
#endif
#define SYMBOL_HEIGHT 14
#define SYMBOL_WIDTH 16
extern Configuration Config;
extern Beacon *currentBeacon;
extern int menuDisplay;
@ -342,6 +341,43 @@ void show_display(String header, String line1, String line2, String line3, Strin
tft.print(line4);
tft.setCursor(0, ((lineSpacing *6) - 2));
tft.print(line5);
if (menuDisplay == 0 && Config.display.showSymbol) {
int symbol = 100;
for (int i = 0; i < symbolArraySize; i++) {
if (currentBeacon->symbol == symbolArray[i]) {
symbol = i;
break;
}
}
symbolAvailable = symbol != 100;
/*
* Symbol alternate every 5s
* If bluetooth is disconnected or if we are in the first part of the clock, then we show the APRS symbol
* Otherwise, we are in the second part of the clock, then we show BT connected
*/
const auto time_now = now();
if (!bluetoothConnected || time_now % 10 < 5) {
if (symbolAvailable) {
#if HELTEC_WIRELESS_TRACKER
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH + (128 - TFT_WIDTH)), 0, symbolsAPRS[symbol], SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);//, TFT_RED);
#endif
#if TTGO_T_DECK_GPS
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH), 0, symbolsAPRS[symbol], SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);//, TFT_RED);
#endif
}
} else if (bluetoothConnected) { // TODO In this case, the text symbol stay displayed due to symbolAvailable false in menu_utils
#if HELTEC_WIRELESS_TRACKER
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH + (128 - TFT_WIDTH)), 0, bluetoothSymbol, SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);
#endif
#if TTGO_T_DECK_GPS
tft.drawBitmap((TFT_WIDTH - SYMBOL_WIDTH), 0, bluetoothSymbol, SYMBOL_WIDTH, SYMBOL_HEIGHT, TFT_WHITE);
#endif
}
}
#else
display.clearDisplay();
#ifdef ssd1306
@ -387,11 +423,11 @@ void show_display(String header, String line1, String line2, String line3, Strin
const auto time_now = now();
if (!bluetoothConnected || time_now % 10 < 5) {
if (symbolAvailable) {
display.drawBitmap((display.width() - SYM_WIDTH), 0, symbolsAPRS[symbol], SYM_WIDTH, SYM_HEIGHT, 1);
display.drawBitmap((display.width() - SYMBOL_WIDTH), 0, symbolsAPRS[symbol], SYMBOL_WIDTH, SYMBOL_HEIGHT, 1);
}
} else if (bluetoothConnected) {
// TODO In this case, the text symbol stay displayed due to symbolAvailable false in menu_utils
display.drawBitmap((display.width() - SYM_WIDTH), 0, bluetoothSymbol, SYM_WIDTH, SYM_HEIGHT, 1);
display.drawBitmap((display.width() - SYMBOL_WIDTH), 0, bluetoothSymbol, SYMBOL_WIDTH, SYMBOL_HEIGHT, 1);
}
}