From a0f9192530ea3fce098a1a38ff147333b8ea0781 Mon Sep 17 00:00:00 2001 From: j-devel <38098238+j-devel@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:01:38 +0700 Subject: [PATCH] Add debug/obsolete notes regarding riot-wrappers future integration --- examples/xbd-net/Cargo.toml | 7 +++++-- examples/xbd-net/debug.setup.bash | 1 + examples/xbd-net/src/lib.rs | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) mode change 100644 => 100755 examples/xbd-net/debug.setup.bash diff --git a/examples/xbd-net/Cargo.toml b/examples/xbd-net/Cargo.toml index 939b506..bbf11fd 100755 --- a/examples/xbd-net/Cargo.toml +++ b/examples/xbd-net/Cargo.toml @@ -14,6 +14,9 @@ mcu-if = { git = "https://github.com/AnimaGUS-minerva/mcu-if", rev = "254de7d", crossbeam-queue = { version = "0.3.8", default-features = false, features=["alloc"] } conquer-once = { version = "0.4.0", default-features = false } futures-util = { version = "0.3.4", default-features = false } -embassy-executor = { path = "crates/embassy/embassy-executor", default-features = false, features=["nightly"] } heapless = "0.8" -##TODO##riot-wrappers = { version = "0.8", features = [ "set_panic_handler" ] } +embassy-executor = { path = "crates/embassy/embassy-executor", default-features = false, features=["nightly"] } + +##embassy-executor = "0.5" ##TODO## undefined reference to `_critical_section_1_0_acquire' +##NG## bindgen fails regarding macros ... RIOT_CC=clang RIOT_CFLAGS= make build-native + ##riot-wrappers = { version = "0.8", features = [ "set_panic_handler", "provide_critical_section_1_0" ] } diff --git a/examples/xbd-net/debug.setup.bash b/examples/xbd-net/debug.setup.bash old mode 100644 new mode 100755 index c96393a..0683aaf --- a/examples/xbd-net/debug.setup.bash +++ b/examples/xbd-net/debug.setup.bash @@ -3,6 +3,7 @@ alias nn-notap='make run-native-notap' alias nnn='nn-notap' alias ee-wifi='make run-esp32-wroom32' +alias mr='EMU_NATIVE_TAP=tap1 make native-run-riot' alias ee='echo "assuming tap0/br0 is already set up" && make build-esp32 && RIOT_BOARD=esp32-ethernet-kit-v1_0 EMU_ESP32_NIC="tap,model=open_eth,ifname=tap0,script=no,downscript=no" make esp32-run-riot' alias nn='echo "assuming tap1 is already set up" && IPV6_AUTO=0 IPV6_ADDR=fe80::78ec:5fff:febd:add9 make build-native && EMU_NATIVE_TAP=tap1 make native-run-riot' diff --git a/examples/xbd-net/src/lib.rs b/examples/xbd-net/src/lib.rs index 59d9d92..1b38e18 100644 --- a/examples/xbd-net/src/lib.rs +++ b/examples/xbd-net/src/lib.rs @@ -61,9 +61,12 @@ pub extern fn rustmod_start( if 1 == 1 { println!("@@ [debug] `xbd_main()` with `embassy::Runtime` ..."); - get_static(&mut embassy::Runtime::new()) - .run(); // -> ! + // TODO While we will eventually migrate to RIOT's Rust build system, + // not for now, since keeping our esp32 setup stuff isn't trivial. + println!("!!!! OBSOLETE -- 'src/.rs'"); + + get_static(&mut embassy::Runtime::new()).run(); // -> ! // should be never reached } else { println!("@@ [debug] `xbd_main()` with `blogos12::Runtime` ...");