Mods f non-LoRa

Mod main and parameter menu for systems without LoRa Eliminate audio level adjust for systems w digital audio codec
oe1wkl · Jan 25, 2025 · 254e667 · 254e667
1 parent 14c1de3
commit 254e667
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/Software/src/Version 6/MorseMenu.cpp b/Software/src/Version 6/MorseMenu.cpp
@@ -115,10 +115,17 @@ const uint8_t menuNav [menuN] [5] = {                   // { level, left, right,
   {2,_kochEchoAbb,_kochEchoMixed,_kochEcho,0},          // 27 koch echo words  -e
   {2,_kochEchoWords,_kochEchoAdaptive,_kochEcho,0},     // 28 koch echo mixed  -e
   {2,_kochEchoMixed,_kochEchoRand,_kochEcho,0},         // 29 koch echo adaptive  -e
+#ifdef LORA_DISABLED
+  {0,_koch,_decode,_dummy,_trxWifi},                    // 30 transceiver
+  {1,_trxIcw,_trxWifi,_trx,0},                          // 31 lora  -e
+  {1,_trxIcw,_trxIcw,_trx,0},                          // 32 wifi  -e
+  {1,_trxWifi,_trxWifi,_trx,0},                         // 33 icw  -e
+#else
   {0,_koch,_decode,_dummy,_trxLora},                    // 30 transceiver
   {1,_trxIcw,_trxWifi,_trx,0},                          // 31 lora  -e
   {1,_trxLora,_trxIcw,_trx,0},                          // 32 wifi  -e
   {1,_trxWifi,_trxLora,_trx,0},                         // 33 icw  -e
+ #endif
   {0,_trx,_wifi,_dummy,0},                              // 34 decoder  -e
   {0,_decode,_goToSleep,_dummy,_wifi_mac},              // 35 WiFi
   {1,_wifi_select,_wifi_config,_wifi,0},                // 36 Disp Mac  -e!!

diff --git a/Software/src/Version 6/MorsePreferences.cpp b/Software/src/Version 6/MorsePreferences.cpp
@@ -221,13 +221,23 @@ parameter MorsePreferences::pliste[] = {
     true,
     {"Never", "CW Keyer only", "Keyer & Gen.", "Keyer&Gen.&RX"}
   },
+#ifdef LORA_DISABLED
+ {
+    0, 0, 1,  1,                                                // transmit generated/played things via LoRa or WiFi?
+    "Generator Tx",
+    "Generated CW to be sent by WiFi?",
+    true,
+    {"WiFi Tx OFF",  "WiFi Tx ON"}
+  },
+#else
   {
     0, 0, 2,  1,                                                // transmit generated/played things via LoRa or WiFi?
     "Generator Tx",
-    "Generated CW to be sent by LoRa or Wifi?",
+    "Generated CW to be sent by LoRa or WiFi?",
     true,
     {"Tx OFF", "LoRa Tx ON", "WiFi Tx ON"}
   },
+#endif
   {
     0, 0, 1, 1,                                                 //  0: "Wide" 1: "Narrow"
     "Bandwidth",
@@ -463,7 +473,11 @@ uint8_t MorsePreferences::memPtr = 0;
                                                    posInterCharSpace, posInterWordSpace, posRandomOption, posRandomLength, posCallLength, posAbbrevLength,  posWordLength, 
                                                    posMaxSequence, posAutoStop, posGeneratorDisplay, posRandomFile, posWordDoubler, 
                                                    posEchoRepeats, posEchoDisplay, posEchoConf, posEchoToneShift, posSpeedAdapt, 
-                                                   posKeyExternalTx, posLoraCwTransmit, posLoraChannel, posGoertzelBandwidth, posExtAudioOnDecode 
+                                                   posKeyExternalTx, posLoraCwTransmit, 
+                                              #ifndef LORA_DISABLED
+                                                   posLoraChannel, 
+                                              #endif
+                                                   posGoertzelBandwidth, posExtAudioOnDecode 
                                                  };
 
 prefPos *MorsePreferences::currentOptions = MorsePreferences::allOptions;

diff --git a/Software/src/Version 6/m32_v6.ino b/Software/src/Version 6/m32_v6.ino
@@ -2630,6 +2630,10 @@ void audioLevelAdjust() {
     uint16_t dataSize = 1216;
     uint16_t testData[dataSize];
 
+  #ifdef CONFIG_SOUND_I2S
+    return;
+  #endif
+
     MorseOutput::clearDisplay();
     MorseOutput::printOnScroll(0, BOLD, 0, "Audio In Adj.");
     MorseOutput::printOnScroll(1, REGULAR, 0, "End with RED");