up

Cargo.toml

@@ -1,27 +1,30 @@
 [workspace]
-members = ["tflite_demo", "lsm6ds3tr_demo"]
+members = [
+    "tflite_demo",
+    "lsm6ds3tr_demo",
+    "bluetooth_demo",
+    "blinky",
+    "bluetooth_recorder",
+]
+resolver = "2"
 
 [workspace.features]
-default = ["ble-l2cap", "ble-gatt-server", "ble-gatt-client", "ble-sec"]
+nrf52840 = ["embassy-nrf/nrf52840", "nrf-sdc/nrf52840"]
 
-ble-l2cap = ["nrf-softdevice/ble-l2cap"]
-ble-gatt-server = ["nrf-softdevice/ble-gatt-server"]
-ble-gatt-client = ["nrf-softdevice/ble-gatt-client"]
-ble-sec = ["nrf-softdevice/ble-sec"]
-
-nrf52840 = [
-    "embassy-nrf/nrf52840",
-    "nrf-softdevice/nrf52840",
-    "nrf-softdevice/s140",
-    "dep:nrf-softdevice-s140",
+defmt = [
+    "dep:defmt",
+    "trouble-host/defmt",
+    "bt-hci/defmt",
+    "embedded-io/defmt-03",
+    "embedded-hal/defmt-03",
 ]
+security = ["trouble-host/security"]
 
 [workspace.dependencies]
-assign-resources = "0.4.1"
 embassy-futures = { version = "0.1.0" }
 embassy-usb = { version = "0.3.0", features = ["defmt"] }
 embassy-executor = { version = "0.7.0", features = [
-    "task-arena-size-32768",
+    # "task-arena-size-32768",
     "arch-cortex-m",
     "executor-thread",
     "executor-interrupt",
@@ -41,38 +44,62 @@ embassy-nrf = { version = "0.3.1", features = [
     "reset-pin-as-gpio",
 ] }
 embassy-embedded-hal = "0.3.0"
-cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
-cortex-m-rt = "0.7.0"
-defmt = "0.3"
-defmt-rtt = "0.4"
+embassy-sync = { version = "0.7.0" }
+
+futures = { version = "0.3", default-features = false, features = [
+    "async-await",
+] }
+nrf-sdc = { version = "0.1.0", default-features = false, features = [
+    "defmt",
+    "peripheral",
+    "central",
+    "nrf52",
+] }
+nrf-mpsl = { version = "0.1.0", default-features = false, features = [
+    "defmt",
+    "critical-section-impl",
+    "nrf52",
+] }
+bt-hci = { version = "0.3", default-features = false, features = ["defmt"] }
+trouble-host = { version = "0.2.0", features = ["derive", "scan"] }
+trouble-example-apps = { version = "0.1.0", path = "trouble-example-apps", features = [
+    "defmt",
+] }
+
+defmt = "1.0.1"
+defmt-rtt = "1.0.0"
+
+# cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
+cortex-m = { version = "0.7.6" }
+cortex-m-rt = "0.7.5"
 panic-probe = { version = "0.3", features = ["print-defmt"] }
-nrf52840-hal = "0.16.0"
-usb-device = "0.2.7"
-usbd-serial = "0.1.0"
-microflow = { path = "../microflow-rs" }
-# nalgebra = { version = "0.33.2", default-features = false, features = [
-#     "macros",
-# ] }
-libm = "0.2"
+rand = { version = "0.8.5", default-features = false }
+static_cell = "2.0.0"
+rand_core = { version = "0.6" }
+rand_chacha = { version = "0.3", default-features = false }
+
+libm = "0.2.15"
 panic-halt = "1.0.0"
 heapless = "0.8.0"
-lsm6ds3tr = { git = "https://avoid.sh/PetActivityMonitor/lsm6ds3tr.git", rev = "b368f6200c3ec9a84114e8ca137eb5fe0aa08e29", features = [
+lsm6ds3tr = { git = "https://hax.avoid.sh/PetActivityMonitor/lsm6ds3tr.git", rev = "b368f6200c3ec9a84114e8ca137eb5fe0aa08e29", features = [
     "defmt",
 ] }
-embassy-sync = { version = "0.5.0" }
-embedded-storage = "0.3.0"
-embedded-hal = "1.0.0"
-embedded-hal-async = { version = "1.0.0" }
-embedded-alloc = "0.6.0"
-nrf-softdevice = { version = "0.1.0", features = [
-    "defmt",
-    "ble-peripheral",
-    "ble-central",
-    "critical-section-impl",
-    "nrf52840",
-    "s140",
-] }
-nrf-softdevice-s140 = { version = "0.1.1" }
+assign-resources = "0.4.1"
+
 fixed = "1.24.0"
 atomic-pool = "1.0.1"
-static_cell = "2.0.0"
+critical-once-cell = "0.2.0"
+
+microflow = { version = "0.1.3" }
+
+[patch.crates-io]
+nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "7be9b853e15ca0404d65c623d1ec5795fd96c204" }
+nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "7be9b853e15ca0404d65c623d1ec5795fd96c204" }
+
+embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", rev = "f35aa4005a63e8d478b2b95aaa2bfb316b72dece" }
+embassy-nrf = { git = "https://github.com/embassy-rs/embassy.git", rev = "f35aa4005a63e8d478b2b95aaa2bfb316b72dece" }
+embassy-sync = { git = "https://github.com/embassy-rs/embassy.git", rev = "f35aa4005a63e8d478b2b95aaa2bfb316b72dece" }
+embassy-futures = { git = "https://github.com/embassy-rs/embassy.git", rev = "f35aa4005a63e8d478b2b95aaa2bfb316b72dece" }
+embassy-time = { git = "https://github.com/embassy-rs/embassy.git", rev = "f35aa4005a63e8d478b2b95aaa2bfb316b72dece" }
+embassy-time-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "f35aa4005a63e8d478b2b95aaa2bfb316b72dece" }
+embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy.git", rev = "f35aa4005a63e8d478b2b95aaa2bfb316b72dece" }