Updated abcKeys to work as single-shot

rtc
g7uhn 2020-12-30 08:32:35 +00:00
rodzic f8b30b4986
commit 095b5d0dda
1 zmienionych plików z 48 dodań i 51 usunięć

Wyświetl plik

@ -222,9 +222,8 @@ void setup(void)
sei(); // allow interrupts
// Initial display drawing
// Initial draw of the main display by calling changePage()
drawMainDisplay();
// Display the soft keys by calling changePage()
changePage();
} // end setup
@ -456,7 +455,7 @@ void changePage()
if (sw9status == LOW) { // if SHIFT key is down, draw the location/time page
expansionPage = 1;
display.clearDisplay();
display.setCursor(10, 11);
display.setCursor(0, 0);
display.println("Placeholder");
display.println("for GPS info");
}
@ -465,8 +464,9 @@ void changePage()
currentPage = ++currentPage % 3; // ...increment the current page (3 pages)
}
else { // if we are coming from the expansion page we need to...
display.clearDisplay(); // ...clear the display and redraw the main display layout
drawMainDisplay();
display.clearDisplay(); // ...clear the display
display.display();
}
expansionPage = 0; // set expansionPage to false
@ -747,9 +747,7 @@ void displayABCkeys() // includes EEPROM read
{
byte currentAbcKeys = radio.getDisplaySelection();
if (currentAbcKeys != abcKeys)
{
abcKeys = currentAbcKeys;
abcKeys = currentAbcKeys; // originally this function only updated the display if the abcKeys value changed (was continuously monitored)
// Print current ABC keys
display.setCursor(0, 41);
display.setTextSize(1);
@ -793,7 +791,6 @@ void displayABCkeys() // includes EEPROM read
break;
}
}
}