修改一些错误

Author: hysonglet

Cargo.toml

@@ -21,7 +21,7 @@ embedded-hal = "1.0.0"
 embedded-hal-027 = { package = "embedded-hal", version = "0.2.7", features = ["unproven"] }
 embedded-hal-async = { version = "1.0" }
 embedded-io = "0.6.1"
-embedded-io-async = { version = "0.6.1", option = true }
+embedded-io-async = { version = "0.6.1"}
 nb = "1"
 void = { version = "1.0", default-features = false }
 cortex-m = { version = "0.7.7", features = ["critical-section-single-core", "inline-asm"] }
@@ -91,7 +91,7 @@ name = "embassy_dma_mem2mem"
 required-features = ["embassy"]
 
 [[example]]
-name = "embassy_exit"
+name = "embassy_exti"
 required-features = ["embassy"]
 
 [[example]]

README.md

@@ -1,93 +1,126 @@
-
 ## 💁 Overview
+
 This repository provides a driver layer for the Py32f030 chip. It currently supports most peripherals and provides many friendly interfaces. By calling the upper-level interfaces, the peripherals of the microcontroller can be easily put into operation.
 
 ## 💻 Development environment
+
 Installing the Rust embedded compilation environment for Py32F030 is very simple. You need to install the Rust compilation chain and some tools
+
 ### [Rust](https://www.rust-lang.org/tools/install)
+
+### [Hardware repository](https://github.com/hysonglet/Py32F030_CrabBoard_Hardware)
+
 #### Mac/Linux
+
 ```bash
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 ```
+
 #### [Windows](https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe)
