From 90d5a0f2a2c4d41d53ed6260e53fb58556b6f9d3 Mon Sep 17 00:00:00 2001 From: Empire Phoenix Date: Wed, 15 Oct 2025 02:36:47 +0200 Subject: [PATCH] test pin remapping --- Software/CAN_Sensor/.cargo/config.toml | 3 ++- Software/CAN_Sensor/src/main.rs | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Software/CAN_Sensor/.cargo/config.toml b/Software/CAN_Sensor/.cargo/config.toml index c0b2201..dea4376 100644 --- a/Software/CAN_Sensor/.cargo/config.toml +++ b/Software/CAN_Sensor/.cargo/config.toml @@ -10,5 +10,6 @@ rustflags = [ # runner = "gdb -q -x openocd.gdb" # runner = "wlink -v flash" -runner = "wlink -v flash --enable-sdi-print --watch-serial --erase" +runner = "wchisp flash" +#runner = "wlink -v flash --enable-sdi-print --watch-serial --erase" # runner = "wlink -v flash" diff --git a/Software/CAN_Sensor/src/main.rs b/Software/CAN_Sensor/src/main.rs index 7642b5e..5deff87 100644 --- a/Software/CAN_Sensor/src/main.rs +++ b/Software/CAN_Sensor/src/main.rs @@ -48,6 +48,8 @@ static LOG_CH: Channel, 8> = Chan #[embassy_executor::main(entry = "qingke_rt::entry")] async fn main(spawner: Spawner) { + ch32_hal::pac::AFIO.pcfr1().write(|w| w.set_can1_rm(2)); + unsafe { static mut HEAP_SPACE: [u8; 4096] = [0; 4096]; // 4 KiB heap, adjust as needed HEAP.init(HEAP_SPACE.as_ptr() as usize, HEAP_SPACE.len()); @@ -103,8 +105,7 @@ async fn main(spawner: Spawner) { // Create ADC on ADC1 and use PA1 as analog input (Threshold/Trigger) let adc = Adc::new(p.ADC1, Default::default()); - ch32_hal::pac::AFIO.pcfr1().write(|w| w.set_can1_rm(2)); - + let ain = p.PA1; let config = can::can::Config::default(); let can: Can<'static, CAN1 , Blocking> = Can::new_blocking(p.CAN1, p.PB8, p.PB9, CanFifo::Fifo1, CanMode::Normal, 500_000, config).expect("Valid"); let mut filter = CanFilter::new_id_list();