diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-06-13 12:46:39 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-13 12:46:39 +0000 |
| commit | 624e46ccfb325c5e5ef15b34c7182cafdb62a7a2 (patch) | |
| tree | 43b963a9771771dc4209c3ae2b97b6f424c7c349 | |
| parent | db685c04049449ac3e4f256f2e7e26dad550d94c (diff) | |
| parent | 0c423cc9013b27b055b5f1446b3048210b75a5e7 (diff) | |
Merge #809
809: Allow compiling usb-serial without defmt r=lulf a=lulf
Co-authored-by: Ulf Lilleengen <[email protected]>
| -rw-r--r-- | embassy-usb-serial/src/lib.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/embassy-usb-serial/src/lib.rs b/embassy-usb-serial/src/lib.rs index 4d981e3fd..e3f8c7fff 100644 --- a/embassy-usb-serial/src/lib.rs +++ b/embassy-usb-serial/src/lib.rs | |||
| @@ -269,7 +269,8 @@ impl<'d, D: Driver<'d>> CdcAcmClass<'d, D> { | |||
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | /// Number of stop bits for LineCoding | 271 | /// Number of stop bits for LineCoding |
| 272 | #[derive(Copy, Clone, PartialEq, Eq, defmt::Format)] | 272 | #[derive(Copy, Clone, PartialEq, Eq)] |
| 273 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||
| 273 | pub enum StopBits { | 274 | pub enum StopBits { |
| 274 | /// 1 stop bit | 275 | /// 1 stop bit |
| 275 | One = 0, | 276 | One = 0, |
| @@ -292,7 +293,8 @@ impl From<u8> for StopBits { | |||
| 292 | } | 293 | } |
| 293 | 294 | ||
| 294 | /// Parity for LineCoding | 295 | /// Parity for LineCoding |
| 295 | #[derive(Copy, Clone, PartialEq, Eq, defmt::Format)] | 296 | #[derive(Copy, Clone, PartialEq, Eq)] |
| 297 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||
| 296 | pub enum ParityType { | 298 | pub enum ParityType { |
| 297 | None = 0, | 299 | None = 0, |
| 298 | Odd = 1, | 300 | Odd = 1, |
| @@ -315,7 +317,8 @@ impl From<u8> for ParityType { | |||
| 315 | /// | 317 | /// |
| 316 | /// This is provided by the host for specifying the standard UART parameters such as baud rate. Can | 318 | /// This is provided by the host for specifying the standard UART parameters such as baud rate. Can |
| 317 | /// be ignored if you don't plan to interface with a physical UART. | 319 | /// be ignored if you don't plan to interface with a physical UART. |
| 318 | #[derive(Clone, Copy, defmt::Format)] | 320 | #[derive(Clone, Copy)] |
| 321 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | ||
| 319 | pub struct LineCoding { | 322 | pub struct LineCoding { |
| 320 | stop_bits: StopBits, | 323 | stop_bits: StopBits, |
| 321 | data_bits: u8, | 324 | data_bits: u8, |
