[ESP32-C5] build with Core 3.3.0-RC1

Author: lyusupov

.github/workflows/main.yml

@@ -206,7 +206,7 @@ jobs:
           fi
           if [[ "$BOARD" =~ "esp32:esp32:esp32c5" ]]; then
             arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json" --save-prefs ;
-            arduino --install-boards esp32:esp32:3.3.0-alpha1 ;
+            arduino --install-boards esp32:esp32:3.3.0-RC1 ;
             arduino --board $BOARD --save-prefs ;
             arduino --pref "custom_CPUFreq=esp32c5_80"                 --save-prefs ;
             arduino --pref "custom_DebugLevel=esp32c5_none"            --save-prefs ;

software/firmware/source/SkyView/BluetoothHelper.cpp

@@ -33,7 +33,7 @@
 
 #include "SkyView.h"
 
-#if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
+#if !defined(CONFIG_BT_ENABLED)
 #error Bluetooth is not enabled!
 #endif
 

software/firmware/source/SkyView/Platform_ESP32.h

@@ -250,7 +250,7 @@
 #define SOC_GPIO_PIN_USB_DP   19 /* D1 */
 #define SOC_GPIO_PIN_USB_DN   18 /* D2 */
 
-#if defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C6)
+#if defined(CONFIG_IDF_TARGET_ESP32C6)
 #define USE_NIMBLE
 #endif
 #define EXCLUDE_AUDIO

software/firmware/source/SkyWatch/BluetoothHelper.cpp

@@ -28,7 +28,7 @@
 
 #if !defined(USE_ARDUINOBLE)
 
-#if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
+#if !defined(CONFIG_BT_ENABLED)
 #error Bluetooth is not enabled!
 #endif
 
@@ -49,7 +49,9 @@
 #include <BLE2902.h>
 #endif /* USE_NIMBLE */
 
+#if !defined(CONFIG_IDF_TARGET_ESP32C5)
 #include "esp_gap_bt_api.h"
+#endif /* CONFIG_IDF_TARGET_ESP32C5 */
 
 #include "EEPROMHelper.h"
 #include "BluetoothHelper.h"

software/firmware/source/SkyWatch/Platform_ESP32.h

@@ -251,7 +251,10 @@ extern PCF8563_Class *rtc;
 #define SOC_GPIO_PIN_GNSS_RX            SOC_GPIO_PIN_TULTIMA_ESP_HS
 #define SOC_GPIO_PIN_GNSS_TX            SOC_GPIO_PIN_TULTIMA_ESP_DR
 
+#if defined(CONFIG_IDF_TARGET_ESP32C6)
 #define USE_NIMBLE
+#endif
+
 //#define USE_ARDUINOBLE
 #if defined(USE_ARDUINOBLE)
 extern IODev_ops_t ArdBLE_Bluetooth_ops;

software/firmware/source/SoftRF/src/platform/ESP32.h

@@ -533,7 +533,7 @@ extern const USB_Device_List_t supported_USB_devices[];
 #undef ENABLE_PROL
 #if defined(CONFIG_IDF_TARGET_ESP32C5)
 //#define EXCLUDE_BLUETOOTH
-#define USE_NIMBLE
+//#define USE_NIMBLE
 #define USE_SOFTSPI
 #elif defined(CONFIG_IDF_TARGET_ESP32C6)
 #define USE_NIMBLE

software/firmware/source/SoftRF/src/platform/bluetooth/Bluedroid.cpp

@@ -21,7 +21,7 @@
 
 #include "../../system/SoC.h"
 
-#if defined(CONFIG_BLUEDROID_ENABLED) && !defined(USE_NIMBLE) && !defined(USE_ARDUINOBLE)
+#if !defined(EXCLUDE_BLUETOOTH) && !defined(USE_NIMBLE) && !defined(USE_ARDUINOBLE)
 /*
  *  BLE code is based on Neil Kolban example for IDF:
  *    https://github.com/nkolban/esp32-snippets/blob/master/cpp_utils/tests/BLE%20Tests/SampleNotify.cpp
@@ -32,7 +32,9 @@
 #include <BLEServer.h>
 #include <BLE2902.h>
 
+#if !defined(CONFIG_IDF_TARGET_ESP32C5)
 #include "esp_gap_bt_api.h"
+#endif /* CONFIG_IDF_TARGET_ESP32C5 */
 
 #include "../../driver/EEPROM.h"
 #include "../../driver/Bluetooth.h"