INFRA - Use Rust procedural macros to reduce code duplication in boar…

…d crates (#52)

Cargo.toml

@@ -1,7 +1,10 @@
 [workspace]
 members = [
   "config",
-  "lib/*"
+  "lib/core",
+  "lib/io/*",
+  "lib/localisation",
+  "lib/sensors"
 ]
 exclude = [
   "boards/stm32l476rg",

_typos.toml

@@ -1,2 +1,5 @@
 [default.extend-words]
-mosquitto = "mosquitto"
+mosquitto = "mosquitto"
+
+[files]
+extend-exclude = ["telemetry/pnpm-lock.yaml"]

boards/stm32f767zi/Cargo.toml

@@ -23,5 +23,11 @@ critical-section = "1.1"
 embedded-storage = "0.3.1"
 static_cell = "2"
 
-hyped_io = { path = "../../lib/io" }
 hyped_sensors = { path = "../../lib/sensors" }
+
+hyped_adc = { path = "../../lib/io/hyped_adc" }
+hyped_adc_derive = { path = "../../lib/io/hyped_adc/hyped_adc_derive" }
+hyped_i2c = { path = "../../lib/io/hyped_i2c" }
+hyped_i2c_derive = { path = "../../lib/io/hyped_i2c/hyped_i2c_derive" }
+hyped_gpio_input = { path = "../../lib/io/hyped_gpio_input" }
+hyped_gpio_input_derive = { path = "../../lib/io/hyped_gpio_input/hyped_gpio_input_derive" }

boards/stm32f767zi/src/bin/adc_test.rs

@@ -6,8 +6,8 @@ use defmt::*;
 use embassy_executor::Spawner;
 use embassy_stm32::adc::{Adc, AdcChannel};
 use embassy_time::Timer;
-use hyped_boards_stm32f767zi::io::adc::Stm32f767ziAdc;
-use hyped_io::adc::HypedAdc;
+use hyped_adc::HypedAdc;
+use hyped_boards_stm32f767zi::io::Stm32f767ziAdc;
 use {defmt_rtt as _, panic_probe as _};
 
 #[embassy_executor::main]

boards/stm32f767zi/src/io.rs

@@ -1,3 +1,26 @@
-pub mod adc;
-pub mod gpio;
-pub mod i2c;
+use embassy_stm32::adc::{Adc, AnyAdcChannel, Instance};
+use embassy_stm32::gpio::Input;
+use embassy_stm32::{i2c::I2c, mode::Blocking};
+
+use hyped_adc::HypedAdc;
+use hyped_adc_derive::HypedAdc;
+use hyped_gpio_input::HypedGpioInput;
+use hyped_gpio_input_derive::HypedGpioInput;
+use hyped_i2c::{HypedI2c, I2cError};
+use hyped_i2c_derive::HypedI2c;
+
+#[derive(HypedAdc)]
+pub struct Stm32f767ziAdc<'d, T: Instance> {
+    adc: Adc<'d, T>,
+    channel: AnyAdcChannel<T>,
+}
+
+#[derive(HypedGpioInput)]
+pub struct Stm32f767ziGpioInput {
+    pin: Input<'static>,
+}
+
+#[derive(HypedI2c)]
+pub struct Stm32f767ziI2c<'d> {
+    i2c: I2c<'d, Blocking>,
+}

boards/stm32f767zi/src/tasks/keyence.rs

@@ -1,4 +1,4 @@
-use crate::io::gpio::Stm32f767ziGpio;
+use crate::io::Stm32f767ziGpioInput;
 use embassy_stm32::gpio::{Input, Pull};
 use embassy_time::{Duration, Timer};
 use hyped_sensors::keyence::Keyence;
@@ -7,7 +7,7 @@ use hyped_sensors::keyence::Keyence;
 #[embassy_executor::task]
 pub async fn read_keyence() -> ! {
     let p = embassy_stm32::init(Default::default());
-    let mut keyence = Keyence::new(Stm32f767ziGpio::new(Input::new(p.PC13, Pull::Down)));
+    let mut keyence = Keyence::new(Stm32f767ziGpioInput::new(Input::new(p.PC13, Pull::Down)));
 
     loop {
         keyence.update_stripe_count();

boards/stm32f767zi/src/tasks/temperature.rs

@@ -1,4 +1,4 @@
-use crate::io::i2c::Stm32f767ziI2c;
+use crate::io::Stm32f767ziI2c;
 use defmt_rtt as _;
 use embassy_stm32::i2c::I2c;
 use embassy_stm32::time::Hertz;

boards/stm32l432kc/Cargo.toml

@@ -23,6 +23,5 @@ critical-section = "1.1"
 embedded-storage = "0.3.1"
 static_cell = "2"
 
-hyped_io = { path = "../../lib/io" }
 hyped_sensors = { path = "../../lib/sensors" }
 advanced-pid = { version = "0.2.2", default-features = false }