1.3
This commit is contained in:
parent
72d3b9a3ac
commit
79758d589e
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"beacons": [
|
"beacons": [
|
||||||
{
|
{
|
||||||
"callsign": "NOCALL-7",
|
"callsign": "CD2RXU-7",
|
||||||
"symbol": "[",
|
"symbol": "[",
|
||||||
"comment": "",
|
"comment": "",
|
||||||
"smart_beacon": {
|
"smart_beacon": {
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"callsign": "NOCALL-7",
|
"callsign": "CD2RXU-7",
|
||||||
"symbol": ">",
|
"symbol": ">",
|
||||||
"comment": "",
|
"comment": "",
|
||||||
"smart_beacon": {
|
"smart_beacon": {
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"callsign": "NOCALL-7",
|
"callsign": "CD2RXU-7",
|
||||||
"symbol": "j",
|
"symbol": "j",
|
||||||
"comment": "",
|
"comment": "",
|
||||||
"smart_beacon": {
|
"smart_beacon": {
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,9 @@
|
||||||
#define SYM_HEIGHT 14
|
#define SYM_HEIGHT 14
|
||||||
#define SYM_WIDTH 16
|
#define SYM_WIDTH 16
|
||||||
|
|
||||||
|
extern Configuration Config;
|
||||||
extern Beacon *currentBeacon;
|
extern Beacon *currentBeacon;
|
||||||
extern int menuDisplay;
|
extern int menuDisplay;
|
||||||
|
|
||||||
const uint8_t *symbolsAPRS[]={runnerSymbol, carSymbol, bikeSymbol};
|
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(SSD1306_SETCONTRAST);
|
||||||
display.ssd1306_command(1);
|
display.ssd1306_command(1);
|
||||||
|
|
||||||
if (menuDisplay==0) {
|
if (menuDisplay==0 && Config.showSymbolCharacter && Config.showCustomCharacter) {
|
||||||
int symbol;
|
int symbol;
|
||||||
if(currentBeacon->symbol == "[") {
|
if(currentBeacon->symbol == "[") {
|
||||||
symbol = 0;
|
symbol = 0;
|
||||||
|
|
|
||||||
|
|
@ -139,8 +139,6 @@ void showOnScreen() {
|
||||||
String(fourthRowMainMenu),
|
String(fourthRowMainMenu),
|
||||||
String(fifthRowMainMenu),
|
String(fifthRowMainMenu),
|
||||||
String(sixthRowMainMenu));
|
String(sixthRowMainMenu));
|
||||||
//if(currentBeacon->symbol == "[") drawAPRSSymbol(0);
|
|
||||||
//if(currentBeacon->symbol == ">") drawAPRSSymbol(1);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue