max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #969

Browse Source 
969: usb: fix compile errors with the log feature r=Dirbaio a=newAM



Co-authored-by: Alex Martens <alex@thinglab.org>
This commit is contained in:
bors[bot] 2022-09-25 21:59:52 +00:00 committed by GitHub
commit 3c24ad2db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-usb-serial/src/lib.rs
View File

@ -268,7 +268,7 @@ impl<'d, D: Driver<'d>> CdcAcmClass<'d, D> {
} }
/// Number of stop bits for LineCoding /// Number of stop bits for LineCoding
#[derive(Copy, Clone, PartialEq, Eq)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum StopBits { pub enum StopBits {
/// 1 stop bit /// 1 stop bit
@ -292,7 +292,7 @@ impl From<u8> for StopBits {
} }
/// Parity for LineCoding /// Parity for LineCoding
#[derive(Copy, Clone, PartialEq, Eq)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum ParityType { pub enum ParityType {
None = 0, None = 0,
@ -316,7 +316,7 @@ impl From<u8> for ParityType {
/// ///
/// This is provided by the host for specifying the standard UART parameters such as baud rate. Can /// This is provided by the host for specifying the standard UART parameters such as baud rate. Can
/// be ignored if you don't plan to interface with a physical UART. /// be ignored if you don't plan to interface with a physical UART.
#[derive(Clone, Copy)] #[derive(Clone, Copy, Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub struct LineCoding { pub struct LineCoding {
stop_bits: StopBits, stop_bits: StopBits,

2
embassy-usb/src/lib.rs
View File

@ -247,7 +247,7 @@ impl<'d, D: Driver<'d>> UsbDevice<'d, D> {
async fn handle_control(&mut self, req: [u8; 8]) { async fn handle_control(&mut self, req: [u8; 8]) {
let req = Request::parse(&req); let req = Request::parse(&req);
trace!("control request: {:02x}", req); trace!("control request: {:?}", req);
match req.direction { match req.direction {
UsbDirection::In => self.handle_control_in(req).await, UsbDirection::In => self.handle_control_in(req).await,