pin up works for core 0 via lib

This commit is contained in:
Sam Chin 2025-08-12 19:39:56 +08:00
parent db7690210a
commit a5e95c9c6d
2 changed files with 70 additions and 23 deletions

View file

@ -1,3 +1,4 @@
use alloc::format;
use alloc::string::{String, ToString};
use alloc::vec::Vec;
@ -604,8 +605,8 @@ impl Repl {
}
"up" => {
// --- THIS IS THE REFACTORED BLOCK ---
if args.len() != 3 {
crate::println!("Usage: pin up <pin> <on|off>");
if args.len() < 3 || args.len() > 4 {
crate::println!("Usage: pin up <pin> <on|off> [core_id: 0-3]");
self.do_cmd = false;
self.cmdline.clear();
return;
@ -629,22 +630,41 @@ impl Repl {
return;
}
// 1. Initialize BIO and IOX
// 1. Parse the optional core ID argument.
let target_core: Option<BioCore> = if args.len() == 4 {
match u32::from_str_radix(&args[3], 10) {
Ok(0) => Some(BioCore::Core0),
Ok(1) => Some(BioCore::Core1),
Ok(2) => Some(BioCore::Core2),
Ok(3) => Some(BioCore::Core3),
_ => {
crate::println!("Invalid core ID. Must be 0, 1, 2, or 3.");
self.do_cmd = false;
self.cmdline.clear();
return;
}
}
} else {
None // Default to Core 0 if no core is specified.
};
// 2. Initialize BIO and IOX
let mut bio_ss = BioSharedState::new();
let iox = cramium_hal::iox::Iox::new(utra::iox::HW_IOX_BASE as *mut u32);
iox.set_ports_from_pio_bitmask(0xFFFF_FFFF);
// 2. Convert string state to boolean
// 3. Convert string state to boolean
let state_bool = state_str == "on";
// 3. Call the library function
// 4. Call the library function with the parsed core.
let core_name = format!("{:?}", target_core.unwrap_or(BioCore::Core0));
crate::println!(
"Setting pin {} to {} which is {} using the library function...",
"Setting pin {} to {} using {}...",
pin,
state_str.to_uppercase(),
state_bool
core_name
);
bio_ss.set_pin(pin, state_bool); // Use `None` to default to Core 0
bio_ss.set_pin(pin, state_bool, target_core);
crate::println!("Command sent.");
}
_ => {

View file

@ -326,32 +326,59 @@ impl BioSharedState {
}
// pub fn set_pin(&mut self, pin: u32, state: bool, core: Option<BioCore>) {
pub fn set_pin(&mut self, pin: u32, state: bool) {
// 1. Stop Core 0 to ensure a clean state.
pub fn set_pin(&mut self, pin: u32, state: bool, core: Option<BioCore>) {
let target_core = core.unwrap_or(BioCore::Core0); // Default to Core 0 if None
let core_mask = 1 << (target_core as usize);
// 1. Stop the target core.
let mut ctrl = self.bio.r(utra::bio_bdma::SFR_CTRL);
ctrl &= !0b0001;
ctrl &= !core_mask; // Clear only the EN bit for the target core
self.bio.wo(utra::bio_bdma::SFR_CTRL, ctrl);
// 2. Clear any stale data from the FIFO for Core 0.
self.bio.wo(utra::bio_bdma::SFR_FIFO_CLR, 0b0001);
// 2. Clear the target core's FIFO using the correct field and a bitmask. This is the corrected block.
self.bio.wfo(utra::bio_bdma::SFR_FIFO_CLR_SFR_FIFO_CLR, core_mask as u32);
// 3. Load the correct program onto Core 0.
// 3. Load the program onto the target core.
let prog = pin_control_code();
self.load_code(prog, 0, BioCore::Core0);
self.load_code(prog, 0, target_core);
// 4. Start Core 0.
ctrl |= 0b0001_0001_0001;
// 4. Start the target core using read-modify-write for safety.
let start_mask = self.bio.ms(utra::bio_bdma::SFR_CTRL_EN, core_mask)
| self.bio.ms(utra::bio_bdma::SFR_CTRL_RESTART, core_mask)
| self.bio.ms(utra::bio_bdma::SFR_CTRL_CLKDIV_RESTART, core_mask);
ctrl |= start_mask;
self.bio.wo(utra::bio_bdma::SFR_CTRL, ctrl);
// 5. Reset the clock divider for Core 0.
self.bio.wo(utra::bio_bdma::SFR_QDIV0, 0);
// 5. Reset the clock divider for the selected core.
match target_core {
BioCore::Core0 => self.bio.wo(utra::bio_bdma::SFR_QDIV0, 0),
BioCore::Core1 => self.bio.wo(utra::bio_bdma::SFR_QDIV1, 0),
BioCore::Core2 => self.bio.wo(utra::bio_bdma::SFR_QDIV2, 0),
BioCore::Core3 => self.bio.wo(utra::bio_bdma::SFR_QDIV3, 0),
}
// 6. Prepare and send the command to Core 0's FIFO. Use the 'state' boolean directly in the if
// condition.
// 6. Prepare and send the command to the target core's FIFO.
let state_val = if state { 0xFFFFFFFF } else { 0 };
let pin_bitmask = 1 << pin;
self.bio.wo(utra::bio_bdma::SFR_TXF0, 1 << pin);
self.bio.wo(utra::bio_bdma::SFR_TXF0, state_val);
match target_core {
BioCore::Core0 => {
self.bio.wo(utra::bio_bdma::SFR_TXF0, pin_bitmask);
self.bio.wo(utra::bio_bdma::SFR_TXF0, state_val);
}
BioCore::Core1 => {
self.bio.wo(utra::bio_bdma::SFR_TXF1, pin_bitmask);
self.bio.wo(utra::bio_bdma::SFR_TXF1, state_val);
}
BioCore::Core2 => {
self.bio.wo(utra::bio_bdma::SFR_TXF2, pin_bitmask);
self.bio.wo(utra::bio_bdma::SFR_TXF2, state_val);
}
BioCore::Core3 => {
self.bio.wo(utra::bio_bdma::SFR_TXF3, pin_bitmask);
self.bio.wo(utra::bio_bdma::SFR_TXF3, state_val);
}
}
}
pub fn debug_pc(&self) {