[RP2350] activate Bluetooth SPP and LE

Author: lyusupov

software/firmware/source/SkyView/Platform_RP2XXX.h

@@ -27,9 +27,6 @@
 #define Serial_setDebugOutput(x) ({})
 #define WIFI_STA_TIMEOUT         20000
 extern WebServer server;
-#if PICO_SDK_VERSION_MAJOR == 2
-#define EXCLUDE_BLUETOOTH
-#endif /* PICO_SDK_VERSION_MAJOR */
 #else
 #include <Arduino.h>
 #define EXCLUDE_WIFI

software/firmware/source/SoftRF/src/driver/Bluetooth.h

@@ -46,7 +46,7 @@ enum
 #include "../platform/bluetooth/ArduinoBLE.h"
 #endif /* USE_ARDUINOBLE */
 #elif defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ARCH_RP2350)
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(ARDUINO_RASPBERRY_PI_PICO_W) || defined(ARDUINO_RASPBERRY_PI_PICO_2W)
 #include "../platform/bluetooth/BTstack.h"
 #elif defined(ARDUINO_NANO_RP2040_CONNECT)
 #if defined(USE_ARDUINOBLE)

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

@@ -243,9 +243,6 @@ struct rst_info {
 #define Serial_setDebugOutput(x) ({})
 #define WIFI_STA_TIMEOUT      20000
 #define NMEA_TCP_SERVICE
-#if PICO_SDK_VERSION_MAJOR == 2
-#define EXCLUDE_BLUETOOTH
-#endif /* PICO_SDK_VERSION_MAJOR */
 /* Experimental */
 //#define ENABLE_BT_VOICE
 #else

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

@@ -699,7 +699,7 @@ static void CYW43_Bluetooth_setup()
       static char Hardware[9];
       snprintf(Hardware,  sizeof(Hardware),  "%08X", hw_info.revision);
 
-      const char *Firmware = "Arduino RP2040 " ARDUINO_PICO_VERSION_STR;
+      const char *Firmware = "Arduino RP2XXX " ARDUINO_PICO_VERSION_STR;
 
       // Setup device information service
       device_information_service_server_init();