rename & unify hello-world-* (#478)

examples/README.md

@@ -9,7 +9,8 @@ This directory contains example applications that showcase how to use RIOT-rs.
 - [embassy-net-tcp/](./embassy-net-tcp): TCP echo example
 - [embassy-http-server/](./embassy-http-server): HTTP server example
 - [embassy-usb-keyboard/](./embassy-usb-keyboard): USB HID example
-- [hello-world/](./hello-world): a classic
+- [hello-world/](./hello-world): a classic, async version
+- [hello-world-threading/](./hello-world-threading): a classic, using a thread
 - [minimal/](./minimal): minimized to the max RIOT-rs config
 - [threading/](./threading): how to start and use preemptively scheduled threads
 

examples/hello-world-async/Cargo.toml → examples/hello-world-threading/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "hello-world-async"
+name = "hello-world-threading"
 version = "0.1.0"
 authors.workspace = true
 license.workspace = true
@@ -12,5 +12,3 @@ workspace = true
 [dependencies]
 riot-rs = { path = "../../src/riot-rs" }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
-
-embassy-executor = { workspace = true, default-features = false }

examples/hello-world-threading/README.md

@@ -0,0 +1,13 @@
+# hello-world
+
+## About
+
+This application is the most basic test application.
+It prints "Hello World!" _via debug console_.
+It needs to be run within a debug session.
+
+## How to run
+
+In this folder, run
+
+    laze build -b nrf52840dk run

examples/hello-world-threading/laze.yml

@@ -0,0 +1,5 @@
+apps:
+  - name: hello-world-threading
+    selects:
+      - ?release
+      - sw/threading

examples/hello-world-threading/src/main.rs

@@ -0,0 +1,12 @@
+#![no_main]
+#![no_std]
+#![feature(used_with_arg)]
+
+use riot_rs::debug::{exit, log::*};
+
+#[riot_rs::thread(autostart)]
+fn main() {
+    info!("Hello World!");
+
+    exit(Ok(()));
+}

examples/hello-world/Cargo.toml

@@ -12,3 +12,5 @@ workspace = true
 [dependencies]
 riot-rs = { path = "../../src/riot-rs" }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
+
+embassy-executor = { workspace = true, default-features = false }

examples/hello-world/README.md

@@ -1,10 +1,8 @@
-# hello-world
+# hello-world-async
 
 ## About
 
-This application is the most basic test application.
-It prints "Hello World!" _via debug console_.
-It needs to be run within a debug session.
+This application is the classic example using async Rust.
 
 ## How to run
 

examples/hello-world/laze.yml

@@ -2,4 +2,3 @@ apps:
   - name: hello-world
     selects:
       - ?release
-      - sw/threading

examples/hello-world/src/main.rs

@@ -1,15 +1,13 @@
 #![no_main]
 #![no_std]
+#![feature(impl_trait_in_assoc_type)]
 #![feature(used_with_arg)]
 
 use riot_rs::debug::{exit, log::*};
 
-#[riot_rs::thread(autostart)]
-fn main() {
-    info!(
-        "Hello from main()! Running on a {} board.",
-        riot_rs::buildinfo::BOARD,
-    );
+#[riot_rs::task(autostart)]
+async fn main() {
+    info!("Hello World!");
 
     exit(Ok(()));
 }

examples/laze.yml

@@ -15,7 +15,7 @@ subdirs:
   - embassy-usb-keyboard
   - gpio
   - hello-world
-  - hello-world-async
+  - hello-world-threading
   - log
   - minimal
   - random