kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Optimised tickers

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-05-19 12:53:21 +02:00
parent 3611d76c71
commit 4c102882b6
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui.cpp
+11 -2
View File
@@ -465,6 +465,10 @@ void BuildAFScreen() {
PIold = " "; PIold = " ";
PSold = " "; PSold = " ";
xPos = 0; xPos = 0;
xPos2 = 0;
xPos3 = 0;
xPos4 = 0;
xPos5 = 0;
for (byte i = 0; i < 20; i++) { for (byte i = 0; i < 20; i++) {
mappedfreqold[i] = 0; mappedfreqold[i] = 0;
mappedfreqold2[i] = 0; mappedfreqold2[i] = 0;
@@ -1554,6 +1558,7 @@ void BuildAdvancedRDS() {
xPos2 = 0; xPos2 = 0;
xPos3 = 0; xPos3 = 0;
xPos4 = 0; xPos4 = 0;
xPos5 = 0;
} }
void BuildDisplay() { void BuildDisplay() {
@@ -1707,6 +1712,10 @@ void BuildDisplay() {
BWreset = true; BWreset = true;
dropout = false; dropout = false;
xPos = 0; xPos = 0;
xPos2 = 0;
xPos3 = 0;
xPos4 = 0;
xPos5 = 0;
} }
void MenuUp() { void MenuUp() {
@@ -4155,7 +4164,7 @@ void DoMenu() {
char key [9]; char key [9];
XDRGTK_key.toCharArray(key, 9); XDRGTK_key.toCharArray(key, 9);
UpdateFonts(2); UpdateFonts(2);
UpdateSprites(1); UpdateSprites(1);
WiFiConnectParam XDRGTK_key_text("Set XDRGTK Password: (max 8 characters)"); WiFiConnectParam XDRGTK_key_text("Set XDRGTK Password: (max 8 characters)");
WiFiConnectParam XDRGTK_key_input("XDRGTK_key", "Password", key, 9); WiFiConnectParam XDRGTK_key_input("XDRGTK_key", "Password", key, 9);
wc.addParameter(&XDRGTK_key_text); wc.addParameter(&XDRGTK_key_text);
@@ -4164,7 +4173,7 @@ void DoMenu() {
XDRGTK_key = XDRGTK_key_input.getValue(); XDRGTK_key = XDRGTK_key_input.getValue();
EEPROM.writeString(EE_STRING_XDRGTK_KEY, XDRGTK_key); EEPROM.writeString(EE_STRING_XDRGTK_KEY, XDRGTK_key);
EEPROM.commit(); EEPROM.commit();
UpdateSprites(0); UpdateSprites(0);
UpdateFonts(1); UpdateFonts(1);
wifi = true; wifi = true;
tryWiFi(); tryWiFi();
src/rds.cpp
+2 -2
View File
@@ -85,7 +85,7 @@ void ShowAdvancedRDS() {
} }
if (millis() - afticker >= 5) { if (millis() - afticker >= 5) {
if (radio.rds.hasAF) { if (radio.rds.hasAF && afstring.length() > 30) {
if (afstring.length() != afstringlengthold) { if (afstring.length() != afstringlengthold) {
afstringWidth = afstring.length() * charwidth; afstringWidth = afstring.length() * charwidth;
afstringlengthold = afstring.length(); afstringlengthold = afstring.length();
@@ -107,7 +107,7 @@ void ShowAdvancedRDS() {
RDSSprite.fillSprite(BackgroundColor); RDSSprite.fillSprite(BackgroundColor);
if (RDSstatus) RDSSprite.setTextColor(RDSColor, RDSColorSmooth, false); else RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false); if (RDSstatus) RDSSprite.setTextColor(RDSColor, RDSColorSmooth, false); else RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
RDSSprite.drawString(afstring, xPos2, 2); RDSSprite.drawString(afstring, xPos2, 2);
if (radio.rds.hasAF) RDSSprite.drawString(afstring, xPos2 + afstringWidth, 2); if (radio.rds.hasAF && afstring.length() > 30) RDSSprite.drawString(afstring, xPos2 + afstringWidth, 2);
RDSSprite.pushSprite(35, 197); RDSSprite.pushSprite(35, 197);
afticker = millis(); afticker = millis();
} }