From 2d60a46e2b0725999b19e9e8cca2548bba519461 Mon Sep 17 00:00:00 2001
From: hodasemi <michaelh.95@t-online.de>
Date: Fri, 25 Aug 2023 14:14:35 +0200
Subject: [PATCH] Update dependencies

---
 Cargo.toml            | 10 ++++------
 src/usb_serial/mod.rs | 12 ++++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7515d93..6ef55ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,17 +6,15 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-embassy-executor = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["arch-cortex-m", "executor-thread", "defmt", "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-usb = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "msos-descriptor"] }
-embassy-time = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "defmt-timestamp-uptime"] }
+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 = ["unstable-traits", "nightly", "unstable-pac", "time-driver", "critical-section-impl"] }
+embassy-usb = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["msos-descriptor"] }
+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" }
 
 numtoa = "0.2.4"
 
 usbd-hid = "0.6.1"
-
-defmt = "0.3"
 defmt-rtt = "0.4"
 
 cortex-m = { version = "0.7.6" }
diff --git a/src/usb_serial/mod.rs b/src/usb_serial/mod.rs
index a3946be..3d3b605 100644
--- a/src/usb_serial/mod.rs
+++ b/src/usb_serial/mod.rs
@@ -4,8 +4,9 @@ use numtoa::NumToA;
 
 use core::future::Future;
 
-use embassy_rp::usb::Driver;
-use embassy_rp::{interrupt, peripherals::USB};
+use embassy_rp::bind_interrupts;
+use embassy_rp::peripherals::USB;
+use embassy_rp::usb::{Driver, InterruptHandler};
 
 use embassy_usb::class::cdc_acm::{CdcAcmClass, State};
 use embassy_usb::{Builder, Config, UsbDevice};
@@ -28,6 +29,10 @@ pub trait Sender {
         T: NumToA<I>;
 }
 
+bind_interrupts!(struct Irqs {
+    USBCTRL_IRQ => InterruptHandler<USB>;
+});
+
 pub struct Serial<'a> {
     class: CdcAcmClass<'a, Driver<'a, USB>>,
 }
@@ -38,8 +43,7 @@ impl Serial<'static> {
         serial_config: SerialConfig<'static>,
     ) -> (Serial<'static>, impl Future<Output = !>) {
         // Create the driver, from the HAL.
-        let irq = interrupt::take!(USBCTRL_IRQ);
-        let driver = Driver::new(usb, irq);
+        let driver = Driver::new(usb, Irqs);
 
         // Create embassy-usb Config
         let mut config = Config::new(