Fix picow demo to work again

It broke when embassy deps were updated without being tested.

NUM_LISTENERS has been reduced to 2 pending debugging issues with
larger arena allocations. "nightly" embassy-executor works OK with
NUM_LISTENERS=4 (or perhaps more).

Fixes: e769b8a ("Use embassy from crates not git patch")

Author: mkj

Cargo.lock

@@ -58,9 +58,6 @@ embedded-io = { version = "0.6", optional = true }
 # for debug printing
 pretty-hex = { version = "0.4", default-features = false }
 
-# for non_async
-futures = { version = "0.3", default-features = false }
-
 [features]
 std = ["snafu/std", "snafu/backtrace", "ssh-key/alloc", "larger"]
 rsa = ["dep:rsa", "ssh-key/rsa"]
@@ -85,6 +82,18 @@ simplelog = { version = "0.12", features = ["test"] }
 #ed25519-dalek = { git = "https://github.com/mkj/curve25519-dalek", branch = "sunset" }
 #x25519-dalek = { git = "https://github.com/mkj/curve25519-dalek", branch = "sunset" }
 
+# [patch.crates-io]
+# cyw43 = { path = "/home/matt/3rd/rs/embassy-stable-sunset/cyw43" }
+# embassy-time = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-time" }
+# embassy-time-driver = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-time-driver" }
+# embassy-time-queue-driver = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-time-queue-driver" }
+# embassy-sync = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-sync" }
+# embassy-net = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-net" }
+# embassy-net-driver = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-net-driver" }
+# embassy-net-driver-channel = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-net-driver-channel" }
+# embassy-executor = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-executor" }
+# embassy-executor-macros = { path = "/home/matt/3rd/rs/embassy-stable-sunset/embassy-executor-macros" }
+
 # these are mostly applicable to picow, but can't hurt generally
 [profile.dev]
 debug = 2
@@ -97,9 +106,10 @@ codegen-units = 1
 debug = 2
 debug-assertions = false
 incremental = false
-lto = 'fat'
+lto = "fat"
 opt-level = 'z'
 overflow-checks = false
+panic = "abort"
 
 # do not optimize proc-macro crates = faster builds from scratch
 [profile.dev.build-override]

Cargo.toml

@@ -1,4 +1,4 @@
-#![cfg_attr(not(any(feature = "std", test)), no_std)]
+#![no_std]
 
 // avoid warning about Send for the time being
 #[allow(async_fn_in_trait)]

embassy/demos/common/src/lib.rs

