From 161b36e88f0c20c10d47e2438b6ff93852e82083 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 6 Jan 2026 14:45:39 +0800 Subject: [PATCH 1/4] fix avtrng test/characterization routine --- baremetal/src/repl.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/baremetal/src/repl.rs b/baremetal/src/repl.rs index 184bcef71..ab314731c 100644 --- a/baremetal/src/repl.rs +++ b/baremetal/src/repl.rs @@ -893,13 +893,14 @@ impl Repl { let iox = Iox::new(utra::iox::HW_IOX_BASE as *mut u32); let (power_port, power_pin) = bao1x_hal::board::setup_trng_power_pin(&iox); let bio_input = bao1x_hal::board::setup_trng_input_pin(&iox); + let bio_mask = bao1x_api::bio::port_and_pin_to_bio_bit(bio_input.0, bio_input.1).unwrap(); // turn on the system iox.set_gpio_pin_value(power_port, power_pin, IoxValue::High); let mut bio_ss = BioSharedState::new(); bio_ss.init(); - crate::println!("bio_input: {}", bio_input); - crate::avtrng::setup(&mut bio_ss, bio_input); + crate::println!("bio_input: {}", bio_mask.value()); + crate::avtrng::setup(&mut bio_ss, bio_mask.value()); crate::println!("====AVSTART===="); const BUFLEN: usize = 256; From d1a3eb4b587558f3aa5826c59e5528a23509b67a Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 6 Jan 2026 15:40:14 +0800 Subject: [PATCH 2/4] handle clock counter rollover case & fix bug in assembly register naming t3 doesn't actually exist --- libs/bio-lib/src/captouch.rs | 39 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/libs/bio-lib/src/captouch.rs b/libs/bio-lib/src/captouch.rs index b5f9eefcf..4503e84e0 100644 --- a/libs/bio-lib/src/captouch.rs +++ b/libs/bio-lib/src/captouch.rs @@ -249,26 +249,41 @@ bio_code!( CAPTOUCH_SENSE_START, CAPTOUCH_SENSE_END, - "mv t0, x19", // Load pin mask into register t0. - "mv x26, t0", // Set GPIO mask to our pin. + "mv x5, x19", // Load pin mask into register x5. + "mv x26, x5", // Set GPIO mask to our pin. "10:", // start of sensor loop - "mv x24, t0", // Configure pin as an OUTPUT. + "mv x24, x5", // Configure pin as an OUTPUT. "mv x23, x0", // Drive pin LOW. - "li t3, 0x200", -"20:", // wait loop for "low" settling - "addi t3, t3, -1", - "bne t3, x0, 20b", + "li x6, 0x100", +"20:", // wait loop for "low" settling - this can be made much shorter if needed + // as it is, the sampling rate is about 236kHz, which is already quite high + "addi x6, x6, -1", + "bne x6, x0, 20b", - "mv s0, x31", // remember aclk time - "mv x25, t0", // make it an input + "mv x7, x31", // remember aclk time + "mv x25, x5", // make it an input // now, the pull-up on the pin will slowly charge the capacitance on the pin. We wait // for the rising edge to be detected and that is our captouch interval "mv x20, x0", // wait for quantum: based on EXTCLK rising edge on the configured pin - "mv s1, x31", // remember aclk time - "sub t2, s1, s0", - "mv x19, t2", // report the delta-t + "mv x8, x31", // remember aclk time + + // mask out core ID + "li x10, 0x3FFFFFFF", // x10 is re-used in roll-over computation below + "and x7, x7, x10", + "and x8, x8, x10", + + // handle roll-over case: x7 is greater than x8 in the case of roll-over + "bgtu x7, x8, 30f", + "sub x9, x8, x7", // total cycles is x8 - x7 + "j 40f", +"30:", // roll-over path + "sub x10, x10, x7", // x10 now contains cycles from max versus start + "add x9, x10, x8", // total cycles is x10 + x8 (masked) + +"40:", + "mv x19, x9", // report the delta-t // the line below keeps us from blocking on the FIFO being full - we steal our own entry // and cause the host to read the stale value in the FIFO. "mv x0, x19", // drain the FIFO entry - host will read the "stale" empty entry From 079ec33134ee135e9b52a9202463a15dad171f75 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 6 Jan 2026 15:43:50 +0800 Subject: [PATCH 3/4] improve formatting & timing slightly --- libs/bio-lib/src/ws2812.rs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libs/bio-lib/src/ws2812.rs b/libs/bio-lib/src/ws2812.rs index 8d4c90a95..9dd74b216 100644 --- a/libs/bio-lib/src/ws2812.rs +++ b/libs/bio-lib/src/ws2812.rs @@ -171,7 +171,7 @@ bio_code!(ws2812b_kernel, WS2812B_START, WS2812B_END, // LEDs will go onto the stack "li x9, 0x1000000", // bit 24 mask "li sp, 0x800", // start of the LED buffer - "10:", +"10:", // read a 24-bit color number from FIFO1 "mv x8, x17", "sw x8, 0(sp)", @@ -181,19 +181,24 @@ bio_code!(ws2812b_kernel, WS2812B_START, WS2812B_END, "j 10b", // go back and get more data // -- sending loop -- - "20:", +"20:", "li x8, 0x800", // x8 now has the starting address of the data we're going to send // x9 is the bit 24 mask used by the above loop "li x12, 0x800000", // bit 23 mask // loop setup done - "30:", +"30:", "li x11, 24", // number of bits to shift through "lw x10, 0(x8)", // fetch the word to send // "mv x18, x10", // debug by looping back ----------- - "31:", +"31:", "and x13, x12, x10", // the bit we're contemplating is at bit 23 position, extract it into x13 "bne x13, x0, 40f", // if 1, go to 40f, where the 1 routine is + "mv x20, x0", // snap to quantum before doing the send routine - this improves timing uniformity of high pulses + // at the expense of T1L time being a little out of spec, but this is better-tolerated than T0H time being variable. + // this quantum snap has to be introduced here because snap quantum to output makes the ws2812 driver not + // composable with other BIO applications + // zero routine // 2 hi "mv x22, x4", // sets to 1 @@ -214,7 +219,7 @@ bio_code!(ws2812b_kernel, WS2812B_START, WS2812B_END, "j 50f", // jump to the loop end check // one routine - "40:", +"40:", // 7 hi "mv x22, x4", // sets to 1 "mv x20, x0", // wait for quantum @@ -232,16 +237,16 @@ bio_code!(ws2812b_kernel, WS2812B_START, WS2812B_END, "addi x11, x11, -1", // decrement the pixel bit counter "mv x20, x0", - "50:", // shift and do the next pixel value +"50:", // shift and do the next pixel value "bne x11, x0, 31b", // go back for more in the loop - "60:", // check if we've exhausted all the LED values +"60:", // check if we've exhausted all the LED values "addi x8, x8, 4", "bge sp, x8, 30b", // see if we've hit the value of current sp "li sp, 0x800", // reset the stack pointer for a fresh fetch // wait to reset the chain "li x14, 2000", // delay wait time to reset the chain per spec - "70:", +"70:", "addi x14, x14, -1", "mv x20, x0", "bne x14, x0, 70b", From f387e06b155d94d062321799a20bf8b4cc23ad03 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 6 Jan 2026 15:44:17 +0800 Subject: [PATCH 4/4] fix help messages in demo commands --- apps-dabao/dabao-console/src/cmds/touch.rs | 4 ++-- apps-dabao/dabao-console/src/cmds/ws2812.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps-dabao/dabao-console/src/cmds/touch.rs b/apps-dabao/dabao-console/src/cmds/touch.rs index eb5ec3c2c..1614dfdb6 100644 --- a/apps-dabao/dabao-console/src/cmds/touch.rs +++ b/apps-dabao/dabao-console/src/cmds/touch.rs @@ -17,7 +17,7 @@ impl<'a> ShellCmdApi<'a> for Touch { fn process(&mut self, args: String, env: &mut super::CommonEnv) -> Result, xous::Error> { use core::fmt::Write; let mut ret = String::new(); - let helpstring = "ws2812 [rainbow []] [length ] [hexcolor <#rrggbb>]"; + let helpstring = "touch [pin] [monitor] [wait-touch] [wait-release] [touch-release]"; let mut tokens = args.split(' '); @@ -34,7 +34,7 @@ impl<'a> ShellCmdApi<'a> for Touch { let mut captouch = bio_lib::captouch::Captouch::new(self.pin, None).unwrap(); captouch.calibrate(None).unwrap(); loop { - log::info!("{:?}, {}", captouch.is_touched(), captouch.raw_status()); + log::info!("{}", captouch.raw_status()); env.ticktimer.sleep_ms(100).ok(); } } diff --git a/apps-dabao/dabao-console/src/cmds/ws2812.rs b/apps-dabao/dabao-console/src/cmds/ws2812.rs index 02cd8d3c3..399ecd245 100644 --- a/apps-dabao/dabao-console/src/cmds/ws2812.rs +++ b/apps-dabao/dabao-console/src/cmds/ws2812.rs @@ -30,7 +30,8 @@ impl<'a> ShellCmdApi<'a> for Ws2812 { fn process(&mut self, args: String, env: &mut super::CommonEnv) -> Result, xous::Error> { use core::fmt::Write; let mut ret = String::new(); - let helpstring = "ws2812 [rainbow []] [length ] [hexcolor <#rrggbb>]"; + let helpstring = + "ws2812 [rainbow []] [touch []] [length ] [hexcolor <#rrggbb>]"; let mut tokens = args.split(' ');