4-add-wifi-connection (#5)

* save

* Update rust-toolchain.toml to use stable channel

* safely use wifi credentials via build.rs and include! in wifi_mgr

* better orga and errors when reading wifi secrets

* wifi connects

* build fails: missing wifi config file, need a dummy file for ci

---------

Co-authored-by: rafael <rafael>

Author: 1-rafael-1

.gitignore

@@ -1,4 +1,7 @@
 .idea/
 target
 Cargo.lock
-*.orig
+*.orig
+
+#secrets
+wifi_config.json

Cargo.toml

@@ -89,6 +89,10 @@ pio = "0.2.1"
 rand = { version = "0.8.5", default-features = false }
 embedded-sdmmc = "0.7.0"
 
+[build-dependencies]
+serde = "1.0"
+serde_json = "1.0"
+
 # for each crate in the `tests` directory
 [[test]]
 name = "validate_ci" # tests/test-name.rs

build.rs

@@ -8,12 +8,60 @@
 //! updating `memory.x` ensures a rebuild of the application with the
 //! new memory settings.
 
+use serde_json;
 use std::env;
+use std::fs;
 use std::fs::File;
+use std::io;
 use std::io::Write;
+use std::path::Path;
 use std::path::PathBuf;
 
 fn main() {
+    println!("in build.rs");
+    memory_x();
+    wifi_secrets().unwrap();
+}
+
+fn wifi_secrets() -> io::Result<()> {
+    println!("in wifi_secrets");
+    // Read the wifi_config.json file and write the SSID and password to wifi_secrets.rs
+
+    // Create a new file in the output directory
+    let out_dir = env::var("OUT_DIR").expect("OUT_DIR environment variable not set");
+    let dest_path = Path::new(&out_dir).join("wifi_secrets.rs");
+    let mut f = File::create(&dest_path).expect("Could not create wifi_secrets.rs file");
+
+    // Read the wifi_config.json file, or create it with dummy values if it doesn't exist
+    let config_path = Path::new("wifi_config.json");
+    let config_contents = if config_path.exists() {
+        fs::read_to_string(config_path).expect("Could not read wifi_config.json file")
+    } else {
+        println!("wifi_config.json not found, creating with dummy values");
+        let dummy_config = r#"{"ssid":"dummy","password":"dummy"}"#;
+        fs::write(config_path, dummy_config).expect("Could not write dummy wifi_config.json file");
+        dummy_config.to_string()
+    };
+
+    // Parse the JSON and extract the SSID and password
+    let config: serde_json::Value =
+        serde_json::from_str(&config_contents).expect("Could not parse wifi_config.json file");
+    let ssid = config["ssid"]
+        .as_str()
+        .expect("ssid not found in wifi_config.json file");
+    let password = config["password"]
+        .as_str()
+        .expect("password not found in wifi_config.json file");
+
+    // Write the SSID and password to wifi_secrets.rs
+    println!("in wifi_secrets, before writing ssid and password to output file");
+    writeln!(f, "pub const SSID: &str = {:?};", ssid)?;
+    writeln!(f, "pub const PASSWORD: &str = {:?};", password)?;
+    Ok(())
+}
+
+fn memory_x() {
+    print!("in memory_x");
     // Put `memory.x` in our output directory and ensure it's
     // on the linker search path.
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());

cargo-generate/Cargo.toml

@@ -0,0 +1,8 @@
+# Navigate to the cyw43-firmware directory
+Set-Location -Path "C:\Users\rafae\git\pi-pico-alarmclock-rust\cargo-generate\cyw43-firmware"
+
+# Download firmware using probe-rs
+Write-Host "Downloading firmware..."
+probe-rs download 43439A0.bin --binary-format bin --chip RP2040 --base-address 0x10100000
+probe-rs download 43439A0_clm.bin --binary-format bin --chip RP2040 --base-address 0x10140000
+Write-Host "Firmware download completed."

cargo-generate/launch.json

@@ -1,8 +1,6 @@
 # Before upgrading check that everything is available on all tier1 targets here:
 # https://rust-lang.github.io/rustup-components-history
 [toolchain]
-channel = "1.75"
-components = [ "rust-src", "rustfmt", "llvm-tools" ]
-targets = [
-    "thumbv6m-none-eabi",
-]
+channel = "stable"
+components = ["rust-src", "rustfmt", "llvm-tools"]
+targets = ["thumbv6m-none-eabi"]

cargo-generate/pre-hook.rhai

@@ -0,0 +1,6 @@
+use embassy_rp::peripherals::PIO0;
+use embassy_rp::pio::InterruptHandler;
+
+pub struct Irqs {
+    pub pio0_irq_0: InterruptHandler<PIO0>,
+}

cargo-generate/wifi-blinky.rs

@@ -1,2 +1,4 @@
 pub mod btn_mgr;
+pub mod irqs;
 pub mod state_mgr;
+pub mod wifi_mgr;