From bd5ef80bec42c91cb1b4fd50ea4bbc12eac85283 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Mon, 7 Nov 2022 20:51:29 +0100 Subject: [PATCH 1/2] Ensure embassy-lora stm32wl supports log crate --- embassy-lora/src/stm32wl/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/embassy-lora/src/stm32wl/mod.rs b/embassy-lora/src/stm32wl/mod.rs index 8d5d1953..08bf32f9 100644 --- a/embassy-lora/src/stm32wl/mod.rs +++ b/embassy-lora/src/stm32wl/mod.rs @@ -70,7 +70,7 @@ impl<'d, RS: RadioSwitch> SubGhzRadio<'d, RS> { /// Perform a transmission with the given parameters and payload. Returns any time adjustements needed form /// the upcoming RX window start. async fn do_tx(&mut self, config: TxConfig, buf: &[u8]) -> Result { - trace!("TX request: {}", config); + trace!("TX request: {:?}", config); self.switch.set_tx(); self.radio @@ -130,7 +130,7 @@ impl<'d, RS: RadioSwitch> SubGhzRadio<'d, RS> { /// be able to hold a single LoRaWAN packet. async fn do_rx(&mut self, config: RfConfig, buf: &mut [u8]) -> Result<(usize, RxQuality), RadioError> { assert!(buf.len() >= 255); - trace!("RX request: {}", config); + trace!("RX request: {:?}", config); self.switch.set_rx(); self.radio.set_rf_frequency(&RfFreq::from_frequency(config.frequency))?; @@ -172,7 +172,7 @@ impl<'d, RS: RadioSwitch> SubGhzRadio<'d, RS> { self.radio.read_buffer(ptr, &mut buf[..len as usize])?; self.radio.set_standby(StandbyClk::Rc)?; - trace!("RX done: {=[u8]:#02X}", &mut buf[..len as usize]); + trace!("RX done: {:02x?}", &mut buf[..len as usize]); return Ok((len as usize, RxQuality::new(rssi, snr as i8))); } @@ -193,7 +193,7 @@ impl<'d, RS: RadioSwitch> SubGhzRadio<'d, RS> { .clear_irq_status(irq_status) .expect("error clearing irq status"); - trace!("SUGHZ IRQ 0b{=u16:b}, {:?}", irq_status, status); + trace!("SUGHZ IRQ 0b{:016b}, {:?}", irq_status, status); if irq_status == 0 { Poll::Pending From a3a58e8e4a1f27402c0800356ec5bb5bf39478ec Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Wed, 9 Nov 2022 10:04:37 +0100 Subject: [PATCH 2/2] Special handling for log and defmt --- embassy-lora/src/stm32wl/mod.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/embassy-lora/src/stm32wl/mod.rs b/embassy-lora/src/stm32wl/mod.rs index 08bf32f9..6ed63bf7 100644 --- a/embassy-lora/src/stm32wl/mod.rs +++ b/embassy-lora/src/stm32wl/mod.rs @@ -172,6 +172,10 @@ impl<'d, RS: RadioSwitch> SubGhzRadio<'d, RS> { self.radio.read_buffer(ptr, &mut buf[..len as usize])?; self.radio.set_standby(StandbyClk::Rc)?; + #[cfg(feature = "defmt")] + trace!("RX done: {=[u8]:#02X}", &mut buf[..len as usize]); + + #[cfg(feature = "log")] trace!("RX done: {:02x?}", &mut buf[..len as usize]); return Ok((len as usize, RxQuality::new(rssi, snr as i8))); }