@@ -28,9 +28,9 @@ pub async fn listener<D: Driver, S: DemoServer>(stack: &'static Stack<D>,
     let mut rx_buffer = [0; 1550];
     let mut tx_buffer = [0; 1550];
 
+    let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
+    // socket.set_nagle_enabled(false);
     loop {
-        let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
-        // socket.set_nagle_enabled(false);
 
         info!("Listening on TCP:22...");
         if let Err(_) = socket.accept(22).await {
@@ -159,6 +159,7 @@ impl ServerApp {
         };
 
         if p.check(password) {
+            info!("Password login for {username}");
             a.allow()?
         }
         Ok(())

embassy/demos/common/src/server.rs

@@ -1,9 +1,6 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = "probe-run --chip RP2040"
+runner = "probe-rs  run --chip RP2040 --speed 20000"
 
 [build]
 target = "thumbv6m-none-eabi"
-rustflags = "-Cllvm-args=--enable-machine-outliner=never"
 
-[env]
-DEFMT_LOG = "debug"

embassy/demos/picow/.cargo/config.toml

@@ -9,27 +9,33 @@ sunset = { path = "../../.." }
 sunset-sshwire-derive = { path = "../../../sshwire-derive" }
 sunset-demo-embassy-common= { path = "../common" }
 
-cyw43 = { version = "0.1.0", optional = true}
+cyw43 = { version = "0.1.0", optional = true, features = ["log", "firmware-logs"]}
 cyw43-pio = { version = "0.1.0", optional = true }
 
 embassy-net-wiznet = { version = "0.1.0", optional = true }
 
-embassy-executor = { version = "0.5",  features = ["integrated-timers", "executor-thread", "arch-cortex-m"] }
+embassy-executor = { version = "0.5", features = [
+    "integrated-timers", "executor-thread", "arch-cortex-m", "log",
+    # Larger than around 120kB causes unknown failures. using "nightly" feature
+    # instead works OK. Needs investigation. 96kB is sufficient for NUM_LISTENERS=2
+    # https://github.com/embassy-rs/embassy/issues/3061
+    "task-arena-size-98304"] }
 embassy-time = { version = "0.3",  features = [] }
 embassy-rp = { version = "0.1",  features = ["unstable-pac", "time-driver"] }
-embassy-net = { version = "0.4", features = ["tcp", "dhcpv4", "medium-ethernet"] }
+embassy-net = { version = "0.4", features = ["tcp", "dhcpv4", "medium-ethernet", "log"] }
 embassy-net-driver = { version = "0.2" }
 embassy-usb-driver = { version = "0.1" }
 embassy-sync = { version = "0.5" }
 embassy-futures = { version = "0.1" }
-embassy-usb = { version = "0.1" }
+embassy-usb = { version = "0.1", features = ["log"] }
 atomic-polyfill = "1.0"
 static_cell = { version = "1.0", features = [ "nightly" ] }
 
-panic-probe = { version = "0.3", features = [] }
-pretty-hex = { version = "0.4", default-features = false }
 log = { version = "0.4" }
-futures = { version = "0.3", default-features = false }
+rtt-target = "0.3"
+rtt-logger = "0.2"
+
+pretty-hex = { version = "0.4", default-features = false }
 
 snafu = { version = "0.8", default-features = false, features = ["rust_1_65"] }
 
@@ -61,8 +67,8 @@ cyw43 = ["dep:cyw43", "dep:cyw43-pio"]
 w5500 = ["dep:embassy-net-wiznet", "dep:embedded-hal-bus"]
 
 # Use cyw43 firmware already on flash. This saves time when developing.
-# probe-rs-cli download firmware/43439A0.bin --format bin --chip RP2040 --base-address 0x10100000
-# probe-rs-cli download firmware/43439A0_clm.bin --format bin --chip RP2040 --base-address 0x10140000
+# probe-rs download firmware/43439A0.bin --binary-format bin  --chip RP2040 --base-address 0x10100000
+# probe-rs download firmware/43439A0_clm.bin --binary-format bin  --chip RP2040 --base-address 0x10140000
 romfw = []
 
 # Set default console to serial

embassy/demos/picow/Cargo.toml

@@ -1,5 +1,5 @@
 MEMORY {
     BOOT2 : ORIGIN = 0x10000000, LENGTH = 0x100
-    FLASH : ORIGIN = 0x10000100, LENGTH = 1024K - 0x100
-    RAM   : ORIGIN = 0x20000000, LENGTH = 256K
-}
+    FLASH : ORIGIN = 0x10000100, LENGTH = 2048K - 0x100
+    RAM   : ORIGIN = 0x20000000, LENGTH = 264K
+}

embassy/demos/picow/memory.x

@@ -37,8 +37,9 @@ struct FlashConfig<'a> {
 }
 
 impl FlashConfig<'_> {
-    const BUF_SIZE: usize = 1 + SSHConfig::BUF_SIZE + 32;
+    const BUF_SIZE: usize = 4 + SSHConfig::BUF_SIZE + 32;
 }
+const _: () = assert!(FlashConfig::BUF_SIZE % 4 == 0, "flash reads must be a multiple of 4");
 
 fn config_hash(config: &SSHConfig) -> Result<[u8; 32]> {
     let mut h = sha2::Sha256::new();
@@ -71,7 +72,10 @@ pub async fn create(flash: &mut Fl<'_>) -> Result<SSHConfig> {
 pub async fn load(flash: &mut Fl<'_>) -> Result<SSHConfig> {
     // let mut buf = [0u8; ERASE_SIZE];
     let mut buf = [0u8; FlashConfig::BUF_SIZE];
-    flash.read(CONFIG_OFFSET, &mut buf).await.map_err(|_| Error::msg("flash error"))?;
+    flash.read(CONFIG_OFFSET, &mut buf).await.map_err(|e| {
+        debug!("flash read error 0x{CONFIG_OFFSET:x} {e:?}");
+        Error::msg("flash error")
+    })?;
 
     // use pretty_hex::PrettyHex;
     // use core::fmt::Write;