From 5bff88de6b836d34d3c1c9dd09769ada19dbcdeb Mon Sep 17 00:00:00 2001 From: Sjef Verhoeven PE5PVB Date: Sat, 8 Jun 2024 00:02:07 +0200 Subject: [PATCH] Added 0.5sec scanspeed DX Scanner --- TEF6686_ESP32.ino | 2 +- src/gui.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index b6a0afc..d55bac4 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -828,7 +828,7 @@ void loop() { } if (scandxmode) { - if (millis() >= scantimer + (scanhold * 1000)) { + if (millis() >= scantimer + (scanhold == 0 ? 500 : (scanhold * 1000))) { if (scanmem) { memorypos++; if (memorypos > scanstop) memorypos = scanstart; diff --git a/src/gui.cpp b/src/gui.cpp index f07ff3d..2a13241 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -885,7 +885,7 @@ void ShowOneLine(byte position, byte item, bool selected) { FullLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); FullLineSprite.drawString(removeNewline(myLanguage[language][92]), 298, 2); FullLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); - FullLineSprite.drawString(String(scanhold, DEC), 258, 2); + FullLineSprite.drawString((scanhold == 0 ? "0.5" : String(scanhold, DEC)), 258, 2); break; } break; @@ -2525,13 +2525,13 @@ void MenuUp() { case ITEM4: scanhold++; - if (scanhold > 30) scanhold = 1; + if (scanhold > 30) scanhold = 0; OneBigLineSprite.setTextDatum(TL_DATUM); OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); OneBigLineSprite.drawString(myLanguage[language][92], 155, 0); OneBigLineSprite.setTextDatum(TR_DATUM); OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); - OneBigLineSprite.drawString(String(scanhold, DEC), 135, 0); + OneBigLineSprite.drawString((scanhold == 0 ? "0.5" : String(scanhold, DEC)), 135, 0); OneBigLineSprite.pushSprite(24, 118); break; @@ -3391,13 +3391,13 @@ void MenuDown() { case ITEM4: scanhold--; - if (scanhold < 1) scanhold = 30; + if (scanhold > 30) scanhold = 30; OneBigLineSprite.setTextDatum(TL_DATUM); OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); OneBigLineSprite.drawString(myLanguage[language][92], 155, 0); OneBigLineSprite.setTextDatum(TR_DATUM); OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); - OneBigLineSprite.drawString(String(scanhold, DEC), 135, 0); + OneBigLineSprite.drawString((scanhold == 0 ? "0.5" : String(scanhold, DEC)), 135, 0); OneBigLineSprite.pushSprite(24, 118); break; @@ -4278,7 +4278,7 @@ void DoMenu() { OneBigLineSprite.drawString(myLanguage[language][92], 155, 0); OneBigLineSprite.setTextDatum(TR_DATUM); OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false); - OneBigLineSprite.drawString(String(scanhold, DEC), 135, 0); + OneBigLineSprite.drawString((scanhold == 0 ? "0.5" : String(scanhold, DEC)), 135, 0); OneBigLineSprite.pushSprite(24, 118); break;