From 8c88456fcb6e537558876124cd61462ad61dd469 Mon Sep 17 00:00:00 2001 From: sigil-03 Date: Sat, 25 Oct 2025 14:09:54 -0600 Subject: [PATCH] add second ADC pin --- ch32v-insert-coin/src/main.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ch32v-insert-coin/src/main.rs b/ch32v-insert-coin/src/main.rs index 2db5988..40b71dc 100644 --- a/ch32v-insert-coin/src/main.rs +++ b/ch32v-insert-coin/src/main.rs @@ -293,7 +293,9 @@ fn app_main(mut p: hal::Peripherals, mut delay: Delay) -> ! { let led1_ch = hal::timer::Channel::Ch1; // LED2 output setup - + let led2_pin = PwmPin::new_ch2::<0>(p.PA1); + let led2_ch = hal::timer::Channel::Ch2; + // DAC output setup let dac_pin = PwmPin::new_ch4::<0>(p.PC4); // let dac_ch = hal::timer::Channel::Ch4; @@ -302,10 +304,10 @@ fn app_main(mut p: hal::Peripherals, mut delay: Delay) -> ! { let mut pwm = SimplePwm::new( p.TIM1, Some(led1_pin), - None, + Some(led2_pin), Some(led0_pin), Some(dac_pin), - Hertz::khz(100), + Hertz::khz(200), CountingMode::default(), ); @@ -323,6 +325,11 @@ fn app_main(mut p: hal::Peripherals, mut delay: Delay) -> ! { // adc let mut adc = hal::adc::Adc::new(p.ADC1, Default::default()); let mut adc_pin = p.PD4; + + // adc2 + // let mut usb_detect_dc = hal::adc::Adc::new(p.ADC1, Default::default()); + let mut usb_adc_pin = p.PD5; + // println!("ADC_PIN CHANNEL: {}", adc_pin.channel().channel()); delay.delay_ms(1000); let adc_cal = adc.calibrate(); @@ -519,6 +526,7 @@ fn app_main(mut p: hal::Peripherals, mut delay: Delay) -> ! { if adc1_timer.need_service() { let val = adc.convert(&mut adc_pin, hal::adc::SampleTime::CYCLES241); + let val = adc.convert(&mut usb_adc_pin, hal::adc::SampleTime::CYCLES241); #[cfg(feature="enable_print")] println!("ADC value: {}", val);