Update for makers day

Cargo.lock

···
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aead"
···
 
 [[package]]
 name = "bt-hci"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "499d74e90e6b1e61660adc8fb5f17aeac9487bced16f57c1f91a8783736ada53"
+checksum = "d69e2db053409c36c45a403da58072b8bf75bdc962746c0a12df9dec0fce92d2"
 dependencies = [
  "defmt",
  "embassy-sync 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "embassy-time",
  "embedded-io",
  "embedded-io-async",
  "futures-intrusive",
···
 
 [[package]]
 name = "critical-section"
-version = "1.1.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crunchy"
···
 [[package]]
 name = "embassy-futures"
 version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067"
-
-[[package]]
-name = "embassy-futures"
-version = "0.1.1"
 source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6"
 
 [[package]]
···
 ]
 
 [[package]]
-name = "embassy_rp_w_template"
-version = "0.1.0"
-dependencies = [
- "assign-resources",
- "bt-hci",
- "byte-slice-cast 1.2.2",
- "cortex-m",
- "cortex-m-rt",
- "critical-section",
- "cyw43",
- "cyw43-pio",
- "defmt",
- "defmt-rtt",
- "display-interface",
- "display-interface-spi",
- "embassy-embedded-hal",
- "embassy-executor",
- "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git)",
- "embassy-net",
- "embassy-net-wiznet",
- "embassy-rp",
- "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)",
- "embassy-time",
- "embassy-usb 0.3.0",
- "embassy-usb-logger",
- "embedded-graphics",
- "embedded-hal 1.0.0",
- "embedded-hal-async",
- "embedded-hal-bus",
- "embedded-io-async",
- "embedded-sdmmc",
- "embedded-storage",
- "embedded-text",
- "fixed",
- "fixed-macro",
- "heapless 0.8.0",
- "log",
- "panic-probe",
- "pio",
- "pio-proc",
- "portable-atomic",
- "postcard",
- "rand",
- "reqwless",
- "serde",
- "serde-json-core",
- "shtcx",
- "smart-leds",
- "st7789",
- "static_cell",
- "tinybmp",
- "trouble-host",
- "uc8151",
- "usbd-hid",
-]
-
-[[package]]
 name = "embedded-graphics"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 dependencies = [
  "az",
  "byteorder",
- "embedded-graphics-core 0.4.0",
+ "embedded-graphics-core",
  "float-cmp",
  "micromath",
-]
-
-[[package]]
-name = "embedded-graphics-core"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b1239db5f3eeb7e33e35bd10bd014e7b2537b17e071f726a09351431337cfa"
-dependencies = [
- "az",
- "byteorder",
 ]
 
 [[package]]
···
 checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
+name = "rusty_badger"
+version = "0.1.0"
+dependencies = [
+ "assign-resources",
+ "byte-slice-cast 1.2.2",
+ "cortex-m",
+ "cortex-m-rt",
+ "critical-section",
+ "cyw43",
+ "cyw43-pio",
+ "defmt",
+ "defmt-rtt",
+ "display-interface-spi",
+ "embassy-embedded-hal",
+ "embassy-executor",
+ "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git)",
+ "embassy-net",
+ "embassy-net-wiznet",
+ "embassy-rp",
+ "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)",
+ "embassy-time",
+ "embassy-usb 0.3.0",
+ "embassy-usb-logger",
+ "embedded-graphics",
+ "embedded-hal 1.0.0",
+ "embedded-hal-async",
+ "embedded-hal-bus",
+ "embedded-io-async",
+ "embedded-sdmmc",
+ "embedded-storage",
+ "embedded-text",
+ "fixed",
+ "fixed-macro",
+ "heapless 0.8.0",
+ "log",
+ "panic-probe",
+ "pio",
+ "pio-proc",
+ "portable-atomic",
+ "postcard",
+ "rand",
+ "reqwless",
+ "serde",
+ "serde-json-core",
+ "shtcx",
+ "smart-leds",
+ "static_cell",
+ "tinybmp",
+ "uc8151",
+ "usbd-hid",
+]
+
+[[package]]
 name = "ryu"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