+
 The installation of Rust on Windows is a little bit complicated. You can read [this website](https://forge.rust-lang.org/infra/other-installation-methods.html) to learn how to install it.
 
 ### Rust nightly version
+
 After installing rust, you need to switch to the night version to compile some embedded rust code
+
 ```bash
 rustup default nightly
 ```
+
 ### Installing the Cortex-M0 Compiler Tools
+
 ```bash
 rustup target add thumbv6m-none-eabi
 ```
 
 ### Check the environment
+
 Execute the following command. If there is no error, it means that the rust compilation environment is installed normally.
+
 ```
 git clone https://github.com/hysonglet/py32f030-hal.git
 cd py32f030-hal
 cargo build
 ```
 
 ### Check Rust version
+
 ```bash
 ➜  py32f030-hal git:(main) ✗ rustup --version
 rustup 1.27.1 (54dd3d00f 2024-04-24)
 info: This is the version for the rustup toolchain manager, not the rustc compiler.
 info: The currently active `rustc` version is `rustc 1.82.0-nightly (6de928dce 2024-08-18)`
 ```
 
-### 安装 [Probe-rs](https://probe.rs/docs/getting-started/installation/#homebrew)
+### Install [Probe-rs](https://probe.rs/docs/getting-started/installation/#homebrew)
+
 Probe-rs is an excellent firmware download and log debugging tool. For detailed of installation and how to use, please click [this link](https://probe.rs/docs/getting-started/installation/#using-install-scripts) to see more。
+
 #### Mac/Linux
+
 ```bash
 curl --proto '=https' --tlsv1.2 -LsSf \
     https://github.com/probe-rs/probe-rs/releases/latest/download/probe-rs-tools-installer.sh \
     | sh
 ```
+
 #### Windows
+
 ```bash
 cargo install cargo-binstall
 cargo binstall probe-rs-tools
 ```
 
 ## Other tools (not required for now)
+
 ### cargo tools
+
 ```bash
 cargo install cargo-get
 brew install llvm
 ```
 
 ### Serial port burning tool
+
 There are two tools here, you can choose a tool written in Python or a serial port tool written in Rust.
+
 1. python sccript: puyaisp
+
 ```
 pip install puyaisp
 pip install pyusb pyserial hid
 ```
+
 burn：
+
 ```bash
 # Press the boot and RST buttons at the same time, then release RST first, then release Boot, and then execute the following command
 puyaisp -f blink.bin
 ```
+
 2. rust tools: [pyisp](https://github.com/hysonglet/pyisp.git)
-Use pyisp rust serial port tool to burn bin file, 
-``` bash
+   Use pyisp rust serial port tool to burn bin file,
+
+```bash
 # One-time download
 pyisp -s tty.usbserial-130 -g -f test.bin
 # Repeated download
 pyisp -s COM4 -g -c -f test.bin
 ```
 
-
 ### Jlink connection operation and view log
+
 Of course, it is not limited to jlink, stlink is also a good choice. Sometimes we use the following two methods to download and view the running logs
+
 1. cargo run
+
 ```
 cargo r  --example embassy_uart
 ```
+
 2. probe-rs run
+
 ```
 probe-rs run --chip PY32F030x8 target/thumbv6m-none-eabi/debug/examples/embassy_uart
 ```
@@ -111,13 +144,15 @@ probe-rs run --chip PY32F030x8 target/thumbv6m-none-eabi/debug/examples/embassy_
 - [x] Flash
 
 ## TODO
+
 - LPTimer
 - Clock -> 48M
 - spi
 
 ## Examples
 
 ### Run
+
 ```bash
 # run
 cargo run --example blinky
@@ -126,6 +161,7 @@ cargo build --release --example blinky
 ```
 
 ### Example list
+
 ```bash
 py32f030-hal git:(main) ✗ cargo r --example
 error: "--example" takes one argument.
@@ -157,14 +193,23 @@ Available examples:
 ```
 
 ## [Evaluation Board](https://github.com/hysonglet/Py32F030_CrabBoard_Hardware)
+
 <img src="https://s.imgkb.xyz/i/abcdocker/2025/01/01/67752f84dc98a.png" alt="Py32_Rust_Dev 1.2" title="Py32_Rust_Dev 1.2" />
 
 ## Wechat blog
+
 公众号：`Rust嵌入式`
 <img src="https://s.imgkb.xyz/i/abcdocker/2024/07/20/669bac54b9156.jpg" alt="Rust嵌入式" style="display: block; margin: 0 auto;">
 
 ## How to buy
+
 We currently provide Taobao links, you can choose any one to buy
+
 - [Red Board](https://item.taobao.com/item.htm?abbucket=3&id=870372823551&ns=1&pisk=g_4ZEUV7dq2BYJFzdz02YPC73Jgt-qW57rMjiSVm1ADiCScmuJ2f6ANcB-zqKSE16m69gCUUUET1BGFDuqgcFT_5P5EtkqXSqW-3hdhSwfbjsmvnWjiOd69CP5FtHCJcNkbW38cpMIxmn-0nxjcoof0mmWfEGbLmoAmDKHcoKqD0nmYntblJsEDDopfE6bHDSFmDtDcmahcgnqfE-bHnnqmm6bN46UkZjsltBejv0vmZE5DezWUEsrKT_v7cuyP-2YYSLEY08fVISNCBSak3fo4s-PXHh2V8ARcEzZRqTuPnSfyAyF3gZWqmbrSXwxEUtuiUvC1tTPPzuboC8pcr4y4sWkWyPYqLiro36T--OoV75oy1pED_4W2EVy9BP24aQPmErgRXHX4VLrEwnnoi9Xk5T6kW_3HU4z6G5nKxY2GEF_5eDnniDXk5TCxvDDlsTY1__&priceTId=2147847117405862249073402ec550&spm=a21n57.1.hoverItem.2&utparam=%7B%22aplus_abtest%22%3A%22869e3ae3cd2e9d2f08a139771bd78df4%22%7D&xxc=taobaoSearch&skuId=5702998681883)
 - [Red Board](https://item.taobao.com/item.htm?abbucket=3&id=873483284901&ns=1&pisk=gQSoE2iF-IGsgeEgVjt7WM_HxuaYe3tBP6np9HdUuIRj2eRLP6Yh9sTF23BRiB5OtpIRvMbjxO6C28tLF36WAHPT6lBhFTtQMED4mMxV3L9zv4oE43t2zxwYDlEOFtDJURB4XgCN0Cvo8D5ezER2CIJyTBoznEJ9LHoy80uqgIO2TH8eUKu2QLmEYDoznxJwdDleaek23LpeUH-FTtyDdIJEOWnk1g7P0S7J9OWpz8svEUANUQWReikJy46WiflGmOGksTuIYDSDEUSC7qQCPH7PesYOr5mkAT71Od5ra7vcqOjh7srxqHXV7MxV0SkvaN6cx3Izpu-Vq_jyo6kQHISHI9YOkJuMMwWfmEjuWv9f29SWWhrsaBQAIMvhAWZcsT5l7FSrZgWSuV5aQD94piuIRUJXnCCPHBlGLZOyb-2mWkLyhdAYn-0QcUJXn6w0nV39zK9-s&priceTId=2147847117405862249073402ec550&skuId=5873994718463&spm=a21n57.1.hoverItem.34&utparam=%7B%22aplus_abtest%22%3A%22ff785536f5ab6bb6f59d61effd2b2e31%22%7D&xxc=taobaoSearch)
 - [Stlink](https://item.taobao.com/item.htm?abbucket=3&id=870372823551&ns=1&pisk=gV8teqfMiXFtjPk-QFo3o97RRAlHhDAZIdR7otXgcpppG94m_NmVkKBp3OjG5O4AkIp2nKdq_s6XhKBDjD0k_C7VlYjxr4Aw22ctpdC1G6GfG_zjtGw91NP1lYDokkVCbAbXIvN6j2ZCa911GO6j9w1Vw1_fc1OI9s10Coa6hXdCLsq_lsasR61P1R_blPOCd_10hs611y_CLs_fhK_j9MGCDA63G6UvVwfF2CyxYzzyJ1IOHrXLkg8TrMBWV9aj-j5GXlA1praXRHf84RW-JJ6HGQ-fvE338ZRH2KKXdjafHH1Je_viRPQXApLRVBk87OKBQEQG4qFA93dBBFJjHlpvdQ-P5FM4SO-XOE6H5j4AF3APJ68mLP6vAnTGbZysB6L9wEKA4B8kyHJQETC0fXhL0oS1TR1XiKTZgwId9TcsWorVc_5dEXnY0oS6s6Bo1XE40MPC.&priceTId=2147847117405862249073402ec550&skuId=5716683933293&spm=a21n57.1.hoverItem.2&utparam=%7B%22aplus_abtest%22%3A%22869e3ae3cd2e9d2f08a139771bd78df4%22%7D&xxc=taobaoSearch)
+
+## Appendix
+
+[py32f030 datasheet](https://www.puyasemi.com/shujushouce.html?keywords=py32f030)
+[py32f030 reference manual](https://www.puyasemi.com/yonghushouce.html?keywords=py32f030)

examples/adc_block_interrupt_closure.rs

@@ -3,18 +3,21 @@
 
 use core::cell::RefCell;
 use cortex_m::interrupt::{self, Mutex};
-use hal::adc::{AdcChannel, AnyAdc, ChannelConfig, Config, SampleCycles, TrigleSignal};
+use hal::adc::{
+    temperature, vrefence_internal, AdcChannel, AnyAdc, ChannelConfig, Config, ConversionMode,
+    Event, SampleCycles, TrigleSignal,
+};
+use hal::clock::sys_core_clock;
+use hal::interrupt::BindInterrupt;
+use hal::mcu::peripherals::ADC;
+use hal::mode::Blocking;
 use heapless::spsc::Queue;
-
-use py32f030_hal::adc::{ConversionMode, Event};
-use py32f030_hal::clock::sys_core_clock;
-use py32f030_hal::interrupt::BindInterrupt;
-use py32f030_hal::{self as hal, mode::Blocking};
+use py32f030_hal as hal;
 
 use {defmt_rtt as _, panic_probe as _};
 
-static ADC_INSTANCE: Mutex<RefCell<Option<AnyAdc<hal::mcu::peripherals::ADC, Blocking>>>> =
-    Mutex::new(RefCell::new(None));
+// 多线程中使用ADC，需要使用中断
+static ADC_INSTANCE: Mutex<RefCell<Option<AnyAdc<ADC, Blocking>>>> = Mutex::new(RefCell::new(None));
 
 type AdcQueue = Queue<u16, 128>;
 
@@ -33,8 +36,10 @@ fn main() -> ! {
             .wait(true) // 转换完成后等待读取完毕再开始转换
             .singal(TrigleSignal::Soft)
             .mode(ConversionMode::Continuous),
+        // 按顺序读取温度和电压采集的值
         &[AdcChannel::Channel11, AdcChannel::Channel12],
-        // &[AdcChannel::Channel11],
+        // 读取温度值
+        // &[AdcChannel::Channel11]],
     )
     .unwrap();
 
@@ -43,22 +48,34 @@ fn main() -> ! {
         ADC_INSTANCE.borrow(cs).replace(Some(adc));
         let mut adc_bind = ADC_INSTANCE.borrow(cs).borrow_mut();
         let adc = adc_bind.as_mut().unwrap();
-        let _ = adc.id().bind(&|cs| {
-            let mut adc = ADC_INSTANCE.borrow(cs).borrow_mut();
-            let mut queue = ADC_QUEUE.borrow(cs).borrow_mut();
-            let _ = queue.enqueue(adc.as_mut().unwrap().read_once());
-        });
+
+        adc.id()
+            .bind(&|cs| {
+                // 拿到ADC实例
+                let mut adc_borrow = ADC_INSTANCE.borrow(cs).borrow_mut();
+                // 获取队列的所有权
+                let mut queue = ADC_QUEUE.borrow(cs).borrow_mut();
+                let _ = queue.enqueue(adc_borrow.as_mut().unwrap().read_once());
+            })
+            .unwrap();
+
         adc.id().enable_irq();
+        // 开始转换
         adc.start();
+        // 开启中断
     });
 
     loop {
         cortex_m::asm::wfi();
-
         interrupt::free(|cs| {
             let mut queue = ADC_QUEUE.borrow(cs).borrow_mut();
-            while let Some(v) = queue.dequeue() {
-                defmt::info!("adc value: {}", v);
+            while queue.len() >= 2 {
+                defmt::info!(
+                    "voltage: {}, temperature: {} redunt: {}",
+                    vrefence_internal(queue.dequeue().unwrap()),
+                    temperature(queue.dequeue().unwrap()),
+                    queue.len()
+                );
             }
         })
     }

examples/adc_pin_interrupt_closure.rs

@@ -0,0 +1,85 @@
+#![no_std]
+#![no_main]
+
+use core::cell::RefCell;
+use cortex_m::interrupt::{self, Mutex};
+use hal::adc::{
+    AdcChannel, AnyAdc, ChannelConfig, Config, ConversionMode, Event, SampleCycles, TrigleSignal,
+};
+use hal::clock::sys_core_clock;
+use hal::gpio;
+use hal::interrupt::BindInterrupt;
+use hal::mcu::peripherals::ADC;
+use hal::mode::Blocking;
+use heapless::spsc::Queue;
+use py32f030_hal as hal;
+use py32f030_hal::adc::AnalogPin;
+
+use {defmt_rtt as _, panic_probe as _};
+
+// 多线程中使用ADC，需要使用中断
+static ADC_INSTANCE: Mutex<RefCell<Option<AnyAdc<ADC, Blocking>>>> = Mutex::new(RefCell::new(None));
+
+type AdcQueue = Queue<u16, 128>;
+
+static ADC_QUEUE: Mutex<RefCell<AdcQueue>> = Mutex::new(RefCell::new(AdcQueue::new()));
+
+#[cortex_m_rt::entry]
+fn main() -> ! {
+    let p = hal::init(Default::default());
+    defmt::info!("{}", sys_core_clock());
+
+    let gpioa = p.GPIOA.split();
+    // gpio::Analog::new(gpioa.PA0);
+    let channel_pin = gpioa.PA3;
+    channel_pin.as_anlog();
+
+    let mut adc: AnyAdc<_, Blocking> = AnyAdc::new(
+        p.ADC,
+        Config::default().sample(SampleCycles::Cycle_239_5),
+        ChannelConfig::default()
+            .over_write(false)
+            .wait(true) // 转换完成后等待读取完毕再开始转换
+            .singal(TrigleSignal::Soft)
+            .mode(ConversionMode::Continuous),
+        // 读
+        &[channel_pin.channel()],
+    )
+    .unwrap();
+
+    let _ = interrupt::free(|cs| {
+        adc.event_config(Event::EOC, true);
+        ADC_INSTANCE.borrow(cs).replace(Some(adc));
+        let mut adc_bind = ADC_INSTANCE.borrow(cs).borrow_mut();
+        let adc = adc_bind.as_mut().unwrap();
+
+        adc.id()
+            .bind(&|cs| {
+                // 拿到ADC实例
+                let mut adc_borrow = ADC_INSTANCE.borrow(cs).borrow_mut();
+                // 获取队列的所有权
+                let mut queue = ADC_QUEUE.borrow(cs).borrow_mut();
+                let _ = queue.enqueue(adc_borrow.as_mut().unwrap().read_once());
+            })
+            .unwrap();
+
+        adc.id().enable_irq();
+        // 开始转换
+        adc.start();
+        // 开启中断
+    });
+
+    loop {
+        cortex_m::asm::wfi();
+        interrupt::free(|cs| {
+            let mut queue = ADC_QUEUE.borrow(cs).borrow_mut();
+            while queue.len() > 0 {
+                defmt::info!(
+                    "adc: {},  redunt: {}",
+                    queue.dequeue().unwrap(),
+                    queue.len()
+                );
+            }
+        })
+    }
+}

examples/embassy_exit.rs examples/embassy_exti.rsexamples/embassy_exit.rs renamed to examples/embassy_exti.rs

@@ -4,7 +4,9 @@
 use embassy_executor::Spawner;
 use embassy_time::Timer;
 use hal::exti::ExtiInput;
+use hal::exti::Line;
 use hal::gpio::{Pull, Speed};
+use hal::interrupt::BindInterrupt;
 use hal::mode::Async;
 use py32f030_hal::{self as hal, prelude::*};
 use {defmt::info, defmt_rtt as _, panic_probe as _};

src/adc/types.rs

@@ -50,7 +50,7 @@ pub enum AdcChannel {
     /// PB1
     Channel9 = 9,
 
-    /// inner temperature
+    /// inner Temperature sensor
     Channel11 = 11,
     /// inner ref voltage
     Channel12 = 12,

src/exti/future.rs

@@ -25,6 +25,7 @@ pub struct ExtiInputFuture<'a> {
 impl<'a> ExtiInputFuture<'a> {
     pub fn new(port: GpioPort, pin: usize, edge: Edge) -> Self {
         let line: Line = pin.into();
+        let _ = line.bind_default();
         // line 选择
         Exti::exit_channle_select(line, port.into());