aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-09-25 21:59:52 +0000
committerGitHub <[email protected]>2022-09-25 21:59:52 +0000
commit3c24ad2db64ff46d8b16a55248bbe7af0798a9a4 (patch)
tree3277e4ec6da307d6f1f6ef1a34624befd9a360c0
parenta226e865036e2744446fe31cc6a75fef25efd4b5 (diff)
parenta45fb2d7183738bdcc020a9b1916fdfab469ec0c (diff)
Merge #969
969: usb: fix compile errors with the log feature r=Dirbaio a=newAM Co-authored-by: Alex Martens <[email protected]>
-rw-r--r--embassy-usb-serial/src/lib.rs6
-rw-r--r--embassy-usb/src/lib.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/embassy-usb-serial/src/lib.rs b/embassy-usb-serial/src/lib.rs
index 27b536a6b..15c2bb0a7 100644
--- a/embassy-usb-serial/src/lib.rs
+++ b/embassy-usb-serial/src/lib.rs
@@ -268,7 +268,7 @@ impl<'d, D: Driver<'d>> CdcAcmClass<'d, D> {
268} 268}
269 269
270/// Number of stop bits for LineCoding 270/// Number of stop bits for LineCoding
271#[derive(Copy, Clone, PartialEq, Eq)] 271#[derive(Copy, Clone, Debug, PartialEq, Eq)]
272#[cfg_attr(feature = "defmt", derive(defmt::Format))] 272#[cfg_attr(feature = "defmt", derive(defmt::Format))]
273pub enum StopBits { 273pub enum StopBits {
274 /// 1 stop bit 274 /// 1 stop bit
@@ -292,7 +292,7 @@ impl From<u8> for StopBits {
292} 292}
293 293
294/// Parity for LineCoding 294/// Parity for LineCoding
295#[derive(Copy, Clone, PartialEq, Eq)] 295#[derive(Copy, Clone, Debug, PartialEq, Eq)]
296#[cfg_attr(feature = "defmt", derive(defmt::Format))] 296#[cfg_attr(feature = "defmt", derive(defmt::Format))]
297pub enum ParityType { 297pub enum ParityType {
298 None = 0, 298 None = 0,
@@ -316,7 +316,7 @@ impl From<u8> for ParityType {
316/// 316///
317/// This is provided by the host for specifying the standard UART parameters such as baud rate. Can 317/// This is provided by the host for specifying the standard UART parameters such as baud rate. Can
318/// be ignored if you don't plan to interface with a physical UART. 318/// be ignored if you don't plan to interface with a physical UART.
319#[derive(Clone, Copy)] 319#[derive(Clone, Copy, Debug)]
320#[cfg_attr(feature = "defmt", derive(defmt::Format))] 320#[cfg_attr(feature = "defmt", derive(defmt::Format))]
321pub struct LineCoding { 321pub struct LineCoding {
322 stop_bits: StopBits, 322 stop_bits: StopBits,
diff --git a/embassy-usb/src/lib.rs b/embassy-usb/src/lib.rs
index ca7dde627..6f58c953c 100644
--- a/embassy-usb/src/lib.rs
+++ b/embassy-usb/src/lib.rs
@@ -247,7 +247,7 @@ impl<'d, D: Driver<'d>> UsbDevice<'d, D> {
247 async fn handle_control(&mut self, req: [u8; 8]) { 247 async fn handle_control(&mut self, req: [u8; 8]) {
248 let req = Request::parse(&req); 248 let req = Request::parse(&req);
249 249
250 trace!("control request: {:02x}", req); 250 trace!("control request: {:?}", req);
251 251
252 match req.direction { 252 match req.direction {
253 UsbDirection::In => self.handle_control_in(req).await, 253 UsbDirection::In => self.handle_control_in(req).await,