From 79758d589e15ce8279c27cc2fa5f7ca45a0ed348 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Sun, 16 Jul 2023 10:09:06 -0400 Subject: [PATCH] 1.3 --- data/tracker_config.json | 6 +++--- src/display.cpp | 5 +++-- src/menu_utils.cpp | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/data/tracker_config.json b/data/tracker_config.json index d3e2a37..bdba5ee 100644 --- a/data/tracker_config.json +++ b/data/tracker_config.json @@ -1,7 +1,7 @@ { "beacons": [ { - "callsign": "NOCALL-7", + "callsign": "CD2RXU-7", "symbol": "[", "comment": "", "smart_beacon": { @@ -17,7 +17,7 @@ } }, { - "callsign": "NOCALL-7", + "callsign": "CD2RXU-7", "symbol": ">", "comment": "", "smart_beacon": { @@ -33,7 +33,7 @@ } }, { - "callsign": "NOCALL-7", + "callsign": "CD2RXU-7", "symbol": "j", "comment": "", "smart_beacon": { diff --git a/src/display.cpp b/src/display.cpp index 6a2e6d9..6bb91ad 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -11,8 +11,9 @@ #define SYM_HEIGHT 14 #define SYM_WIDTH 16 +extern Configuration Config; extern Beacon *currentBeacon; -extern int menuDisplay; +extern int menuDisplay; const uint8_t *symbolsAPRS[]={runnerSymbol, carSymbol, bikeSymbol}; @@ -170,7 +171,7 @@ void show_display(String header, String line1, String line2, String line3, Strin display.ssd1306_command(SSD1306_SETCONTRAST); display.ssd1306_command(1); - if (menuDisplay==0) { + if (menuDisplay==0 && Config.showSymbolCharacter && Config.showCustomCharacter) { int symbol; if(currentBeacon->symbol == "[") { symbol = 0; diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp index 48b548f..ed629f2 100644 --- a/src/menu_utils.cpp +++ b/src/menu_utils.cpp @@ -139,8 +139,6 @@ void showOnScreen() { String(fourthRowMainMenu), String(fifthRowMainMenu), String(sixthRowMainMenu)); - //if(currentBeacon->symbol == "[") drawAPRSSymbol(0); - //if(currentBeacon->symbol == ">") drawAPRSSymbol(1); break; } }