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

Merge pull request #523 from PE5PVB/comm-fixes-frequency

Browse Source 
Comm: Fix missing newlines for frequency output; fixed FM frequency
This commit is contained in:
Sjef Verhoeven PE5PVB
2024-04-03 22:10:08 +02:00
committed by GitHub
parent 5bdacf4d5d e9f29ca204
commit e006f15470
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+7 -7
View File
@@ -799,7 +799,7 @@ void loop() {
afmethodBold = true; afmethodBold = true;
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
} }
if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10)); if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
store = true; store = true;
} }
} }
@@ -816,7 +816,7 @@ void loop() {
afmethodBold = true; afmethodBold = true;
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
} }
if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10)); if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
store = true; store = true;
} }
} }
@@ -832,7 +832,7 @@ void loop() {
afmethodBold = true; afmethodBold = true;
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
} }
if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10)); if (XDRGTKUSB || XDRGTKTCP) DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
store = true; store = true;
} }
} }
@@ -1376,7 +1376,7 @@ void BANDBUTTONPress() {
StoreFrequency(); StoreFrequency();
SelectBand(); SelectBand();
if (XDRGTKUSB || XDRGTKTCP) { if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM)); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
} }
} }
ScreensaverTimerRestart(); ScreensaverTimerRestart();
@@ -2391,7 +2391,7 @@ void KeyUp() {
break; break;
} }
if (XDRGTKUSB || XDRGTKTCP) { if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM)); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
} }
if (!memorystore) { if (!memorystore) {
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
@@ -2452,7 +2452,7 @@ void KeyDown() {
break; break;
} }
if (XDRGTKUSB || XDRGTKTCP) { if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM)); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
} }
if (!memorystore) { if (!memorystore) {
radio.clearRDS(fullsearchrds); radio.clearRDS(fullsearchrds);
@@ -3904,7 +3904,7 @@ void Seek(bool mode) {
delay(50); delay(50);
ShowFreq(0); ShowFreq(0);
if (XDRGTKUSB || XDRGTKTCP) { if (XDRGTKUSB || XDRGTKTCP) {
if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10)); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10)); else DataPrint("M1\nT" + String(frequency_AM)); if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
} }
if (band < BAND_GAP) { if (band < BAND_GAP) {
src/comms.cpp
+1 -1
View File
@@ -698,7 +698,7 @@ void XDRGTKRoutine() {
case 'x': case 'x':
DataPrint("OK\n"); DataPrint("OK\n");
if (BAND_FM) { if (BAND_FM) {
DataPrint("T" + String(frequency + (ConverterSet * 100) * 10) + "\n"); DataPrint("T" + String((frequency + ConverterSet * 100) * 10) + "\n");
} else if (BAND_OIRT) { } else if (BAND_OIRT) {
DataPrint("T" + String(frequency_OIRT * 10) + "\n"); DataPrint("T" + String(frequency_OIRT * 10) + "\n");
} else { } else {