From 41e3c6be1fe8439dfd8c8f04a7fb2c74f9f4c33a Mon Sep 17 00:00:00 2001
From: Sjef Verhoeven PE5PVB <pe5pvb@het-bar.net>
Date: Fri, 13 Oct 2023 19:15:31 +0200
Subject: [PATCH] Some more AF finetuning

---
 src/TEF6686.cpp | 7 +++++++
 src/rds.cpp     | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp
index 2612d9c..9a075f4 100644
--- a/src/TEF6686.cpp
+++ b/src/TEF6686.cpp
@@ -548,6 +548,7 @@ void TEF6686::readRDS(byte showrdserrors)
                       if (af[x].frequency == buffer0 && !af[x].regional) {
                         af[x].regional = true;
                         af_updatecounter++;
+						break;
                       }
                     }
                   } else if (buffer1 == currentfreq && buffer0 < buffer1) {
@@ -555,6 +556,7 @@ void TEF6686::readRDS(byte showrdserrors)
                       if (af[x].frequency == buffer0 && !af[x].mixed) {
                         af[x].mixed = true;
                         af_updatecounter++;
+						break;
                       }
                     }
                   }
@@ -564,6 +566,7 @@ void TEF6686::readRDS(byte showrdserrors)
                       if (af[x].frequency == buffer1 && !af[x].regional) {
                         af[x].regional = true;
                         af_updatecounter++;
+						break;
                       }
                     }
                   } else if (buffer0 == currentfreq && buffer0 < buffer1) {
@@ -571,6 +574,7 @@ void TEF6686::readRDS(byte showrdserrors)
                       if (af[x].frequency == buffer0 && !af[x].mixed) {
                         af[x].mixed = true;
                         af_updatecounter++;
+						break;
                       }
                     }
                   }
@@ -613,14 +617,17 @@ void TEF6686::readRDS(byte showrdserrors)
                           bool temp3 = af[j].afvalid;
                           bool temp4 = af[j].checked;
                           bool temp5 = af[j].regional;
+						  bool temp6 = af[j].mixed;
                           af[j].frequency = af[j + 1].frequency;
                           af[j].afvalid = af[j + 1].afvalid;
                           af[j].checked = af[j + 1].checked;
                           af[j].regional = af[j + 1].regional;
+						  af[j].mixed = af[j + 1].mixed;
                           af[j + 1].frequency = temp;
                           af[j + 1].afvalid = temp3;
                           af[j + 1].checked = temp4;
                           af[j + 1].regional = temp5;
+						  af[j + 1].mixed = temp6;
                         }
                       }
                     }
diff --git a/src/rds.cpp b/src/rds.cpp
index 2558489..3a9dee0 100644
--- a/src/rds.cpp
+++ b/src/rds.cpp
@@ -830,11 +830,11 @@ void ShowAFEON() {
       for (byte i = 0; i < radio.af_counter; i++) {
         byte x = i - (afpagenr == 2 ? 30 : 0);
         if (radio.af[i].checked) {
-          if (!screenmute) tftPrint(1, ((radio.afmethodB && radio.af[i].regional && radio.af[i].mixed) ? "M " : (radio.afmethodB && radio.af[i].regional && !radio.af[i].mixed ? "R " : "")) + String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10), 50 + (x > 9 ? 54 : 0) + (x > 19 ? 54 : 0), 48 + (15 * x) - (x > 9 ? 150 : 0) - (x > 19 ? 150 : 0), InsignificantColor, InsignificantColorSmooth, 16);
+          if (!screenmute) tftPrint(1, ((radio.afmethodB && radio.af[i].regional && radio.af[i].mixed) ? "M " : (radio.afmethodB && radio.af[i].regional && !radio.af[i].mixed ? "R " : "")) + String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10), 55 + (x > 9 ? 54 : 0) + (x > 19 ? 54 : 0), 48 + (15 * x) - (x > 9 ? 150 : 0) - (x > 19 ? 150 : 0), InsignificantColor, InsignificantColorSmooth, 16);
         } else if (!radio.af[i].afvalid) {
-          if (!screenmute) tftPrint(1, ((radio.afmethodB && radio.af[i].regional && radio.af[i].mixed) ? "M " : (radio.afmethodB && radio.af[i].regional && !radio.af[i].mixed ? "R " : "")) + String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10), 50 + (x > 9 ? 54 : 0) + (x > 19 ? 54 : 0), 48 + (15 * x) - (x > 9 ? 150 : 0) - (x > 19 ? 150 : 0), SignificantColor, SignificantColorSmooth, 16);
+          if (!screenmute) tftPrint(1, ((radio.afmethodB && radio.af[i].regional && radio.af[i].mixed) ? "M " : (radio.afmethodB && radio.af[i].regional && !radio.af[i].mixed ? "R " : "")) + String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10), 55 + (x > 9 ? 54 : 0) + (x > 19 ? 54 : 0), 48 + (15 * x) - (x > 9 ? 150 : 0) - (x > 19 ? 150 : 0), SignificantColor, SignificantColorSmooth, 16);
         } else {
-          if (!screenmute) tftPrint(1, ((radio.afmethodB && radio.af[i].regional && radio.af[i].mixed) ? "M " : (radio.afmethodB && radio.af[i].regional && !radio.af[i].mixed ? "R " : "")) + String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10), 50 + (x > 9 ? 54 : 0) + (x > 19 ? 54 : 0), 48 + (15 * x) - (x > 9 ? 150 : 0) - (x > 19 ? 150 : 0), PrimaryColor, PrimaryColorSmooth, 16);
+          if (!screenmute) tftPrint(1, ((radio.afmethodB && radio.af[i].regional && radio.af[i].mixed) ? "M " : (radio.afmethodB && radio.af[i].regional && !radio.af[i].mixed ? "R " : "")) + String(radio.af[i].frequency / 100) + "." + String((radio.af[i].frequency % 100) / 10), 55 + (x > 9 ? 54 : 0) + (x > 19 ? 54 : 0), 48 + (15 * x) - (x > 9 ? 150 : 0) - (x > 19 ? 150 : 0), PrimaryColor, PrimaryColorSmooth, 16);
         }
         if (i == 29  + (afpagenr == 2 ? 30 : 0)) i = 254;
       }