-name = "st7789"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cba7306a9ca07ffcafd13ac1eaac2d5cedc8e9fc0d342ef674e0f0d059c8f8a9"
-dependencies = [
- "display-interface",
- "embedded-graphics-core 0.3.3",
- "embedded-hal 0.2.7",
- "heapless 0.7.17",
- "nb 1.1.0",
-]
-
-[[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
-name = "trouble-host"
-version = "0.1.0"
-source = "git+https://github.com/embassy-rs/trouble.git?rev=4b8c0f499b34e46ca23a56e2d1640ede371722cf#4b8c0f499b34e46ca23a56e2d1640ede371722cf"
-dependencies = [
- "bt-hci",
- "defmt",
- "embassy-futures 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "embassy-sync 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "embassy-time",
- "embedded-io-async",
- "futures",
- "heapless 0.8.0",
-]
-
-[[package]]
 name = "typenum"
 version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 version = "0.3.0"
 source = "git+https://github.com/9names/uc8151-rs.git#37a7feee23716506b777bd4032327038e7e0786a"
 dependencies = [
- "embedded-graphics-core 0.4.0",
+ "embedded-graphics-core",
  "embedded-hal 1.0.0",
  "embedded-hal-async",
 ]
···
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[patch.unused]]
+name = "trouble-host"
+version = "0.1.0"
+source = "git+https://github.com/embassy-rs/trouble.git?rev=4b8c0f499b34e46ca23a56e2d1640ede371722cf#4b8c0f499b34e46ca23a56e2d1640ede371722cf"

Cargo.toml

···
 [package]
-name = "embassy_rp_w_template"
+name = "rusty_badger"
 version = "0.1.0"
 edition = "2021"
 
···
 ] }
 cyw43-pio = { version = "0.2.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [
     "defmt",
-    "overclock",
 ] }
 
 defmt = "0.3"
···
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 display-interface-spi = "0.4.1"
 embedded-graphics = "0.8.0"
-st7789 = "0.6.1"
-display-interface = "0.4.1"
 byte-slice-cast = { version = "1.2.0", default-features = false }
 smart-leds = "0.3.0"
 heapless = { version = "0.8", features = ["serde"] }
···
 pio = "0.2.1"
 rand = { version = "0.8.5", default-features = false }
 embedded-sdmmc = "0.7.0"
-bt-hci = { version = "0.1.0", default-features = false, features = ["defmt"] }
-trouble-host = { version = "0.1.0", features = ["defmt", "gatt"] }
 uc8151 = { git = "https://github.com/9names/uc8151-rs.git", features = [
     "graphics",
 ] }

src/badge_display/display_image.rs

···
 
 use super::CURRENT_IMAGE;
 
-static NUMBER_OF_IMAGES: u8 = 2;
+static NUMBER_OF_IMAGES: u8 = 3;
 static FERRIS_IMG: &[u8; 15722] = include_bytes!("../../images/ferris_w_a_knife.bmp");
 static REPO_IMG: &[u8; 11262] = include_bytes!("../../images/repo.bmp");
+static MTRAS_LOGO: &[u8; 10378] = include_bytes!("../../images/mtras_logo.bmp");
 
 pub enum DisplayImage {
     Ferris = 0,
     Repo = 1,
+    MtrasLogo = 2,
 }
 
 pub fn get_current_image() -> DisplayImage {
···
         match value {
             0 => Some(Self::Ferris),
             1 => Some(Self::Repo),
+            2 => Some(Self::MtrasLogo),
             _ => None,
         }
     }
···
         match self {
             Self::Ferris => 0,
             Self::Repo => 1,
+            Self::MtrasLogo => 2,
         }
     }
 
···
         match self {
             Self::Ferris => FERRIS_IMG,
             Self::Repo => REPO_IMG,
+            Self::MtrasLogo => MTRAS_LOGO,
         }
     }
 
···
         match self {
             Self::Ferris => Point::new(150, 26),
             Self::Repo => Point::new(190, 26),
+            Self::MtrasLogo => Point::new(190, 26),
         }
     }
 }

src/badge_display/mod.rs

···
 use uc8151::{asynch::Uc8151, HEIGHT};
 use {defmt_rtt as _, panic_probe as _};
 
-use crate::{env::env_value, helpers::easy_format, Spi0Bus};
+use crate::{
+    env::env_value,
+    helpers::{easy_format, easy_format_str},
+    Spi0Bus,
+};
 
 pub type RecentWifiNetworksVec = Vec<String<32>, 4>;
 
