From 55799ebe93578e4e42b9e1f2b06f2e4d3fb8de64 Mon Sep 17 00:00:00 2001
From: Sjef Verhoeven PE5PVB <pe5pvb@het-bar.net>
Date: Thu, 29 Feb 2024 13:02:50 +0100
Subject: [PATCH] Added mono/stereo switch on XDRGTK/server connection

Fix missing stereo flag when screenmute was active.
---
 TEF6686_ESP32.ino |  3 ++-
 src/comms.cpp     | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index 6c196e3..684343d 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -1017,10 +1017,11 @@ void GetData() {
     showPS();
   }
 
+  ShowStereoStatus();
+
   if (!screenmute) {
     ShowRSSI();
     ShowOffset();
-    ShowStereoStatus();
     ShowBW();
     updateCodetect();
     if (millis() >= tuningtimer + 200) ShowBattery();
diff --git a/src/comms.cpp b/src/comms.cpp
index d4582ef..7355008 100644
--- a/src/comms.cpp
+++ b/src/comms.cpp
@@ -250,8 +250,12 @@ void XDRGTKRoutine() {
         DataPrint("C0\n");
         break;
 
-      case 'N':
-        doStereoToggle();
+      case 'B':
+        byte stmo;
+		stmo = atol(buff + 1);
+		DataPrint("B" + String(stmo) + "\n");
+		if (stmo == 0) StereoToggle = false; else StereoToggle = true;
+		doStereoToggle();
         break;
 
       case 'D':
@@ -504,7 +508,15 @@ void XDRGTKRoutine() {
         break;
 
       case 'x':
-        DataPrint("OK\nT" + String(frequency * 10) + "\n");
+        DataPrint("OK\n");
+		if (BAND_FM) {
+			DataPrint("T" + String(frequency + (ConverterSet * 100) * 10) + "\n");
+		} else if (BAND_OIRT) {
+			DataPrint("T" + String(frequency_OIRT * 10) + "\n");
+		} else {
+			DataPrint("T" + String(frequency_AM) + "\n");
+		}
+		if (StereoToggle) DataPrint("B0\n"); else DataPrint("B1\n");
         if (XDRGTKMuteScreen) MuteScreen(1);
         break;
 
@@ -557,7 +569,7 @@ void XDRGTKRoutine() {
       DataPrint("Sm");
     } else {
       if (!StereoToggle) {
-        DataPrint("SS");
+        DataPrint("SM");
       } else if (Stereostatus) {
         DataPrint("Ss");
       } else {