disable currently unsupported stuff

future-proof-iot · Nov 15, 2023 · c08d987 · c08d987
1 parent 27503a3
commit c08d987
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ repository = "https://github.com/future-proof-iot/riot-rs"
 
 [workspace.dependencies]
 cfg-if = { version = "1.0.0" }
-cortex-m = { version = "0.7", default-features = false }
+cortex-m = { version = "0.7", default-features = false, features = [ "inline-asm" ] }
 cortex-m-rt = { version = "0.7" }
 cortex-m-semihosting = { version = "0.5" }
 critical-section = { version = "1.1.2" }

diff --git a/examples/benchmark/src/main.rs b/examples/benchmark/src/main.rs
@@ -1,7 +1,7 @@
 #![no_main]
 #![no_std]
 
-use riot_rs::debug::println;
+use riot_rs::rt::debug::println;
 
 #[no_mangle]
 fn riot_main() {

diff --git a/examples/bottles/laze.yml b/examples/bottles/laze.yml
@@ -1,6 +1,7 @@
 apps:
   - name: bottles
     selects:
+      - riot-c
       - release
     env:
       global:

diff --git a/examples/laze.yml b/examples/laze.yml
@@ -1,8 +1,14 @@
+defaults:
+  apps:
+    context:
+      - riot-rs
+
 subdirs:
   - benchmark
   - bottles
   - core-sizes
   - embassy
+    #  - embassy-gpio
   - hello-world
   - minimal
   - riot-app

diff --git a/examples/riot-app/laze.yml b/examples/riot-app/laze.yml
@@ -1,6 +1,7 @@
 apps:
   - name: riot-app
     selects:
+      - riot-c
       - ?release
     env:
       global:
@@ -11,6 +12,7 @@ apps:
 
   - name: riot-appdir
     selects:
+      - riot-c
       - ?release
     env:
       global:

diff --git a/examples/riot-wrappers-mutex/laze.yml b/examples/riot-wrappers-mutex/laze.yml
@@ -1,4 +1,5 @@
 apps:
   - name: riot-wrappers-mutex
     selects:
+      - riot-c
       - ?release
diff --git a/examples/rust-gcoap/laze.yml b/examples/rust-gcoap/laze.yml
@@ -1,6 +1,7 @@
 apps:
   - name: rust-gcoap
     selects:
+      - riot-c
       - ?release
     env:
       global:

diff --git a/laze-project.yml b/laze-project.yml
@@ -7,9 +7,6 @@ contexts:
 
   # base context for all RIOT-rs applications
   - name: riot-rs
-    selects:
-      - ?newlib
-      - riot-sources
 
     env:
       RUSTFLAGS:
@@ -419,6 +416,12 @@ modules:
     selects:
       - riot_libc|newlib
 
+  - name: riot-c
+    selects:
+      - "riot-c-currently-unsupported"
+      - ?newlib
+      - riot-sources
+
   - name: newlib
     context: riot-rs
     env:

diff --git a/src/riot-rs-core/Cargo.toml b/src/riot-rs-core/Cargo.toml
@@ -17,7 +17,7 @@ ringbuffer = { path = "../lib/ringbuffer" }
 thread_info = []
 
 [build-dependencies]
-cbindgen = "0.15.*"
+cbindgen = "0.26.*"
 
 [dev-dependencies]
 riot-rs-rt = { path = "../riot-rs-rt" }

diff --git a/src/riot-rs-core/laze.yml b/src/riot-rs-core/laze.yml
@@ -1 +1,3 @@
 apps:
+  - selects:
+    - "disabled_until_test_framework_fixed"
diff --git a/src/riot-rs-rt/laze.yml b/src/riot-rs-rt/laze.yml
@@ -1 +1,3 @@
 apps:
+  - selects:
+    - "disabled_until_test_framework_fixed"