Merge pull request #19 from decaday/feat/usb

USB Support

Author: decaday

Cargo.toml

@@ -57,7 +57,7 @@ embassy-executor = { version = "0.6", features = [
     "arch-cortex-m",
 ] }
 embassy-embedded-hal = { version = "0.2.0", default-features = false }
-
+embassy-usb-driver = {version = "0.1.0" }
 
 [build-dependencies]
 # py32-metapac = { path = "../py32-data/build/py32-metapac", default-features = false, features = [
@@ -74,17 +74,21 @@ default = ["rt", "memory-x", "defmt", "embassy", "time", "exti"]
 
 rt = ["py32-metapac/rt"]
 
-defmt = ["dep:defmt", "dep:defmt-rtt"]
+defmt = ["dep:defmt", "dep:defmt-rtt", "embassy-usb-driver/defmt"]
 
 memory-x = ["py32-metapac/memory-x"]
 
 embassy = ["dep:embassy-sync", "dep:embassy-futures", "dep:embassy-time-driver"]
 
-
 time = ["dep:embassy-time", "embassy-embedded-hal/time"]
 
 exti = []
 
+# PY32F07x: the IN and OUT buffers of the same endpoint being shared
+# When this feature is enabled, the In and Out of an endpoint will not be used at the same time, except for ep0.
+# PY32F403: IN and OUT do not share FIFO, this feature is invalid
+allow-ep-shared-fifo = []
+
 py32f030k28 = ["py32-metapac/py32f030k28"]
 py32f030f16 = ["py32-metapac/py32f030f16"]
 py32f072c1b = ["py32-metapac/py32f072c1b"]

README.md

@@ -37,9 +37,7 @@ Supported chip flags: `py32f030f16`, `py32f030k28`, `py32f072c1b`, More is comin
 
 Note: Currently the program behavior has nothing to do with chip packaging.
 
