hodasemi/embassy_pico_mouse
1
0
Fork 0
Code Issues 1 Pull requests 1 Actions Projects Releases Wiki Activity

Update dependencies
Some checks failed
Gavania Merge Build / build (pull_request) Failing after 15m16s
Details

Browse source
This commit is contained in:
hodasemi 2023-08-25 14:14:35 +02:00
parent dfcb6c3382
commit 2d60a46e2b
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.toml
View file

@ -6,17 +6,15 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
embassy-executor = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } embassy-executor = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy", features = ["nightly", "arch-cortex-m", "executor-thread", "integrated-timers"] }
embassy-rp = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "pio", "critical-section-impl"] } embassy-rp = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["unstable-traits", "nightly", "unstable-pac", "time-driver", "critical-section-impl"] }
embassy-usb = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "msos-descriptor"] } embassy-usb = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["msos-descriptor"] }
embassy-time = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "defmt-timestamp-uptime"] } embassy-time = { version = "0.1.2", git = "https://github.com/embassy-rs/embassy", features = ["defmt-timestamp-uptime"] }
embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" } embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" }
numtoa = "0.2.4" numtoa = "0.2.4"
usbd-hid = "0.6.1" usbd-hid = "0.6.1"
defmt = "0.3"
defmt-rtt = "0.4" defmt-rtt = "0.4"
cortex-m = { version = "0.7.6" } cortex-m = { version = "0.7.6" }

12
src/usb_serial/mod.rs
View file

@ -4,8 +4,9 @@ use numtoa::NumToA;
use core::future::Future; use core::future::Future;
use embassy_rp::usb::Driver; use embassy_rp::bind_interrupts;
use embassy_rp::{interrupt, peripherals::USB}; use embassy_rp::peripherals::USB;
use embassy_rp::usb::{Driver, InterruptHandler};
use embassy_usb::class::cdc_acm::{CdcAcmClass, State}; use embassy_usb::class::cdc_acm::{CdcAcmClass, State};
use embassy_usb::{Builder, Config, UsbDevice}; use embassy_usb::{Builder, Config, UsbDevice};
@ -28,6 +29,10 @@ pub trait Sender {
T: NumToA<I>; T: NumToA<I>;
} }
bind_interrupts!(struct Irqs {
USBCTRL_IRQ => InterruptHandler<USB>;
});
pub struct Serial<'a> { pub struct Serial<'a> {
class: CdcAcmClass<'a, Driver<'a, USB>>, class: CdcAcmClass<'a, Driver<'a, USB>>,
} }
@ -38,8 +43,7 @@ impl Serial<'static> {
serial_config: SerialConfig<'static>, serial_config: SerialConfig<'static>,
) -> (Serial<'static>, impl Future<Output = !>) { ) -> (Serial<'static>, impl Future<Output = !>) {
// Create the driver, from the HAL. // Create the driver, from the HAL.
let irq = interrupt::take!(USBCTRL_IRQ); let driver = Driver::new(usb, Irqs);
let driver = Driver::new(usb, irq);
// Create embassy-usb Config // Create embassy-usb Config
let mut config = Config::new( let mut config = Config::new(