Ham: few illustrations [skip ci]

lyusupov · Nov 29, 2023 · dda3766 · dda3766
1 parent 60f910f
commit dda3766
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/documents/images/ham-22.jpg b/documents/images/ham-22.jpg
diff --git a/documents/images/ham-23.jpg b/documents/images/ham-23.jpg
diff --git a/software/firmware/source/SkyWatch/GNSSHelper.cpp b/software/firmware/source/SkyWatch/GNSSHelper.cpp
@@ -1018,7 +1018,7 @@ static bool at65_setup()
 #endif
 
   if (SoC->id == SOC_NRF52 || SoC->id == SOC_ESP32S3 || SoC->id == SOC_PSOC4) {
-    /* Badge and Prime 3 with Quectel L76K or Mini with Luat Air530Z */
+    /* Badge, Prime 3 and Ham with Quectel L76K or Mini with Luat Air530Z */
     Serial_GNSS_Out.write("$PCAS04,7*1E\r\n"); /* GPS + GLONASS + Beidou */
   } else {
     /* other AT6558 variants: 'fake' NEO, ... */

diff --git a/software/firmware/source/SoftRF/src/driver/GNSS.cpp b/software/firmware/source/SoftRF/src/driver/GNSS.cpp
@@ -1017,7 +1017,7 @@ static bool at65_setup()
 #endif
 
   if (SoC->id == SOC_NRF52 || SoC->id == SOC_ESP32S3 || SoC->id == SOC_PSOC4) {
-    /* Badge and Prime 3 with Quectel L76K or Mini with Luat Air530Z */
+    /* Badge, Prime 3 and Ham with Quectel L76K or Mini with Luat Air530Z */
     Serial_GNSS_Out.write("$PCAS04,7*1E\r\n"); /* GPS + GLONASS + Beidou */
   } else {
     /* other AT6558 variants: 'fake' NEO, ... */

diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp
@@ -3919,14 +3919,16 @@ void handleMainEvent(AceButton* button, uint8_t eventType,
         controller.transmit();
 #if !defined(EXCLUDE_VOICE_MESSAGE)
         if (playback) {
-          delay(700);
           char filename[MAX_FILENAME_LEN];
           strcpy(filename, WAV_FILE_PREFIX);
           strcat(filename, "message");
           strcat(filename, WAV_FILE_SUFFIX);
-          play_file(filename);
-          I2S_Init((i2s_mode_t) (I2S_MODE_TX | I2S_MODE_PDM),
-                    I2S_BITS_PER_SAMPLE_16BIT);
+          if (uSD.exists(filename)) {
+            delay(700);
+            play_file(filename);
+            I2S_Init((i2s_mode_t) (I2S_MODE_TX | I2S_MODE_PDM),
+                      I2S_BITS_PER_SAMPLE_16BIT);
+          }
         }
 #endif /* EXCLUDE_VOICE_MESSAGE */
       }

diff --git a/software/firmware/source/libraries/ESP8266Audio/src/AudioOutputI2S.cpp b/software/firmware/source/libraries/ESP8266Audio/src/AudioOutputI2S.cpp
@@ -296,13 +296,13 @@ bool AudioOutputI2S::begin(bool txDAC)
 #endif
             .bck_io_num = I2S_PIN_NO_CHANGE,
             .ws_io_num = I2S_PIN_NO_CHANGE,
-            .data_out_num = 17,
+            .data_out_num = doutPin,
             .data_in_num = I2S_PIN_NO_CHANGE
         };
         i2s_set_pin((i2s_port_t)portNo, &pin_config);
 
         //Select Gpio as Digital Gpio
-        rtc_gpio_deinit((gpio_num_t) 17);
+        rtc_gpio_deinit((gpio_num_t) doutPin);
 
         // dac disable
 //        dac_output_disable(DAC_CHANNEL_1);