rust/Cargo.toml

@@ -38,13 +38,13 @@ command = [
 partition_table = "partitions.csv"
 
 [features]
-default = ["std", "esp-idf-svc/native"]
+default = ["std", "embassy", "esp-idf-svc/native"]
 pio = ["esp-idf-svc/pio"]
 std = ["alloc", "esp-idf-svc/binstart", "esp-idf-svc/std"]
 alloc = ["esp-idf-svc/alloc"]
 nightly = ["esp-idf-svc/nightly"]
 experimental = ["esp-idf-svc/experimental"]
-#embassy = ["esp-idf-svc/embassy-sync", "esp-idf-svc/critical-section", "esp-idf-svc/embassy-time-driver"]
+embassy = ["esp-idf-svc/embassy-sync", "esp-idf-svc/critical-section", "esp-idf-svc/embassy-time-driver"]
 
 [dependencies]
 #ESP stuff

rust/build.rs

@@ -22,22 +22,6 @@ fn main() {
             println!("stdout: {}", String::from_utf8_lossy(&output.stdout));
             println!("stderr: {}", String::from_utf8_lossy(&output.stderr));
             assert!(output.status.success());
-
-            // move webpack results to rust webserver src
-            let _ = Command::new("cmd")
-                .arg("/K")
-                .arg("move")
-                .arg("./src_webpack/bundle.js")
-                .arg("./src/webserver")
-                .output()
-                .unwrap();
-            let _ = Command::new("cmd")
-                .arg("/K")
-                .arg("move")
-                .arg("./src_webpack/index.html")
-                .arg("./src/webserver")
-                .output()
-                .unwrap();
         }
         Err(_) => {
             println!("Assuming build on linux");
@@ -50,18 +34,6 @@ fn main() {
             println!("stdout: {}", String::from_utf8_lossy(&output.stdout));
             println!("stderr: {}", String::from_utf8_lossy(&output.stderr));
             assert!(output.status.success());
-
-            // move webpack results to rust webserver src
-            let _ = Command::new("mv")
-                .arg("./src_webpack/bundle.js")
-                .arg("./src/webserver")
-                .output()
-                .unwrap();
-            let _ = Command::new("mv")
-                .arg("./src_webpack/index.html")
-                .arg("./src/webserver")
-                .output()
-                .unwrap();
         }
     }
 

rust/src/hal/battery.rs

@@ -1,3 +1,4 @@
+use crate::to_string;
 use anyhow::anyhow;
 use bq34z100::{Bq34Z100Error, Bq34z100g1, Bq34z100g1Driver};
 use embedded_hal_bus::i2c::MutexDevice;
@@ -97,7 +98,6 @@ impl BatteryInteraction for NoBatteryMonitor {
 }
 
 //TODO implement this battery monitor kind once controller is complete
-#[allow(dead_code)]
 pub struct WchI2cSlave {}
 
 pub struct BQ34Z100G1<'a> {

rust/src/hal/initial_hal.rs

@@ -1,9 +1,7 @@
+use crate::config::{BoardHardware, PlantControllerConfig};
+use crate::hal::battery::{BatteryInteraction, NoBatteryMonitor};
 use crate::hal::esp::ESP;
 use crate::hal::{deep_sleep, BackupHeader, BoardInteraction, FreePeripherals, Sensor};
-use crate::{
-    config::PlantControllerConfig,
-    hal::battery::{BatteryInteraction, NoBatteryMonitor},
-};
 use anyhow::{bail, Result};
 use chrono::{DateTime, Utc};
 use embedded_hal::digital::OutputPin;
@@ -52,7 +50,7 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
         &mut self.battery
     }
 
-    fn set_charge_indicator(&mut self, _charging: bool) -> Result<()> {
+    fn set_charge_indicator(&mut self, charging: bool) -> Result<()> {
         bail!("Please configure board revision")
     }
 
@@ -68,7 +66,7 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
         bail!("Please configure board revision")
     }
 
