diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /cyw43/src/fmt.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'cyw43/src/fmt.rs')
| -rw-r--r-- | cyw43/src/fmt.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cyw43/src/fmt.rs b/cyw43/src/fmt.rs index 5730447b3..9534c101c 100644 --- a/cyw43/src/fmt.rs +++ b/cyw43/src/fmt.rs | |||
| @@ -197,9 +197,6 @@ macro_rules! unwrap { | |||
| 197 | } | 197 | } |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | #[cfg(feature = "defmt-timestamp-uptime")] | ||
| 201 | defmt::timestamp! {"{=u64:us}", crate::time::Instant::now().as_micros() } | ||
| 202 | |||
| 203 | #[derive(Debug, Copy, Clone, Eq, PartialEq)] | 200 | #[derive(Debug, Copy, Clone, Eq, PartialEq)] |
| 204 | pub struct NoneError; | 201 | pub struct NoneError; |
| 205 | 202 | ||