Add debug logs

krzmaz · Dec 21, 2023 · 7c06580 · 7c06580
1 parent bf390f0
commit 7c06580
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 38 deletions.
diff --git a/src/bin/tcp.rs b/src/bin/tcp.rs
@@ -16,13 +16,13 @@ use embassy_net::tcp::TcpSocket;
 use embassy_net::{Stack, StackResources};
 use embassy_rp::bind_interrupts;
 use embassy_rp::gpio::{Level, Output};
-use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0, PIO1, USB};
+use embassy_rp::peripherals::{PIO0, PIO1, USB};
 use embassy_rp::pio::Pio;
 use embassy_rp::usb::Driver;
 use embassy_time::{Duration, Timer};
 use itertools::Itertools;
-use pico_w_neopixel_server::secret;
 use pico_w_neopixel_server::ws2812::Ws2812;
+use pico_w_neopixel_server::{logger_task, net_task, secret, wifi_task};
 use ringbuf::StaticRb;
 use static_cell::make_static;
 
@@ -32,23 +32,6 @@ bind_interrupts!(struct Irqs {
     PIO1_IRQ_0 => embassy_rp::pio::InterruptHandler<PIO1>;
 });
 
-#[embassy_executor::task]
-async fn wifi_task(
-    runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>,
-) -> ! {
-    runner.run().await
-}
-
-#[embassy_executor::task]
-async fn net_task(stack: &'static Stack<cyw43::NetDriver<'static>>) -> ! {
-    stack.run().await
-}
-
-#[embassy_executor::task]
-async fn logger_task(driver: Driver<'static, USB>) {
-    embassy_usb_logger::run!(1024, log::LevelFilter::Info, driver);
-}
-
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
     let p = embassy_rp::init(Default::default());
@@ -134,6 +117,7 @@ async fn main(spawner: Spawner) {
         loop {
             let count = match socket
                 .read_with(|x| {
+                    log::debug!("Received bytes: {:?}", x);
                     let n = prod.push_slice(x);
                     (n, n)
                 })

diff --git a/src/bin/udp.rs b/src/bin/udp.rs
@@ -16,13 +16,13 @@ use embassy_net::udp::{PacketMetadata, UdpSocket};
 use embassy_net::{Stack, StackResources};
 use embassy_rp::bind_interrupts;
 use embassy_rp::gpio::{Level, Output};
-use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0, PIO1, USB};
+use embassy_rp::peripherals::{PIO0, PIO1, USB};
 use embassy_rp::pio::Pio;
 use embassy_rp::usb::Driver;
 use embassy_time::Timer;
 use itertools::Itertools;
-use pico_w_neopixel_server::secret;
 use pico_w_neopixel_server::ws2812::Ws2812;
+use pico_w_neopixel_server::{logger_task, net_task, secret, wifi_task};
 use ringbuf::StaticRb;
 use static_cell::make_static;
 
@@ -32,23 +32,6 @@ bind_interrupts!(struct Irqs {
     PIO1_IRQ_0 => embassy_rp::pio::InterruptHandler<PIO1>;
 });
 
-#[embassy_executor::task]
-async fn wifi_task(
-    runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>,
-) -> ! {
-    runner.run().await
-}
-
-#[embassy_executor::task]
-async fn net_task(stack: &'static Stack<cyw43::NetDriver<'static>>) -> ! {
-    stack.run().await
-}
-
-#[embassy_executor::task]
-async fn logger_task(driver: Driver<'static, USB>) {
-    embassy_usb_logger::run!(1024, log::LevelFilter::Info, driver);
-}
-
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
     let p = embassy_rp::init(Default::default());
@@ -137,6 +120,7 @@ async fn main(spawner: Spawner) {
                     break;
                 }
             };
+            log::debug!("Received bytes: {:?}", &buf[0..count]);
             prod.push_slice(&buf[0..count]);
 
             if count > 1 {

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,34 @@
 #![no_std]
+#![feature(type_alias_impl_trait)]
+
 pub mod binary_info;
 pub mod panic;
 pub mod secret;
 pub mod ws2812;
+
+use cyw43_pio::PioSpi;
+use defmt_rtt as _;
+use embassy_net::Stack;
+use embassy_rp::gpio::Output;
+use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0, USB};
+use embassy_rp::usb::Driver;
+
+#[embassy_executor::task]
+pub async fn wifi_task(
+    runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>,
+) -> ! {
+    runner.run().await
+}
+
+#[embassy_executor::task]
+pub async fn net_task(stack: &'static Stack<cyw43::NetDriver<'static>>) -> ! {
+    stack.run().await
+}
+
+#[embassy_executor::task]
+pub async fn logger_task(driver: Driver<'static, USB>) {
+    #[cfg(not(debug_assertions))]
+    embassy_usb_logger::run!(1024, log::LevelFilter::Info, driver);
+    #[cfg(debug_assertions)]
+    embassy_usb_logger::run!(1024, log::LevelFilter::Debug, driver);
+}