stash before merge

This commit is contained in:
bunnie 2021-03-24 22:48:23 +08:00
parent e39c186c4a
commit 8763cf3133
3 changed files with 5 additions and 4 deletions

View file

@ -6,9 +6,9 @@ fn sleep_loop(sleep_ms: usize) {
let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap();
let tid = xous::current_tid().unwrap();
let sleep_ms = match tid {
4 => 50,
2 => 10,
3 => 20,
4 => 500,
2 => 100,
3 => 200,
_ => panic!("Unknown TID"),
};
// log::info!("My thread number is {}, sleeping 0x{:08x} ({}) ms", tid, sleep_ms, sleep_ms);

View file

@ -70,7 +70,7 @@ mod implementation {
.expect("couldn't map GPIO CSR range");
let mut gpio_csr = CSR::new(gpio_base.as_mut_ptr() as *mut u32);
// setup the initial logging output
gpio_csr.wfo(utra::gpio::UARTSEL_UARTSEL, 1); // 0 = kernel, 1 = log, 2 = app_uart
gpio_csr.wfo(utra::gpio::UARTSEL_UARTSEL, 0); // 0 = kernel, 1 = log, 2 = app_uart
gpio_base.as_mut_ptr() as *mut u32
}

View file

@ -50,6 +50,7 @@ fn try_main() -> Result<(), DynError> {
"keyboard",
"trng",
"llio",
"kernel-test",
];
let fcc_pkgs = [
"shell",