From 92c4f043930bcc5d7a3de46ce1f0ab9e9cee3ec9 Mon Sep 17 00:00:00 2001
From: Sjef Verhoeven PE5PVB <pe5pvb@het-bar.net>
Date: Wed, 19 Mar 2025 11:56:26 +0100
Subject: [PATCH] Optimise default settings

---
 TEF6686_ESP32.ino | 20 ++++++++++++--------
 src/config.h      |  1 -
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index 58742fd..f7c0a90 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -4582,7 +4582,7 @@ void DefaultSettings() {
   EEPROM.writeByte(EE_BYTE_LEVELOFFSET, 0);
   EEPROM.writeByte(EE_BYTE_RTBUFFER, 1);
   EEPROM.writeByte(EE_BYTE_EDGEBEEP, 0);
-  EEPROM.writeByte(EE_BYTE_SOFTMUTEAM, 0);
+  EEPROM.writeByte(EE_BYTE_SOFTMUTEAM, 1);
   EEPROM.writeByte(EE_BYTE_SOFTMUTEFM, 0);
   EEPROM.writeUInt(EE_UINT16_FREQUENCY_AM, 828);
   EEPROM.writeByte(EE_BYTE_LANGUAGE, 0);
@@ -4607,9 +4607,6 @@ void DefaultSettings() {
   EEPROM.writeUInt(EE_UINT16_FREQUENCY_LW, 180);
   EEPROM.writeUInt(EE_UINT16_FREQUENCY_MW, 540);
   EEPROM.writeUInt(EE_UINT16_FREQUENCY_SW, 1800);
-#ifdef HAS_AIR_BAND
-  EEPROM.writeUInt(EE_UINT16_FREQUENCY_AIR, 135350);
-#endif
   EEPROM.writeString(EE_STRING_XDRGTK_KEY, "password");
   EEPROM.writeString(EE_STRING_RABBITEARSUSER, "");
   EEPROM.writeString(EE_STRING_RABBITEARSPASSWORD, "");
@@ -4642,10 +4639,6 @@ void DefaultSettings() {
   EEPROM.writeByte(EE_BYTE_FASTPS, 1);
   EEPROM.writeByte(EE_BYTE_TOT, 0);
   EEPROM.writeByte(EE_BYTE_MWREGION, 0);
-#ifdef HAS_AIR_BAND
-  EEPROM.writeByte(EE_BYTE_AIRSTEPSIZE, 0);
-#endif
-  EEPROM.writeByte(EE_BYTE_SPISPEED, 0);
   EEPROM.writeByte(EE_BYTE_AMSCANSENS, 4);
   EEPROM.writeByte(EE_BYTE_FMSCANSENS, 4);
   EEPROM.writeByte(EE_BYTE_FREQFONT, 3);
@@ -4682,6 +4675,17 @@ void DefaultSettings() {
   EEPROM.writeByte(EE_BYTE_CLOCKAMPM, 0);
   EEPROM.writeUInt(EE_UINT16_PICTLOCK, 0);
 
+#ifdef HAS_AIR_BAND
+  EEPROM.writeUInt(EE_UINT16_FREQUENCY_AIR, 135350);
+  EEPROM.writeByte(EE_BYTE_AIRSTEPSIZE, 0);
+#endif
+
+#ifdef DYNAMIC_SPI_SPEED
+  EEPROM.writeByte(EE_BYTE_SPISPEED, 7);
+#else
+  EEPROM.writeByte(EE_BYTE_SPISPEED, 0);
+#endif
+
 #ifdef DEEPELEC_DP_66X
   EEPROM.writeByte(EE_BYTE_ROTARYMODE, 1);
   EEPROM.writeByte(EE_BYTE_INVERTDISPLAY, 0);
diff --git a/src/config.h b/src/config.h
index 567ee66..e28f824 100644
--- a/src/config.h
+++ b/src/config.h
@@ -4,7 +4,6 @@
 #include <Arduino.h>
 
 // #define HAS_AIR_BAND        // uncomment to enable Air Band(Make sure you have Air Band extend board)
-// #define CHINA_PORTABLE      // uncomment for China Portable build (Simplified Chinese)
 // #define DEEPELEC_DP_66X     // uncomment for DEEPELEC Portable DP-66X build (Simplified Chinese)
 
 #endif