[ESP32-S3] build of audio component with Core 3.0.x [skip ci]

lyusupov · Jun 7, 2024 · 0b7843e · 0b7843e
1 parent 07d048c
commit 0b7843e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/software/firmware/source/SkyView/Platform_ESP32.h b/software/firmware/source/SkyView/Platform_ESP32.h
@@ -140,9 +140,7 @@
 //#define USE_ADAFRUIT_MSC
 
 // Audio
-#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR>=5
-#define EXCLUDE_AUDIO
-#endif /* ESP_IDF_VERSION_MAJOR */
+//#define EXCLUDE_AUDIO
 
 #if !defined(EXCLUDE_AUDIO)
 //#define USE_EXT_I2S_DAC

diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.h b/software/firmware/source/SoftRF/src/platform/ESP32.h
@@ -432,9 +432,7 @@ extern const USB_Device_List_t supported_USB_devices[];
 #define USE_SA8X8
 /* Experimental */
 #define ENABLE_REMOTE_ID
-#if defined(ESP_IDF_VERSION_MAJOR) && ESP_IDF_VERSION_MAJOR >= 5
-#define EXCLUDE_VOICE_MESSAGE
-#endif /* ESP_IDF_VERSION_MAJOR */
+//#define EXCLUDE_VOICE_MESSAGE
 #endif /* S3 */
 
 #if defined(CONFIG_IDF_TARGET_ESP32S2)

diff --git a/software/firmware/source/SoftRF/src/platform/nRF52.cpp b/software/firmware/source/SoftRF/src/platform/nRF52.cpp
@@ -800,8 +800,10 @@ static void nRF52_setup()
       hw_info.mag = MAG_AK8963;
       IMU_Time_Marker = millis();
     } else {
+      bool ad0 = (ICM20948_ADDRESS == 0x69) ? true : false;
+
       for (int t=0; t<3; t++) {
-        if (imu_2.begin(Wire, false) == ICM_20948_Stat_Ok) {
+        if (imu_2.begin(Wire, ad0) == ICM_20948_Stat_Ok) {
           hw_info.imu = IMU_ICM20948;
           hw_info.mag = MAG_AK09916;
           IMU_Time_Marker = millis();