[nRF52] build MBED target with ArduinoBLE

lyusupov · Aug 14, 2024 · 2b390d8 · 2b390d8
1 parent 116673d
commit 2b390d8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -357,8 +357,12 @@ jobs:
           fi
           if [[ "$BOARD" =~ "arduino:mbed_edge:" ]]; then
             arduino --pref "boardsmanager.additional.urls=https://downloads.arduino.cc/packages/package_index.json" --save-prefs ;
-            arduino --install-boards arduino:mbed_edge:4.1.1 ;
+            arduino --install-boards arduino:mbed_edge:4.1.5 ;
             arduino --board $BOARD --save-prefs ;
+            wget https://github.com/arduino-libraries/ArduinoBLE/archive/refs/tags/${ARDUINO_BLE_VERSION}.tar.gz ;
+            tar xzf ${ARDUINO_BLE_VERSION}.tar.gz ;
+            rm ${ARDUINO_BLE_VERSION}.tar.gz ;
+            mv ArduinoBLE-${ARDUINO_BLE_VERSION} $HOME/Arduino/libraries/ ;
             cd $GITHUB_WORKSPACE ;
           fi
           if [[ "$BOARD" =~ "arduino:samd:" ]]; then

diff --git a/software/firmware/source/SoftRF/src/driver/Bluetooth.h b/software/firmware/source/SoftRF/src/driver/Bluetooth.h
@@ -40,6 +40,11 @@ enum
 #endif /* EXCLUDE_BLUETOOTH */
 #elif defined(ARDUINO_ARCH_NRF52)
 #include "../platform/bluetooth/Bluefruit.h"
+#elif defined(ARDUINO_ARCH_NRF52840)
+#include "../system/SoC.h"
+#if defined(USE_ARDUINOBLE)
+#include "../platform/bluetooth/ArduinoBLE.h"
+#endif /* USE_ARDUINOBLE */
 #elif defined(ARDUINO_ARCH_RP2040) && defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include "../platform/bluetooth/BTstack.h"
 #elif defined(ARDUINO_ARCH_RENESAS) || defined(ARDUINO_ARCH_SILABS)

diff --git a/software/firmware/source/SoftRF/src/platform/nRF52.cpp b/software/firmware/source/SoftRF/src/platform/nRF52.cpp
@@ -3187,7 +3187,11 @@ const SoC_ops_t nRF52_ops = {
   nRF52_swSer_begin,
   nRF52_swSer_enableRx,
 #if !defined(EXCLUDE_BLUETOOTH)
+#if defined(USE_ARDUINOBLE)
+  &ArdBLE_Bluetooth_ops,
+#else
   &nRF52_Bluetooth_ops,
+#endif /* USE_ARDUINOBLE */
 #else
   NULL,
 #endif /* EXCLUDE_BLUETOOTH */

diff --git a/software/firmware/source/SoftRF/src/platform/nRF52.h b/software/firmware/source/SoftRF/src/platform/nRF52.h
@@ -115,6 +115,10 @@ struct rst_info {
 
 #if defined(ARDUINO_ARCH_MBED)
 #define PCF8563_SLAVE_ADDRESS (0x51)
+
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+#define ARDUINO_CORE_VERSION  STR(CORE_MAJOR) "." STR(CORE_MINOR) "." STR(CORE_PATCH)
 #endif /* ARDUINO_ARCH_MBED */
 
 #define MIDI_CHANNEL_TRAFFIC  1
@@ -339,7 +343,8 @@ struct rst_info {
 //#define USE_TFT
 #else
 #undef USE_EPAPER
-#define EXCLUDE_BLUETOOTH
+//#define EXCLUDE_BLUETOOTH
+#define USE_ARDUINOBLE
 #define EXCLUDE_IMU
 #define EXCLUDE_BME280AUX
 #endif /* ARDUINO_ARCH_MBED */