feat(nrf-ble): add ble support for nrf52 MCUs (ariel-os#1074)

Author: ROMemories

.github/workflows/main.yml

@@ -74,8 +74,8 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ steps.get_toolchain.outputs.toolchain }}
-          # Required for checking ariel-os-esp
-          targets: riscv32imac-unknown-none-elf
+          # Required for checking ariel-os-esp and ariel-os-nrf
+          targets: riscv32imac-unknown-none-elf, thumbv7em-none-eabi
           components: clippy, rustfmt
 
       - name: rust cache
@@ -182,20 +182,23 @@ jobs:
             --
             --deny warnings
 
-      - run: echo 'RUSTFLAGS=--cfg context="nrf52840"' >> $GITHUB_ENV
+      - run: echo 'RUSTFLAGS=--cfg context="nrf52840" --cfg context="nrf52"' >> $GITHUB_ENV
       - name: clippy for nRF
         uses: clechasseur/rs-clippy-check@v3
         with:
           args: |
             --verbose
             --locked
             --features "
+                ble-central,
+                ble-peripheral,
                 embassy-nrf/nrf52840,
                 external-interrupts,
                 i2c,
                 spi,
                 "
             -p ariel-os-nrf
+            --target=thumbv7em-none-eabi
             --
             --deny warnings
 

Cargo.lock

@@ -149,6 +149,7 @@ serde = { version = "1.0.197", default-features = false }
 static_cell = { version = "2.1.1", default-features = false }
 trouble-host = "0.1"
 bt-hci = { version = "0.2.0" }
+nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "551a95436e999b4290b4a33383aa3d6747b63dd9" }
 
 [workspace.lints.rust]
 # rustc lints are documented here: https://doc.rust-lang.org/rustc/lints/listing/index.html

Cargo.toml

@@ -250,20 +250,26 @@ contexts:
     parent: nrf52
     selects:
       - cortex-m4f
+    provides:
+      - has_nrf_ble
     env:
       PROBE_RS_CHIP: nrf52832_xxAA
 
   - name: nrf52833
     parent: nrf52
     selects:
       - cortex-m4f
+    provides:
+      - has_nrf_ble
     env:
       PROBE_RS_CHIP: nrf52833_xxAA
 
   - name: nrf52840
     parent: nrf52
     selects:
       - cortex-m4f
+    provides:
+      - has_nrf_ble
     env:
       PROBE_RS_CHIP: nrf52840_xxAA
 
@@ -1136,6 +1142,15 @@ modules:
         RUSTFLAGS:
           - --cfg capability=\"hw/ble\"
 
+  - name: has_nrf_ble
+    help: Marks an incompatibility of nrf devices with the interrupt executor (MPSL crashing)
+    selects:
+      - hwrng
+    provides:
+      - has_ble
+    conflicts:
+      - executor-interrupt
+
   - name: ble-peripheral
     help: Enables BLE peripheral functionality
     selects:

laze-project.yml

@@ -19,6 +19,7 @@ embedded-hal = { workspace = true }
 embedded-hal-async = { workspace = true }
 const-sha1 = { version = "0.3.0", default-features = false }
 trouble-host = { workspace = true, optional = true }
+static_cell = { workspace = true, optional = true }
 
 [features]
 ## Enables GPIO interrupt support.
@@ -36,4 +37,4 @@ executor-thread = []
 
 _test = ["i2c", "spi", "external-interrupts"]
 
-ble = ["dep:trouble-host"]
+ble = ["dep:static_cell", "dep:trouble-host"]

src/ariel-os-embassy-common/Cargo.toml

@@ -1,5 +1,31 @@
 //! Common BLE types to be used across different HALs.
 
+use static_cell::StaticCell;
+use trouble_host::HostResources;
+
+/// Maximum Transmission Unit (MTU) for BLE connections. 27 should work for all BLE versions.
+///
+/// Since bluetooth 4.2, this can be increased to 251 bytes.
+// TODO: add the ability to configure this value.
+pub const MTU: usize = 27;
+
+/// Maximum number of concurrent connections to be handled by the BLE stack, minimum 1.
+pub const MAX_CONNS: usize = 1;
+/// Maximum number of concurrent channels to be handled by the BLE stack (not including GATT), minimum 1.
+pub const MAX_CHANNELS: usize = 1;
+
+static HOST_RESOURCES: StaticCell<BleHostResources> = StaticCell::new();
+
+/// Alias for the BLE host resources, setting the generic parameters to the constants for convenience.
+pub type BleHostResources = HostResources<MAX_CONNS, MAX_CHANNELS, MTU>;
+
+/// Initializes the BLE host resources.
+///
+/// Call this function to get the `HostResources` instance that can be used to initialize the trouBLE stack.
+pub fn get_ble_host_resources() -> &'static mut BleHostResources {
+    HOST_RESOURCES.init(HostResources::new())
+}
+
 /// Configuration for the BLE stack.
 ///
 /// You can customize it using the `ble-config-override` feature.

src/ariel-os-embassy-common/src/ble.rs

@@ -118,7 +118,13 @@ wifi-esp = ["ariel-os-hal/wifi-esp", "net", "wifi"]
 eth = []
 eth-stm32 = ["ariel-os-hal/eth-stm32", "net", "eth"]
 
-ble = ["ariel-os-hal/ble", "dep:trouble-host", "ariel-os-embassy-common/ble"]
+ble = [
+  "ariel-os-hal/ble",
+  "dep:trouble-host",
+  "ariel-os-embassy-common/ble",
+  # Some HALs need hwrng to initialize the BLE stack.
+  "hwrng",
+]
 ble-peripheral = ["ble", "ariel-os-hal/ble-peripheral"]
 ble-central = ["ble", "ariel-os-hal/ble-central"]
 

src/ariel-os-embassy/Cargo.toml

@@ -67,9 +67,9 @@ usb = [
   "ariel-os-stm32/usb",
 ]
 
-ble = ["dep:bt-hci", "dep:embedded-io", "dep:trouble-host"]
-ble-peripheral = []
-ble-central = []
+ble = ["dep:bt-hci", "dep:embedded-io", "dep:trouble-host", "ariel-os-nrf/ble"]
+ble-peripheral = ["ariel-os-nrf/ble-peripheral"]
+ble-central = ["ariel-os-nrf/ble-central"]
 
 hwrng = [
   "ariel-os-esp/hwrng",