-
-
-others should work if you are careful as most peripherals are similar enough.In fact, the IPs of peripherals in different PY32 series may be consistent. Moreover, some series use the same die, so it might not require much work.
+Others should work if you are careful as most peripherals are similar enough.In fact, the IPs of peripherals in different PY32 series may be consistent. Moreover, some series use the same die, so it might not require much work.
 
 For a full list of chip capabilities and peripherals, check the [py32-data](https://github.com/py32-rs/py32-data) repository.
 
@@ -57,14 +55,13 @@ For a full list of chip capabilities and peripherals, check the [py32-data](http
 | ADC        |                 | ✅+              | ✅               |      |
 | RTC        |                 |                 |                 |      |
 | Timer(PWM) |                 | ✅               | ❓               |      |
-| USB/OTG    | N/A             | N/A             |                 |      |
+| USB        | N/A             | N/A             | ✅+              |      |
 
-- ✅ : Expected to work
-- ❌ : Not implemented
-- ❓ : Not tested
-- `+` : marks the async driver
-- TODO: I haven't got a dev board yet, help-wanted
-- N/A: Not available
+- ✅ : Implemented
+- Blank : Not implemented
+- ❓ : Requires demo verification
+- `+` : Async support
+- N/A : Not available
 
 ## TODOs
 
@@ -92,6 +89,8 @@ Embassy requires that any TIM used as a time-driver has at least two channels, s
 
 `time-driver-systick`: Although we do not recommend using it and there are some shortcomings, it does work. For details, please see [systick-demo](examples/systick-time-driver-f030/README.md)
 
+For PY32F07x, F040, you can use TIM15, TIM3 or TIM1.
+
 ## Minimum supported Rust version(MSRV)
 
 This project is developed with a recent **nightly** version of Rust compiler. And is expected to work with beta versions of Rust.
@@ -114,3 +113,7 @@ All kinds of contributions are welcome.
 ## License
 
 This project is licensed under the MIT or Apache-2.0 license, at your option.
+
+
+
+Some peripheral driver code has been modified from [embassy-stm32]([embassy/embassy-stm32 at main · embassy-rs/embassy](https://github.com/embassy-rs/embassy/tree/main/embassy-stm32)). Big thanks to this project and its awesome contributors!

examples/py32f030/.cargo/config.toml

@@ -2,6 +2,10 @@
 # probe-rs chip list | grep -i PY32
 runner = 'probe-rs run --chip PY32F030x8'
 
+# rustflags = [
+#   "-C", "linker=flip-link",
+# ]
+
 [build]
 target = "thumbv6m-none-eabi"
 

examples/py32f030/src/bin/button_exti.rs

@@ -8,8 +8,6 @@ use py32_hal::exti::ExtiInput;
 use py32_hal::gpio::Pull;
 use {defmt_rtt as _, panic_probe as _};
 
-use py32_hal::interrupt;
-
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
     let p = py32_hal::init(Default::default());

examples/py32f030/src/bin/raw_rtt.rs

@@ -4,9 +4,11 @@
 use cortex_m_rt::entry;
 use defmt::*;
 use defmt_rtt as _;
-use hal::pac;
 use panic_halt as _;
+
 use py32_hal as hal;
+#[allow(unused_imports)]
+use hal::pac;
 
 #[entry]
 fn main() -> ! {

examples/py32f030/src/bin/usart.rs

@@ -5,7 +5,6 @@
 use embassy_executor::Spawner;
 use defmt::*;
 use py32_hal::usart::{Config, Uart};
-use py32_hal::{bind_interrupts, peripherals, usart};
 use {defmt_rtt as _, panic_probe as _};
 
 #[embassy_executor::main]

examples/py32f030/src/bin/usart_buffered.rs

@@ -7,7 +7,6 @@ use embassy_executor::Spawner;
 use py32_hal::usart::{BufferedUart, Config};
 use py32_hal::{bind_interrupts, peripherals, usart};
 use py32_hal::time::Hertz;
-use py32_hal::rcc::{Pll, PllSource, Sysclk};
 use embedded_io_async::Read;
 use embedded_io_async::Write;
 use {defmt_rtt as _, panic_probe as _};

examples/py32f072/.cargo/config.toml

@@ -1,11 +1,13 @@
 [target.thumbv6m-none-eabi]
 # probe-rs chip list | grep -i PY32
-runner = 'probe-rs run --chip PY32F072xb'
+runner = "probe-rs run --chip PY32F072xB"
+
+# rustflags = [
+#   "-C", "linker=flip-link",
+# ]
 
 [build]
-target = "thumbv6m-none-eabi"
+target = "thumbv6m-none-eabi"    # Cortex-M0 and Cortex-M0+
 
 [env]
-DEFMT_LOG = "trace"
-
-# rustflags = ["-C", "link-arg=-Tlink.x"]
+DEFMT_LOG = "info"

examples/py32f072/Cargo.toml

@@ -24,6 +24,15 @@ py32-hal = { path = "../../", features = [ "time-driver-tim15", "py32f072c1b"]}
 
 defmt = "0.3"
 defmt-rtt = "0.4"
+embassy-futures = "0.1.1"
+embassy-usb = { version = "0.3.0", features = [ "defmt"]}
+usbd-hid = "0.8.2"
+
+# embassy-usb-logger = "0.2.0"
+log = "0.4"
+
+portable-atomic = { version = "1.5", features = ["critical-section"] }
+static_cell = "2.1"
 
 # cargo build/run
 [profile.dev]

examples/py32f072/src/bin/raw_rtt.rs

@@ -4,9 +4,11 @@
 use cortex_m_rt::entry;
 use defmt::*;
 use defmt_rtt as _;
-use hal::pac;
 use panic_halt as _;
+
 use py32_hal as hal;
+#[allow(unused_imports)]
+use hal::pac;
 
 #[entry]
 fn main() -> ! {