Fixed .env not getting loaded in build.rs, added dev.toml

Author: TheButlah

firmware/.env.template

@@ -12,5 +12,4 @@ DEFMT_LOG="info"
 
 # Provide this if you have a particular board you want to use. Note that relative paths
 # are resolved from the same folder as `build.rs`.
-BOARD="boards/ferrous_slime.toml"
-
+BOARD="boards/dev.toml"

firmware/.gitignore

@@ -3,3 +3,4 @@
 *.bin
 *.uf2
 \.env
+/boards/dev.toml # convenient for testing out settings locally

firmware/.vscode/launch.json

@@ -9,12 +9,13 @@
             "type": "probe-rs-debug",
             "request": "launch",
             "flashingConfig": {
-                "flashingEnabled": true,
+                "flashingEnabled": false,
                 "resetAfterFlashing": true,
                 "haltAfterReset": true,
             },
+            "connectUnderReset": true,
             "runtimeExecutable": "/home/ryan/.cargo/bin/probe-rs-debugger",
-            "consoleLogLevel": "Debug",
+            // "consoleLogLevel": "Trace",
             "name": "probe_rs Executable Test",
             "chip": "esp32c3", //!MODIFY
             "wireProtocol": "Jtag",

firmware/Cargo.lock

@@ -207,8 +207,8 @@ fugit = "0.3"
 firmware_protocol = { path = "../networking/firmware_protocol", features = [
   "nalgebra031",
 ] }
-load-dotenv = "0.1"
 paste = "1.0"
+load-dotenv = "0.1"
 
 [build-dependencies]
 feature_utils = "0.0.0"
@@ -217,7 +217,7 @@ serde = { version = "1", features = ["derive"] }
 toml = "0.5"
 eyre = "0.6"
 color-eyre = "0.6"
-
+dotenvy = "0.15"
 
 [patch.crates-io]
 # Enable non-default I2C addresses and InitError

firmware/Cargo.toml

@@ -0,0 +1,7 @@
+[pins]
+scl = "2"
+sda = "4"
+int0 = "6"
+int1 = "7"
+tx = "8"
+rx = "9"

firmware/boards/dev.toml

@@ -33,6 +33,7 @@ macro_rules! memory_x {
 }
 
 fn main() -> Result<()> {
+	let _ = dotenvy::dotenv();
 	#[cfg(all(feature = "mcu-nrf52832", feature = "log-usb-serial"))]
 	compile_error!("the nrf52832 doesn't support USB!");
 
@@ -146,7 +147,8 @@ struct Pins {
 impl BoardConfig {
 	/// Loads a board config from a file
 	fn from_file(p: &Path) -> Result<Self> {
-		let s = std::fs::read_to_string(p).wrap_err("Failed to read board toml")?;
+		let s = std::fs::read_to_string(p.clone())
+			.wrap_err(format!("Failed to read board toml: {}", p.display()))?;
 		toml::from_str(&s).wrap_err("Failed to deserialize board toml")
 	}
 	/// Gets the path to the board config, or errors if we can't pick one.

firmware/build.rs

@@ -63,11 +63,12 @@ pub fn get_peripherals() -> Peripherals<I2cConcrete<'static>, DelayConcrete> {
 	}
 
 	let io = esp32c3_hal::IO::new(p.GPIO, p.IO_MUX);
-	// let hz =
+	let sda = map_pin!(io, env!("PIN_SDA"));
+	let scl = map_pin!(io, env!("PIN_SCL"));
 	let i2c = esp32c3_hal::i2c::I2C::new(
 		p.I2C0,
-		map_pin!(io, env!("PIN_SDA")),
-		map_pin!(io, env!("PIN_SCL")),
+		sda,
+		scl,
 		400u32.kHz(),
 		&mut system.peripheral_clock_control,
 		&clocks,