···
         .into_styled(PrimitiveStyle::with_fill(BinaryColor::On))
         .draw(&mut display)
         .unwrap();
-
-    // Create the text box and apply styling options.
-    let display_text = easy_format::<29>(format_args!(
-        "{}\n{}",
-        env_value("NAME"),
-        env_value("DETAILS")
-    ));
+    info!("Name: {}", env_value("NAME"));
+    info!("Details: {}", env_value("DETAILS"));
+    let mut name_and_details_buffer = [0; 128];
+    let name_and_details = easy_format_str(
+        format_args!("{}\n{}", env_value("NAME"), env_value("DETAILS")),
+        &mut name_and_details_buffer,
+    );
 
     let name_and_detail_box = TextBox::with_textbox_style(
-        &display_text,
+        &name_and_details.unwrap(),
         name_and_detail_bounds,
         character_style,
         textbox_style,

src/cyw43_driver.rs

···
 ) -> (Device<'a>, Control<'a>) {
     let fw = include_bytes!("../cyw43-firmware/43439A0.bin");
     let clm = include_bytes!("../cyw43-firmware/43439A0_clm.bin");
-    let btfw = include_bytes!("../cyw43-firmware/43439A0_btfw.bin");
+    // let btfw = include_bytes!("../cyw43-firmware/43439A0_btfw.bin");
 
     // To make flashing faster for development, you may want to flash the firmwares independently
     // at hardcoded addresses, instead of baking them into the program with `include_bytes!`:
···
 
     static STATE: StaticCell<cyw43::State> = StaticCell::new();
     let state = STATE.init(cyw43::State::new());
-    let (net_device, _bt_device, mut control, runner) =
-        cyw43::new_with_bluetooth(state, pwr, spi, fw, btfw).await;
+    let (net_device, mut control, runner) = cyw43::new(state, pwr, spi, fw).await;
     unwrap!(spawner.spawn(cyw43_task(runner)));
 
     control.init(clm).await;

src/helpers.rs

···
         }
     }
 }
+
+pub fn easy_format_str<'a>(
+    args: Arguments<'_>,
+    buffer: &'a mut [u8],
+) -> Result<&'a str, core::fmt::Error> {
+    let mut writer = BufWriter::new(buffer);
+    let result = core::fmt::write(&mut writer, args);
+
+    match result {
+        Ok(_) => {
+            let len = writer.len();
+            let response_str = core::str::from_utf8(&buffer[..len]).unwrap();
+            Ok(response_str)
+        }
+        Err(_) => {
+            panic!("Error formatting the string")
+        }
+    }
+}
+
+// A simple wrapper struct to use core::fmt::Write on a [u8] buffer
+pub struct BufWriter<'a> {
+    buf: &'a mut [u8],
+    pos: usize,
+}
+
+impl<'a> BufWriter<'a> {
+    pub fn new(buf: &'a mut [u8]) -> Self {
+        BufWriter { buf, pos: 0 }
+    }
+
+    pub fn len(&self) -> usize {
+        self.pos
+    }
+}
+
+impl<'a> core::fmt::Write for BufWriter<'a> {
+    fn write_str(&mut self, s: &str) -> core::fmt::Result {
+        let bytes = s.as_bytes();
+        if self.pos + bytes.len() > self.buf.len() {
+            return Err(core::fmt::Error); // Buffer overflow
+        }
+
+        self.buf[self.pos..self.pos + bytes.len()].copy_from_slice(bytes);
+        self.pos += bytes.len();
+        Ok(())
+    }
+}

src/main.rs

···
 
             let mut recent_networks = RecentWifiNetworksVec::new();
             let mut scanner = control.scan(Default::default()).await;
+
             while let Some(bss) = scanner.next().await {
                 process_bssid(bss.bssid, &mut save.wifi_counted, &mut save.bssid);
                 if recent_networks.len() < 8 {
                     let possible_ssid = core::str::from_utf8(&bss.ssid);
                     match possible_ssid {
                         Ok(ssid) => {
-                            info!("ssid: {}", ssid);
-                            let ssid_string = easy_format::<32>(format_args!("{}", ssid.trim()));
+                            let removed_zeros = ssid.trim_end_matches(char::from(0));
+                            let ssid_string: String<32> =
+                                easy_format::<32>(format_args!("{}", removed_zeros));
+
                             if recent_networks.contains(&ssid_string) {
                                 continue;
                             }