-    fn backup_config(&mut self, _bytes: &[u8]) -> Result<()> {
+    fn backup_config(&mut self, bytes: &[u8]) -> Result<()> {
         bail!("Please configure board revision")
     }
 
@@ -83,17 +81,17 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
     fn tank_sensor_voltage(&mut self) -> Result<f32> {
         bail!("Please configure board revision")
     }
-    fn light(&mut self, _enable: bool) -> Result<()> {
+    fn light(&mut self, enable: bool) -> Result<()> {
         bail!("Please configure board revision")
     }
 
-    fn pump(&mut self, _plant: usize, _enable: bool) -> Result<()> {
+    fn pump(&mut self, plant: usize, enable: bool) -> Result<()> {
         bail!("Please configure board revision")
     }
-    fn fault(&mut self, _plant: usize, _enable: bool) -> Result<()> {
+    fn fault(&mut self, plant: usize, _enable: bool) -> Result<()> {
         bail!("Please configure board revision")
     }
-    fn measure_moisture_hz(&mut self, _plant: usize, _sensor: Sensor) -> Result<f32> {
+    fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> Result<f32> {
         bail!("Please configure board revision")
     }
 
@@ -109,10 +107,10 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
         bail!("Please configure board revision")
     }
 
-    fn set_rtc_time(&mut self, _time: &DateTime<Utc>) -> Result<()> {
+    fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> Result<()> {
         bail!("Please configure board revision")
     }
-    fn test_pump(&mut self, _plant: usize) -> Result<()> {
+    fn test_pump(&mut self, plant: usize) -> Result<()> {
         bail!("Please configure board revision")
     }
 

rust/src/hal/mod.rs

@@ -4,45 +4,54 @@ mod initial_hal;
 mod v3_hal;
 mod v4_hal;
 
-use crate::{
-    config::{BatteryBoardVersion, BoardVersion, PlantControllerConfig},
-    hal::{
-        battery::{print_battery_bq34z100, BatteryInteraction, NoBatteryMonitor},
-        esp::ESP,
-    },
-    log::{log, LogMessage},
-};
-use anyhow::{Ok, Result};
 use battery::BQ34Z100G1;
 use bq34z100::Bq34z100g1Driver;
-use chrono::{DateTime, Utc};
+
+use crate::log::LogMessage;
+use ds323x::DateTimeAccess;
+use esp_ota::mark_app_valid;
+
+use eeprom24x::Eeprom24xTrait;
 use embedded_hal_bus::i2c::MutexDevice;
-use esp_idf_hal::{
+
-    adc::ADC1,
+use esp_idf_hal::adc::ADC1;
-    delay::Delay,
+use esp_idf_hal::i2c::{APBTickType, I2cConfig, I2cDriver};
-    gpio::{
+use esp_idf_hal::units::FromValueType;
-        Gpio0, Gpio1, Gpio10, Gpio11, Gpio12, Gpio13, Gpio14, Gpio15, Gpio16, Gpio17, Gpio18,
+use esp_idf_svc::eventloop::EspSystemEventLoop;
-        Gpio2, Gpio21, Gpio22, Gpio23, Gpio24, Gpio25, Gpio26, Gpio27, Gpio28, Gpio29, Gpio3,
+use esp_idf_svc::nvs::EspDefaultNvsPartition;
-        Gpio30, Gpio4, Gpio5, Gpio6, Gpio7, Gpio8, IOPin, PinDriver, Pull,
+use esp_idf_svc::wifi::EspWifi;
-    },
+use esp_idf_sys::esp_restart;
-    i2c::{APBTickType, I2cConfig, I2cDriver},
-    pcnt::PCNT0,
-    prelude::Peripherals,
-    reset::ResetReason,
-    units::FromValueType,
-};
-use esp_idf_svc::{eventloop::EspSystemEventLoop, nvs::EspDefaultNvsPartition, wifi::EspWifi};
 use esp_idf_sys::{
-    esp_deep_sleep, esp_restart, esp_sleep_enable_ext1_wakeup,
+    esp_deep_sleep, esp_sleep_enable_ext1_wakeup,
     esp_sleep_ext1_wakeup_mode_t_ESP_EXT1_WAKEUP_ANY_LOW,
 };
-use esp_ota::mark_app_valid;
 use once_cell::sync::Lazy;
+
+use anyhow::{Ok, Result};
 use serde::{Deserialize, Serialize};
+
+use chrono::{DateTime, Utc};
 use std::result::Result::Ok as OkStd;
 use std::sync::Mutex;
 use std::time::Duration;
 
+use crate::config::{BatteryBoardVersion, BoardVersion, PlantControllerConfig};
+use crate::hal::battery::{print_battery_bq34z100, BatteryInteraction, NoBatteryMonitor};
+use crate::hal::esp::ESP;
+use crate::hal::initial_hal::Initial;
+use crate::log::log;
+use embedded_hal::digital::OutputPin;
+use esp_idf_hal::delay::Delay;
+use esp_idf_hal::gpio::{
+    Gpio0, Gpio1, Gpio10, Gpio11, Gpio12, Gpio13, Gpio14, Gpio15, Gpio16, Gpio17, Gpio18, Gpio2,
+    Gpio21, Gpio22, Gpio23, Gpio24, Gpio25, Gpio26, Gpio27, Gpio28, Gpio29, Gpio3, Gpio30, Gpio4,
+    Gpio5, Gpio6, Gpio7, Gpio8, IOPin, PinDriver, Pull,
+};
+use esp_idf_hal::pcnt::PCNT0;
+use esp_idf_hal::prelude::Peripherals;
+use esp_idf_hal::reset::ResetReason;
+use pca9535::StandardExpanderInterface;
+
 //Only support for 8 right now!
 pub const PLANT_COUNT: usize = 8;
 const REPEAT_MOIST_MEASURE: usize = 1;
@@ -51,6 +60,11 @@ const TANK_MULTI_SAMPLE: usize = 11;
 
 pub static I2C_DRIVER: Lazy<Mutex<I2cDriver<'static>>> = Lazy::new(PlantHal::create_i2c);
 
+#[non_exhaustive]
+struct V3Constants;
+
+impl V3Constants {}
+
 const X25: crc::Crc<u16> = crc::Crc::<u16>::new(&crc::CRC_16_IBM_SDLC);
 
 fn deep_sleep(duration_in_ms: u64) -> ! {
@@ -127,7 +141,6 @@ pub trait BoardInteraction<'a> {
     fn set_config(&mut self, config: PlantControllerConfig) -> Result<()>;
 }
 
-#[allow(dead_code)]
 pub struct FreePeripherals {
     pub gpio0: Gpio0,
     pub gpio1: Gpio1,

rust/src/hal/v3_hal.rs

@@ -1,12 +1,11 @@
+use crate::config::PlantControllerConfig;
+use crate::hal::battery::BatteryInteraction;
+use crate::hal::esp::ESP;
 use crate::hal::{
-    deep_sleep, BackupHeader, BoardInteraction, FreePeripherals, Sensor, I2C_DRIVER, PLANT_COUNT,
+    deep_sleep, BackupHeader, BoardInteraction, FreePeripherals, Sensor, V3Constants, I2C_DRIVER,
-    REPEAT_MOIST_MEASURE, TANK_MULTI_SAMPLE, X25,
+    PLANT_COUNT, REPEAT_MOIST_MEASURE, TANK_MULTI_SAMPLE, X25,
 };
 use crate::log::{log, LogMessage};
-use crate::{
-    config::PlantControllerConfig,
-    hal::{battery::BatteryInteraction, esp::ESP},
-};
 use anyhow::{anyhow, bail, Ok, Result};
 use chrono::{DateTime, Utc};
 use ds18b20::Ds18b20;
@@ -14,21 +13,20 @@ use ds323x::{DateTimeAccess, Ds323x};
 use eeprom24x::{Eeprom24x, Eeprom24xTrait, SlaveAddr};
 use embedded_hal::digital::OutputPin;
 use embedded_hal_bus::i2c::MutexDevice;
-use esp_idf_hal::{
+use esp_idf_hal::adc::oneshot::config::AdcChannelConfig;
-    adc::{
+use esp_idf_hal::adc::oneshot::{AdcChannelDriver, AdcDriver};
-        attenuation,
+use esp_idf_hal::adc::{attenuation, Resolution};
-        oneshot::{config::AdcChannelConfig, AdcChannelDriver, AdcDriver},
+use esp_idf_hal::delay::Delay;
-        Resolution,
+use esp_idf_hal::gpio::{AnyInputPin, Gpio5, IOPin, InputOutput, PinDriver, Pull};
-    },
+use esp_idf_hal::i2c::I2cDriver;
-    delay::Delay,
+use esp_idf_hal::pcnt::{
-    gpio::{AnyInputPin, Gpio5, IOPin, InputOutput, PinDriver, Pull},
+    PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex,
-    i2c::I2cDriver,
-    pcnt::{PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex},
 };
 use esp_idf_sys::{gpio_hold_dis, gpio_hold_en, vTaskDelay, EspError};
 use one_wire_bus::OneWire;
 use plant_ctrl2::sipo::ShiftRegister40;
 use std::result::Result::Ok as OkStd;
+use std::sync::Arc;
 
 const PUMP8_BIT: usize = 0;
 const PUMP1_BIT: usize = 1;
@@ -84,7 +82,7 @@ pub struct V3<'a> {
         PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
         PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
     >,
-    _shift_register_enable_invert:
+    shift_register_enable_invert:
         PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, esp_idf_hal::gpio::Output>,
     tank_channel: AdcChannelDriver<'a, Gpio5, AdcDriver<'a, esp_idf_hal::adc::ADC1>>,
     solar_is_day: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, esp_idf_hal::gpio::Input>,
@@ -109,7 +107,7 @@ pub(crate) fn create_v3(
     esp: ESP<'static>,
     config: PlantControllerConfig,
     battery_monitor: Box<dyn BatteryInteraction + Send>,
-) -> Result<Box<dyn BoardInteraction<'static> + Send>> {
+) -> Result<Box<dyn BoardInteraction + Send + '_>> {
     let mut clock = PinDriver::input_output(peripherals.gpio15.downgrade())?;
     clock.set_pull(Pull::Floating)?;
     let mut latch = PinDriver::input_output(peripherals.gpio3.downgrade())?;
@@ -234,7 +232,7 @@ pub(crate) fn create_v3(
         battery_monitor,
         esp,
         shift_register,
-        _shift_register_enable_invert: shift_register_enable_invert,
+        shift_register_enable_invert,
         tank_channel,
         solar_is_day,
         light,

rust/src/hal/v4_hal.rs

@@ -1,4 +1,4 @@
-pub use crate::config::PlantControllerConfig;
+use crate::config::PlantControllerConfig;
 use crate::hal::battery::BatteryInteraction;
 use crate::hal::esp::ESP;
 use crate::hal::{
@@ -13,19 +13,19 @@ use ds323x::{DateTimeAccess, Ds323x};
 use eeprom24x::{Eeprom24x, Eeprom24xTrait, SlaveAddr};
 use embedded_hal::digital::OutputPin;
 use embedded_hal_bus::i2c::MutexDevice;
-use esp_idf_hal::{
+use esp_idf_hal::adc::oneshot::config::AdcChannelConfig;
-    adc::{
+use esp_idf_hal::adc::oneshot::{AdcChannelDriver, AdcDriver};
-        attenuation,
+use esp_idf_hal::adc::{attenuation, Resolution};
-        oneshot::{config::AdcChannelConfig, AdcChannelDriver, AdcDriver},
+use esp_idf_hal::delay::Delay;
-        Resolution,
+use esp_idf_hal::gpio::{AnyInputPin, Gpio5, IOPin, InputOutput, Output, PinDriver, Pull};
-    },
+use esp_idf_hal::i2c::I2cDriver;
-    delay::Delay,
+use esp_idf_hal::pcnt::{
-    gpio::{AnyInputPin, Gpio5, IOPin, InputOutput, Output, PinDriver, Pull},
+    PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex,
-    i2c::I2cDriver,
-    pcnt::{PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex},
 };
-use esp_idf_sys::{gpio_hold_dis, gpio_hold_en, EspError};
+use esp_idf_sys::{gpio_hold_dis, gpio_hold_en, vTaskDelay, EspError};
-use ina219::{address::Address, calibration::UnCalibrated, SyncIna219};
+use ina219::address::Address;
+use ina219::calibration::{Calibration, UnCalibrated};
+use ina219::SyncIna219;
 use one_wire_bus::OneWire;
 use pca9535::{GPIOBank, Pca9535Immediate, StandardExpanderInterface};
 use std::result::Result::Ok as OkStd;
@@ -38,7 +38,7 @@ const MS4: u8 = 2_u8;
 const SENSOR_ON: u8 = 5_u8;
 
 pub struct V4<'a> {
-    _mppt_ina: SyncIna219<MutexDevice<'a, I2cDriver<'a>>, UnCalibrated>,
+    mppt_ina: SyncIna219<MutexDevice<'a, I2cDriver<'a>>, UnCalibrated>,
     esp: ESP<'a>,
     battery_monitor: Box<dyn BatteryInteraction + Send>,
     config: PlantControllerConfig,
@@ -63,12 +63,12 @@ pub struct V4<'a> {
     sensor_expander: Pca9535Immediate<MutexDevice<'a, I2cDriver<'a>>>,
 }
 
-pub(crate) fn create_v4<'a>(
+pub(crate) fn create_v4(
     peripherals: FreePeripherals,
     esp: ESP<'static>,
     config: PlantControllerConfig,
     battery_monitor: Box<dyn BatteryInteraction + Send>,
-) -> anyhow::Result<Box<dyn BoardInteraction<'static> + Send>> {
+) -> anyhow::Result<Box<dyn BoardInteraction + Send + '_>> {
     let mut awake = PinDriver::output(peripherals.gpio15.downgrade())?;
     awake.set_high()?;
 
@@ -188,7 +188,7 @@ pub(crate) fn create_v4<'a>(
     println!("Shunt Current: {}", current);
 
     let v = V4 {
-        _mppt_ina: mppt_ina,
+        mppt_ina,
         esp,
         awake,
         tank_channel,

rust/src/main.rs

@@ -1,11 +1,8 @@
-use crate::{
+use crate::webserver::webserver::httpd;
-    config::BoardVersion::INITIAL,
-    hal::{PlantHal, HAL, PLANT_COUNT},
-    webserver::webserver::httpd,
-};
 use anyhow::bail;
 use chrono::{DateTime, Datelike, Timelike, Utc};
-use chrono_tz::Tz::{self, UTC};
+use chrono_tz::Tz;
+use chrono_tz::Tz::UTC;
 use esp_idf_hal::delay::Delay;
 use esp_idf_sys::{
     esp_ota_get_app_partition_count, esp_ota_get_running_partition, esp_ota_get_state_partition,
@@ -18,17 +15,23 @@ use esp_ota::{mark_app_valid, rollback_and_reboot};
 use hal::battery::BatteryState;
 use log::{log, LogMessage};
 use once_cell::sync::Lazy;
-use plant_state::PlantState;
 use serde::{Deserialize, Serialize};
-use std::sync::{atomic::AtomicBool, Arc, Mutex, MutexGuard};
+use std::sync::MutexGuard;
-use tank::*;
+use std::{
-
+    fmt::Display,
+    sync::{atomic::AtomicBool, Arc, Mutex},
+};
 mod config;
 mod hal;
 mod log;
 mod plant_state;
 mod tank;
 
+use crate::config::BoardVersion::INITIAL;
+use crate::hal::battery::BatteryInteraction;
+use crate::hal::{BoardInteraction, PlantHal, HAL, PLANT_COUNT};
+use plant_state::PlantState;
+use tank::*;
 pub static BOARD_ACCESS: Lazy<Mutex<HAL>> = Lazy::new(|| PlantHal::create().unwrap());
 pub static STAY_ALIVE: Lazy<AtomicBool> = Lazy::new(|| AtomicBool::new(false));
 
@@ -421,7 +424,7 @@ fn safe_main() -> anyhow::Result<()> {
         .state_charge_percent()
         .unwrap_or(0.);
 
-    // try to load full battery state if failed the battery state is unknown
+    /// try to load full battery state if failed the battery state is unknown
     let battery_state = board
         .board_hal
         .get_battery_monitor()
@@ -736,8 +739,7 @@ fn pump_info(
 
 fn publish_battery_state(board: &mut MutexGuard<'_, HAL<'_>>) {
     let state = board.board_hal.get_battery_monitor().get_battery_state();
-    if let Ok(serialized_battery_state_bytes) =
+    if let Ok(serialized_battery_state_bytes) = serde_json::to_string(&state).map(|s| s.into_bytes())
-        serde_json::to_string(&state).map(|s| s.into_bytes())
     {
         let _ = board
             .board_hal
@@ -837,6 +839,15 @@ fn main() {
     }
 }
 
+fn to_string<T: Display>(value: anyhow::Result<T>) -> String {
+    match value {
+        Ok(v) => v.to_string(),
+        Err(err) => {
+            format!("{:?}", err)
+        }
+    }
+}
+
 pub fn in_time_range(cur: &DateTime<Tz>, start: u8, end: u8) -> bool {
     let curhour = cur.hour() as u8;
     //eg 10-14

rust/src/plant_state.rs

@@ -1,12 +1,10 @@
-use crate::{
-    config::PlantConfig,
-    hal::{Sensor, HAL},
-    in_time_range,
-};
 use chrono::{DateTime, TimeDelta, Utc};
 use chrono_tz::Tz;
 use serde::{Deserialize, Serialize};
 
+use crate::hal::{BoardInteraction, Sensor, HAL};
+use crate::{config::PlantConfig, in_time_range};
+
 const MOIST_SENSOR_MAX_FREQUENCY: f32 = 7500.; // 60kHz (500Hz margin)
 const MOIST_SENSOR_MIN_FREQUENCY: f32 = 150.; // this is really, really dry, think like cactus levels
 
@@ -239,11 +237,7 @@ impl PlantState {
         }
     }
 
-    pub fn to_mqtt_info(
+    pub fn to_mqtt_info(&self, plant_conf: &PlantConfig, current_time: &DateTime<Tz>) -> PlantInfo {
-        &self,
-        plant_conf: &PlantConfig,
-        current_time: &DateTime<Tz>,
-    ) -> PlantInfo<'_> {
         PlantInfo {
             sensor_a: &self.sensor_a,
             sensor_b: &self.sensor_b,

rust/src/sipo.rs

@@ -100,7 +100,7 @@ macro_rules! ShiftRegisterBuilder {
             }
 
             /// Get embedded-hal output pins to control the shift register outputs
-            pub fn decompose(&self) -> [ShiftRegisterPin<'_>; $size] {
+            pub fn decompose(&self) -> [ShiftRegisterPin; $size] {
                 // Create an uninitialized array of `MaybeUninit`. The `assume_init` is
                 // safe because the type we are claiming to have initialized here is a
                 // bunch of `MaybeUninit`s, which do not require initialization.

rust/src/tank.rs

@@ -1,6 +1,8 @@
-use crate::{config::TankConfig, hal::HAL};
 use serde::Serialize;
 
+use crate::config::TankConfig;
+use crate::hal::{BoardInteraction, HAL};
+
 const OPEN_TANK_VOLTAGE: f32 = 3.0;
 pub const WATER_FROZEN_THRESH: f32 = 4.0;
 

rust/src/webserver/webserver.rs

@@ -1,12 +1,8 @@
 //offer ota and config mode
 
+use crate::hal::battery::BatteryInteraction;
 use crate::{
-    config::PlantControllerConfig,
+    determine_tank_state, get_version, log::LogMessage, plant_state::PlantState, BOARD_ACCESS,
-    determine_tank_state, get_version,
-    hal::PLANT_COUNT,
-    log::LogMessage,
-    plant_state::{MoistureSensorState, PlantState},
-    BOARD_ACCESS,
 };
 use anyhow::bail;
 use chrono::DateTime;
@@ -23,6 +19,10 @@ use std::{
 };
 use url::Url;
 
+use crate::config::PlantControllerConfig;
+use crate::hal::{BoardInteraction, PLANT_COUNT};
+use crate::plant_state::MoistureSensorState;
+
 #[derive(Serialize, Debug)]
 struct SSIDList<'a> {
     ssids: Vec<&'a String<32>>,
@@ -214,7 +214,7 @@ fn set_config(
     let config: PlantControllerConfig = serde_json::from_slice(&all)?;
 
     let mut board = BOARD_ACCESS.lock().expect("board access");
-    let _ = board.board_hal.set_config(config);
+    board.board_hal.set_config(config);
     anyhow::Ok(Some("saved".to_owned()))
 }
 

rust/src_webpack/webpack.config.js

@@ -49,7 +49,7 @@ module.exports = {
   },
   output: {
     filename: 'bundle.js',
-    path: path.resolve(__dirname, '.'),
+    path: path.resolve(__dirname, '../src/webserver'),
   },
   devServer: {
   }