fix: rename TankInfo fields for consistent naming (volume_ml, pct, water_temp_c)

.gitignore

@@ -8,15 +8,6 @@ target
 Cargo.lock
 node_modules/
 rust/src/webserver/bundle.js
-rust/src/webserver/bundle.js.gz
 rust/src/webserver/index.html
-rust/src/webserver/index.html.gz
-rust/src_webpack/bundle.js
-rust/src_webpack/bundle.js.gz
-rust/src_webpack/index.html
-rust/src_webpack/index.html.gz
 rust/build/
 rust/image.bin
-rust/target/
-rust/Cargo.lock
-rust/src_webpack/node_modules/

rust/all.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-"${SCRIPT_DIR}/build_website.sh"
-
-cargo build --release
-espflash save-image \
-    --bootloader "${SCRIPT_DIR}/bootloader.bin" \
-    --partition-table "${SCRIPT_DIR}/partitions.csv" \
-    --chip esp32c6 \
-    target/riscv32imac-unknown-none-elf/release/plant-ctrl2 \
-    "${SCRIPT_DIR}/image.bin"
-
-espflash flash --monitor \
-    --bootloader "${SCRIPT_DIR}/bootloader.bin" \
-    --chip esp32c6 \
-    --baud 921600 \
-    --partition-table "${SCRIPT_DIR}/partitions.csv" \
-    target/riscv32imac-unknown-none-elf/release/plant-ctrl2

rust/build.rs

@@ -1,3 +1,5 @@
+use std::process::Command;
+
 use vergen::EmitBuilder;
 
 fn linker_be_nice() {
@@ -48,9 +50,72 @@ fn linker_be_nice() {
 }
 
 fn main() {
+    webpack();
     linker_be_nice();
-    // Non-existent path causes Cargo to always re-run this script,
-    // keeping VERGEN_BUILD_TIMESTAMP fresh on every build.
-    println!("cargo:rerun-if-changed=ALWAYS_REBUILD_SENTINEL");
     let _ = EmitBuilder::builder().all_git().all_build().emit();
 }
+
+fn webpack() {
+    //println!("cargo:rerun-if-changed=./src/src_webpack");
+    Command::new("rm")
+        .arg("./src/webserver/bundle.js.gz")
+        .output()
+        .unwrap();
+
+    match Command::new("cmd").spawn() {
+        Ok(_) => {
+            println!("Assuming build on windows");
+            let output = Command::new("cmd")
+                .arg("/K")
+                .arg("npx")
+                .arg("webpack")
+                .current_dir("./src_webpack")
+                .output()
+                .unwrap();
+            println!("status: {}", output.status);
+            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.gz")
+                .arg("./src/webserver")
+                .output()
+                .unwrap();
+            let _ = Command::new("cmd")
+                .arg("/K")
+                .arg("move")
+                .arg("./src_webpack/index.html.gz")
+                .arg("./src/webserver")
+                .output()
+                .unwrap();
+        }
+        Err(_) => {
+            println!("Assuming build on linux");
+            let output = Command::new("npx")
+                .arg("webpack")
+                .current_dir("./src_webpack")
+                .output()
+                .unwrap();
+            println!("status: {}", output.status);
+            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.gz")
+                .arg("./src/webserver")
+                .output()
+                .unwrap();
+            let _ = Command::new("mv")
+                .arg("./src_webpack/index.html.gz")
+                .arg("./src/webserver")
+                .output()
+                .unwrap();
+        }
+    }
+}

rust/build_website.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-WEBPACK_DIR="${SCRIPT_DIR}/src_webpack"
-WEBSERVER_DIR="${SCRIPT_DIR}/src/webserver"
-
-rm -f "${WEBSERVER_DIR}/index.html.gz"
-rm -f "${WEBSERVER_DIR}/bundle.js.gz"
-rm -f "${WEBPACK_DIR}/index.html.gz"
-rm -f "${WEBPACK_DIR}/bundle.js.gz"
-rm -f "${WEBPACK_DIR}/index.html"
-rm -f "${WEBPACK_DIR}/bundle.js"
-
-pushd "${WEBPACK_DIR}"
-npm install
-npx webpack build
-cp index.html.gz "${WEBSERVER_DIR}/index.html.gz"
-cp bundle.js.gz "${WEBSERVER_DIR}/bundle.js.gz"
-popd

rust/erase_ota.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-cargo espflash erase-parts otadata --partition-table "${SCRIPT_DIR}/partitions.csv"

rust/flash.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-"${SCRIPT_DIR}/build_website.sh"
-
-cargo build --release
-espflash flash --monitor \
-    --bootloader "${SCRIPT_DIR}/bootloader.bin" \
-    --chip esp32c6 \
-    --baud 921600 \
-    --partition-table "${SCRIPT_DIR}/partitions.csv" \
-    target/riscv32imac-unknown-none-elf/release/plant-ctrl2

rust/image_build.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-rm -f "${SCRIPT_DIR}/image.bin"
-
-"${SCRIPT_DIR}/build_website.sh"
-
-cargo build --release
-espflash save-image \
-    --bootloader "${SCRIPT_DIR}/bootloader.bin" \
-    --partition-table "${SCRIPT_DIR}/partitions.csv" \
-    --chip esp32c6 \
-    target/riscv32imac-unknown-none-elf/release/plant-ctrl2 \
-    "${SCRIPT_DIR}/image.bin"

rust/src/hal/battery.rs

@@ -28,7 +28,7 @@ pub trait BatteryInteraction {
 #[derive(Debug, Serialize)]
 pub struct BatteryInfo {
     pub voltage_mv: Option<u16>,
-    pub avg_current_ma: Option<i16>,
+    pub current_ma: Option<i16>,
     pub soc_pct: Option<f32>,
     pub soh_pct: Option<u16>,
     pub temperature_c: Option<u16>,
@@ -183,7 +183,7 @@ impl BatteryInteraction for BQ34Z100G1 {
     async fn get_battery_state(&mut self) -> FatResult<BatteryState> {
         Ok(BatteryState::Info(BatteryInfo {
             voltage_mv: Some(self.voltage_milli_volt().await?),
-            avg_current_ma: Some(self.average_current_milli_ampere().await?),
+            current_ma: Some(self.average_current_milli_ampere().await?),
             soc_pct: Some(self.state_charge_percent().await?),
             soh_pct: Some(self.state_health_percent().await?),
             temperature_c: Some(self.bat_temperature().await?),

rust/src/hal/esp.rs

@@ -17,6 +17,8 @@ use core::net::{IpAddr, Ipv4Addr, SocketAddr};
 use core::str::FromStr;
 use core::sync::atomic::Ordering;
 use embassy_executor::Spawner;
+use embassy_net::dns::DnsQueryType;
+use embassy_net::udp::{PacketMetadata, UdpSocket};
 use embassy_net::{DhcpConfig, IpAddress, Ipv4Cidr, Runner, Stack, StackResources, StaticConfigV4};
 use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
 use embassy_sync::mutex::{Mutex, MutexGuard};
@@ -42,9 +44,9 @@ use littlefs2::fs::Filesystem;
 use littlefs2_core::{FileType, PathBuf, SeekFrom};
 use log::{info, warn, error};
 use portable_atomic::AtomicBool;
+use sntpc::{NtpContext, NtpTimestampGenerator, NtpUdpSocket, get_time};
 
 use super::shared_flash::MutexFlashStorage;
-use crate::network::{net_task, run_dhcp};
 
 #[esp_hal::ram(unstable(rtc_fast), unstable(persistent))]
 static mut LAST_WATERING_TIMESTAMP: [i64; PLANT_COUNT] = [0; PLANT_COUNT];
@@ -59,6 +61,7 @@ static mut LAST_CORROSION_PROTECTION_CHECK_DAY: i8 = -1;
 
 
 const CONFIG_FILE: &str = "config.json";
+const NTP_SERVER: &str = "pool.ntp.org";
 
 #[derive(Serialize, Debug)]
 pub struct FileInfo {
@@ -73,6 +76,11 @@ pub struct FileList {
     files: Vec<FileInfo>,
 }
 
+#[derive(Copy, Clone, Default)]
+struct Timestamp {
+    stamp: DateTime<Utc>,
+}
+
 // Minimal esp-idf equivalent for gpio_hold on esp32c6 via ROM functions
 extern "C" {
     fn gpio_pad_hold(gpio_num: u32);
@@ -89,6 +97,53 @@ pub fn hold_disable(gpio_num: u8) {
     unsafe { gpio_pad_unhold(gpio_num as u32) }
 }
 
+impl NtpTimestampGenerator for Timestamp {
+    fn init(&mut self) {
+        self.stamp = DateTime::default();
+    }
+
+    fn timestamp_sec(&self) -> u64 {
+        self.stamp.timestamp() as u64
+    }
+
+    fn timestamp_subsec_micros(&self) -> u32 {
+        self.stamp.timestamp_subsec_micros()
+    }
+}
+struct EmbassyNtpSocket<'a, 'b> {
+    socket: &'a UdpSocket<'b>,
+}
+
+impl<'a, 'b> EmbassyNtpSocket<'a, 'b> {
+    fn new(socket: &'a UdpSocket<'b>) -> Self {
+        Self { socket }
+    }
+}
+
+impl NtpUdpSocket for EmbassyNtpSocket<'_, '_> {
+    async fn send_to(&self, buf: &[u8], addr: SocketAddr) -> sntpc::Result<usize> {
+        self.socket
+            .send_to(buf, addr)
+            .await
+            .map_err(|_| sntpc::Error::Network)?;
+        Ok(buf.len())
+    }
+
+    async fn recv_from(&self, buf: &mut [u8]) -> sntpc::Result<(usize, SocketAddr)> {
+        let (len, metadata) = self
+            .socket
+            .recv_from(buf)
+            .await
+            .map_err(|_| sntpc::Error::Network)?;
+        let addr = match metadata.endpoint.addr {
+            IpAddress::Ipv4(ip) => IpAddr::V4(ip),
+            IpAddress::Ipv6(ip) => IpAddr::V6(ip),
+        };
+        Ok((len, SocketAddr::new(addr, metadata.endpoint.port)))
+    }
+}
+
+
 pub struct Esp<'a> {
     pub fs: Arc<Mutex<CriticalSectionRawMutex, Filesystem<'static, LittleFs2Filesystem>>>,
     pub rng: Rng,
@@ -120,6 +175,15 @@ pub struct Esp<'a> {
 // CPU cores/threads, reconsider this.
 unsafe impl Send for Esp<'_> {}
 
+macro_rules! mk_static {
+    ($t:ty,$val:expr) => {{
+        static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
+        #[deny(unused_attributes)]
+        let x = STATIC_CELL.uninit().write(($val));
+        x
+    }};
+}
+
 impl Esp<'_> {
     pub fn get_time(&self) -> DateTime<Utc> {
         DateTime::from_timestamp_micros(self.rtc.current_time_us() as i64)
@@ -281,6 +345,66 @@ impl Esp<'_> {
         self.boot_button.is_low()
     }
 
+    pub(crate) async fn sntp(
+        &mut self,
+        _max_wait_ms: u32,
+        stack: Stack<'_>,
+    ) -> FatResult<DateTime<Utc>> {
+        println!("start sntp");
+        let mut rx_meta = [PacketMetadata::EMPTY; 16];
+        let mut rx_buffer = [0; 4096];
+        let mut tx_meta = [PacketMetadata::EMPTY; 16];
+        let mut tx_buffer = [0; 4096];
+
+        let mut socket = UdpSocket::new(
+            stack,
+            &mut rx_meta,
+            &mut rx_buffer,
+            &mut tx_meta,
+            &mut tx_buffer,
+        );
+        socket.bind(123).context("Could not bind UDP socket")?;
+
+        let context = NtpContext::new(Timestamp::default());
+        let ntp_socket = EmbassyNtpSocket::new(&socket);
+
+        let ntp_addrs = stack
+            .dns_query(NTP_SERVER, DnsQueryType::A)
+            .await
+            .context("Failed to resolve DNS")?;
+
+        if ntp_addrs.is_empty() {
+            bail!("No IP addresses found for NTP server");
+        }
+        let ntp = ntp_addrs[0];
+        info!("NTP server: {ntp:?}");
+
+        let mut counter = 0;
+        loop {
+            let addr: IpAddr = ntp.into();
+            let timeout = get_time(SocketAddr::from((addr, 123)), &ntp_socket, context)
+                .with_timeout(Duration::from_millis((_max_wait_ms / 10) as u64))
+                .await;
+
+            match timeout {
+                Ok(result) => {
+                    let time = result?;
+                    info!("Time: {time:?}");
+                    return DateTime::from_timestamp(time.seconds as i64, 0)
+                        .context("Could not convert Sntp result");
+                }
+                Err(err) => {
+                    warn!("sntp timeout, retry: {err:?}");
+                    counter += 1;
+                    if counter > 10 {
+                        bail!("Failed to get time from NTP server");
+                    }
+                    Timer::after(Duration::from_millis(100)).await;
+                }
+            }
+        }
+    }
+
     pub(crate) async fn wifi_scan(&mut self) -> FatResult<Vec<AccessPointInfo>> {
         info!("start wifi scan");
         let mut lock = self.controller.try_lock()?;
@@ -338,6 +462,160 @@ impl Esp<'_> {
         }
     }
 
+    pub(crate) async fn wifi_ap(&mut self, spawner: Spawner) -> FatResult<Stack<'static>> {
+        let ssid = match self.load_config().await {
+            Ok(config) => config.network.ap_ssid.as_str().to_string(),
+            Err(_) => "PlantCtrl Emergency Mode".to_string(),
+        };
+
+        let device = self
+            .interface_ap
+            .take()
+            .context("AP interface already taken")?;
+        let gw_ip_addr = Ipv4Addr::new(192, 168, 71, 1);
+
+        let config = embassy_net::Config::ipv4_static(StaticConfigV4 {
+            address: Ipv4Cidr::new(gw_ip_addr, 24),
+            gateway: Some(gw_ip_addr),
+            dns_servers: Default::default(),
+        });
+
+        let seed = (self.rng.random() as u64) << 32 | self.rng.random() as u64;
+
+        println!("init secondary stack");
+        // Init network stack
+        let (stack, runner) = embassy_net::new(
+            device,
+            config,
+            mk_static!(StackResources<4>, StackResources::<4>::new()),
+            seed,
+        );
+        let stack = mk_static!(Stack, stack);
+
+        let client_config =
+            Config::AccessPoint(AccessPointConfig::default().with_ssid(ssid.clone()));
+        self.controller.lock().await.set_config(&client_config)?;
+
+        println!("start net task");
+        spawner.spawn(net_task(runner)?);
+        println!("run dhcp");
+        spawner.spawn(run_dhcp(*stack, gw_ip_addr)?);
+
+        loop {
+            if stack.is_link_up() {
+                break;
+            }
+            Timer::after(Duration::from_millis(500)).await;
+        }
+        while !stack.is_config_up() {
+            Timer::after(Duration::from_millis(100)).await
+        }
+        println!("Connect to the AP `${ssid}` and point your browser to http://{gw_ip_addr}/");
+        stack
+            .config_v4()
+            .inspect(|c| println!("ipv4 config: {c:?}"));
+
+        Ok(*stack)
+    }
+
+    pub(crate) async fn wifi(
+        &mut self,
+        network_config: &NetworkConfig,
+        spawner: Spawner,
+    ) -> FatResult<Stack<'static>> {
+        esp_radio::wifi_set_log_verbose();
+        let ssid = match &network_config.ssid {
+            Some(ssid) => {
+                if ssid.is_empty() {
+                    bail!("Wifi ssid was empty")
+                }
+                ssid.to_string()
+            }
+            None => {
+                bail!("Wifi ssid was empty")
+            }
+        };
+        info!("attempting to connect wifi {ssid}");
+        let password = match network_config.password {
+            Some(ref password) => password.to_string(),
+            None => "".to_string(),
+        };
+        let max_wait = network_config.max_wait;
+
+        let device = self
+            .interface_sta
+            .take()
+            .context("STA interface already taken")?;
+        let config = embassy_net::Config::dhcpv4(DhcpConfig::default());
+
+        let seed = (self.rng.random() as u64) << 32 | self.rng.random() as u64;
+
+        // Init network stack
+        let (stack, runner) = embassy_net::new(
+            device,
+            config,
+            mk_static!(StackResources<8>, StackResources::<8>::new()),
+            seed,
+        );
+        let stack = mk_static!(Stack, stack);
+
+        let auth_method = if password.is_empty() {
+            AuthenticationMethod::None
+        } else {
+            AuthenticationMethod::Wpa2Personal
+        };
+        let client_config = StationConfig::default()
+            .with_ssid(ssid)
+            .with_auth_method(auth_method)
+            .with_scan_method(esp_radio::wifi::sta::ScanMethod::AllChannels)
+            .with_listen_interval(10)
+            .with_beacon_timeout(10)
+            .with_failure_retry_cnt(3)
+            .with_password(password);
+
+        self.controller
+            .lock()
+            .await
+            .set_config(&Config::Station(client_config))?;
+        spawner.spawn(net_task(runner)?);
+        self.controller
+            .lock()
+            .await
+            .connect_async()
+            .with_timeout(Duration::from_millis(max_wait as u64 * 1000))
+            .await
+            .context("Timeout waiting for wifi sta connected")??;
+
+        let res = async {
+            while !stack.is_link_up() {
+                Timer::after(Duration::from_millis(500)).await;
+            }
+            Ok::<(), FatError>(())
+        }
+        .with_timeout(Duration::from_millis(max_wait as u64 * 1000))
+        .await;
+
+        if res.is_err() {
+            bail!("Timeout waiting for wifi link up")
+        }
+
+        let res = async {
+            while !stack.is_config_up() {
+                Timer::after(Duration::from_millis(100)).await
+            }
+            Ok::<(), FatError>(())
+        }
+        .with_timeout(Duration::from_millis(max_wait as u64 * 1000))
+        .await;
+
+        if res.is_err() {
+            bail!("Timeout waiting for wifi config up")
+        }
+
+        info!("Connected WIFI, dhcp: {:?}", stack.config_v4());
+        Ok(*stack)
+    }
+
     pub fn deep_sleep_ms(&mut self, duration_in_ms: u64) -> ! {
         // Mark the current OTA image as valid if we reached here while in pending verify.
         if let Ok(cur) = self.ota.current_ota_state() {
@@ -453,3 +731,52 @@ impl Esp<'_> {
     }
 
 }
+
+#[embassy_executor::task(pool_size = 2)]
+async fn net_task(mut runner: Runner<'static, Interface<'static>>) {
+    runner.run().await;
+}
+
+#[embassy_executor::task]
+async fn run_dhcp(stack: Stack<'static>, ip: Ipv4Addr) {
+    use core::net::SocketAddrV4;
+
+    use edge_dhcp::{
+        io::{self, DEFAULT_SERVER_PORT},
+        server::{Server, ServerOptions},
+    };
+    use edge_nal::UdpBind;
+    use edge_nal_embassy::{Udp, UdpBuffers};
+
+    let mut buf = [0u8; 1500];
+
+    let mut gw_buf = [Ipv4Addr::UNSPECIFIED];
+
+    let buffers = UdpBuffers::<3, 1024, 1024, 10>::new();
+    let unbound_socket = Udp::new(stack, &buffers);
+    let mut bound_socket = match unbound_socket
+        .bind(SocketAddr::V4(SocketAddrV4::new(
+            Ipv4Addr::UNSPECIFIED,
+            DEFAULT_SERVER_PORT,
+        )))
+        .await
+    {
+        Ok(s) => s,
+        Err(e) => {
+            error!("dhcp task failed to bind socket: {:?}", e);
+            return;
+        }
+    };
+
+    loop {
+        _ = io::server::run(
+            &mut Server::<_, 64>::new_with_et(ip),
+            &ServerOptions::new(ip, Some(&mut gw_buf)),
+            &mut bound_socket,
+            &mut buf,
+        )
+        .await
+        .inspect_err(|e| warn!("DHCP server error: {e:?}"));
+        Timer::after(Duration::from_millis(500)).await;
+    }
+}

rust/src/hal/mod.rs

@@ -282,7 +282,14 @@ pub struct FreePeripherals<'a> {
     pub adc1: ADC1<'a>,
 }
 
-use crate::util::mk_static;
+macro_rules! mk_static {
+    ($t:ty,$val:expr) => {{
+        static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
+        #[deny(unused_attributes)]
+        let x = STATIC_CELL.uninit().write(($val));
+        x
+    }};
+}
 
 impl PlantHal {
     pub async fn create() -> Result<Mutex<CriticalSectionRawMutex, HAL<'static>>, FatError> {

rust/src/main.rs

@@ -17,7 +17,7 @@ use esp_backtrace as _;
 use hal::PROGRESS_ACTIVE;
 
 use crate::config::{NetworkConfig, PlantConfig};
-use crate::fat_error::{ContextExt, FatResult};
+use crate::fat_error::FatResult;
 
 use crate::log::log;
 use crate::tank::{determine_tank_state, TankError, TankState, WATER_FROZEN_THRESH};
@@ -26,7 +26,7 @@ use crate::{
     config::BoardVersion::INITIAL,
     hal::{PlantHal, HAL, PLANT_COUNT},
 };
-use ::log::{error, info, warn};
+use ::log::{info, warn, error};
 use alloc::borrow::ToOwned;
 use alloc::string::{String, ToString};
 use alloc::sync::Arc;
@@ -68,10 +68,8 @@ mod fat_error;
 mod hal;
 mod log;
 mod mqtt;
-mod network;
 mod plant_state;
 mod tank;
-mod util;
 mod webserver;
 
 extern crate alloc;
@@ -122,6 +120,22 @@ pub struct PumpResult {
     pump_time_s: u16,
 }
 
+#[derive(Serialize, Debug, PartialEq)]
+enum SntpMode {
+    OFFLINE,
+    SYNC { current: DateTime<Utc> },
+}
+
+#[derive(Serialize, Debug, PartialEq)]
+enum NetworkMode {
+    WIFI {
+        sntp: SntpMode,
+        mqtt: bool,
+        ip_address: String,
+    },
+    OFFLINE,
+}
+
 async fn safe_main(spawner: Spawner) -> FatResult<()> {
     info!("Startup Rust");
 
@@ -194,17 +208,7 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
     {
         info!("No wifi configured, starting initial config mode");
 
-        let esp = board.board_hal.get_esp();
+        let stack = board.board_hal.get_esp().wifi_ap(spawner).await?;
-        let ssid = esp
-            .load_config()
-            .await
-            .map(|config| config.network.ap_ssid.to_string())
-            .unwrap_or_else(|_| String::from("PlantCtrl Emergency Mode"));
-        let device = esp
-            .interface_ap
-            .take()
-            .context("AP interface already taken")?;
-        let stack = network::wifi_ap(ssid, device, &esp.controller, &mut esp.rng, spawner).await?;
 
         let reboot_now = Arc::new(AtomicBool::new(false));
         println!("starting webserver");
@@ -215,34 +219,20 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
 
     let mut stack: OptionLock<Stack> = OptionLock::empty();
     let network_mode = if board.board_hal.get_config().network.ssid.is_some() {
-        network::try_connect_wifi_sntp_mqtt(&mut board, &mut stack, spawner).await
+        try_connect_wifi_sntp_mqtt(&mut board, &mut stack, spawner).await
     } else {
         info!("No wifi configured");
         //the current sensors require this amount to stabilize, in the case of Wi-Fi this is already handled due to connect timings;
         Timer::after_millis(100).await;
-        network::NetworkMode::OFFLINE
+        NetworkMode::OFFLINE
     };
 
-    if matches!(network_mode, network::NetworkMode::OFFLINE) && to_config {
+    if matches!(network_mode, NetworkMode::OFFLINE) && to_config {
         info!("Could not connect to station and config mode forced, switching to ap mode!");
 
         let res = {
             let esp = board.board_hal.get_esp();
-            let ssid = esp
+            esp.wifi_ap(spawner).await
-                .load_config()
-                .await
-                .map(|config| config.network.ap_ssid.to_string())
-                .unwrap_or_else(|_| String::from("PlantCtrl Emergency Mode"));
-            let device = match esp.interface_ap.take() {
-                Some(d) => d,
-                None => {
-                    use crate::fat_error::FatError;
-                    return Err(FatError::String {
-                        error: "AP interface already taken".to_string(),
-                    });
-                }
-            };
-            network::wifi_ap(ssid, device, &esp.controller, &mut esp.rng, spawner).await
         };
         match res {
             Ok(ap_stack) => {
@@ -271,23 +261,23 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
         timezone_time
     );
 
-    if let network::NetworkMode::WIFI { ref ip_address, .. } = network_mode {
+    if let NetworkMode::WIFI { ref ip_address, .. } = network_mode {
-        mqtt::publish_firmware_info(&mut board, version, ip_address, &timezone_time.to_rfc3339()).await;
+        publish_firmware_info(&mut board, version, ip_address, &timezone_time.to_rfc3339()).await;
-        mqtt::publish_battery_state(&mut board).await;
+        publish_battery_state(&mut board).await;
-        let _ = mqtt::publish_mppt_state(&mut board).await;
+        let _ = publish_mppt_state(&mut board).await;
     }
 
     log(
         LogMessage::StartupInfo,
-        matches!(network_mode, network::NetworkMode::WIFI { .. }) as u32,
+        matches!(network_mode, NetworkMode::WIFI { .. }) as u32,
         matches!(
             network_mode,
-            network::NetworkMode::WIFI {
+            NetworkMode::WIFI {
-                sntp: network::SntpMode::SYNC { .. },
+                sntp: SntpMode::SYNC { .. },
                 ..
             }
         ) as u32,
-        matches!(network_mode, network::NetworkMode::WIFI { mqtt: true, .. })
+        matches!(network_mode, NetworkMode::WIFI { mqtt: true, .. })
             .to_string()
             .as_str(),
         "",
@@ -309,7 +299,7 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
         log(LogMessage::NormalRun, 0, 0, "", "");
     }
 
-    let dry_run = false;
+    let _dry_run = false;
 
     let tank_state = determine_tank_state(&mut board).await;
 
@@ -346,7 +336,7 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
         }
     }
 
-    let mut water_frozen = false;
+    let mut _water_frozen = false;
     let water_temp: FatResult<f32> = match board.board_hal.get_tank_sensor() {
         Ok(sensor) => sensor.water_temperature_c().await,
         Err(e) => Err(e),
@@ -354,12 +344,12 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
 
     if let Ok(res) = water_temp {
         if res < WATER_FROZEN_THRESH {
-            water_frozen = true;
+            _water_frozen = true;
         }
     }
     info!("Water temp is {}", water_temp.as_ref().unwrap_or(&0.));
 
-    mqtt::publish_tank_state(&mut board, &tank_state, water_temp).await;
+    publish_tank_state(&mut board, &tank_state, water_temp).await;
 
     let plantstate: [PlantState; PLANT_COUNT] = [
         PlantState::read_hardware_state(0, &mut board).await,
@@ -372,72 +362,76 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
         PlantState::read_hardware_state(7, &mut board).await,
     ];
 
-    mqtt::publish_plant_states(&mut board, &timezone_time.clone(), &plantstate).await;
+    publish_plant_states(&mut board, &timezone_time.clone(), &plantstate).await;
 
-    let pump_required = plantstate
+    // let pump_required = plantstate
-        .iter()
+    //     .iter()
-        .zip(&board.board_hal.get_config().plants)
+    //     .zip(&board.board_hal.get_config().plants)
-        .any(|(it, conf)| it.needs_to_be_watered(conf, &timezone_time))
+    //     .any(|(it, conf)| it.needs_to_be_watered(conf, &timezone_time))
-        && !water_frozen;
+    //     && !water_frozen;
-    if pump_required {
+    // if pump_required {
-        log(LogMessage::EnableMain, dry_run as u32, 0, "", "");
+    //     log(LogMessage::EnableMain, dry_run as u32, 0, "", "");
-        for (plant_id, (state, plant_config)) in plantstate
+    //     for (plant_id, (state, plant_config)) in plantstate
-            .iter()
+    //         .iter()
-            .zip(&board.board_hal.get_config().plants.clone())
+    //         .zip(&board.board_hal.get_config().plants.clone())
-            .enumerate()
+    //         .enumerate()
-        {
+    //     {
-            if state.needs_to_be_watered(plant_config, &timezone_time) {
+    //         if state.needs_to_be_watered(plant_config, &timezone_time) {
-                let pump_count = board.board_hal.get_esp().consecutive_pump_count(plant_id) + 1;
+    //             let pump_count = board.board_hal.get_esp().consecutive_pump_count(plant_id) + 1;
-                board
+    //             board
-                    .board_hal
+    //                 .board_hal
-                    .get_esp()
+    //                 .get_esp()
-                    .store_consecutive_pump_count(plant_id, pump_count);
+    //                 .store_consecutive_pump_count(plant_id, pump_count);
-                let pump_ineffective = pump_count > plant_config.max_consecutive_pump_count as u32;
+    //
-                if pump_ineffective {
+    //             let pump_ineffective = pump_count > plant_config.max_consecutive_pump_count as u32;
-                    log(
+    //             if pump_ineffective {
-                        LogMessage::ConsecutivePumpCountLimit,
+    //                 log(
-                        pump_count,
+    //                     LogMessage::ConsecutivePumpCountLimit,
-                        plant_config.max_consecutive_pump_count as u32,
+    //                     pump_count,
-                        &(plant_id + 1).to_string(),
+    //                     plant_config.max_consecutive_pump_count as u32,
-                        "",
+    //                     &(plant_id + 1).to_string(),
-                    );
+    //                     "",
-                    board.board_hal.fault(plant_id, true).await?;
+    //                 );
-                }
+    //                 board.board_hal.fault(plant_id, true).await?;
-                log(
+    //             }
-                    LogMessage::PumpPlant,
+    //             log(
-                    (plant_id + 1) as u32,
+    //                 LogMessage::PumpPlant,
-                    plant_config.pump_time_s as u32,
+    //                 (plant_id + 1) as u32,
-                    &dry_run.to_string(),
+    //                 plant_config.pump_time_s as u32,
-                    "",
+    //                 &dry_run.to_string(),
-                );
+    //                 "",
-                board
+    //             );
-                    .board_hal
+    //             board
-                    .get_esp()
+    //                 .board_hal
-                    .store_last_pump_time(plant_id, cur);
+    //                 .get_esp()
-                board.board_hal.get_esp().last_pump_time(plant_id);
+    //                 .store_last_pump_time(plant_id, cur);
-                mqtt::pump_info(plant_id, true, pump_ineffective, 0, 0, 0, false).await;
+    //             board.board_hal.get_esp().last_pump_time(plant_id);
-                let result = do_secure_pump(&mut board, plant_id, plant_config, dry_run).await?;
+    //             //state.active = true;
-                board.board_hal.pump(plant_id, false).await?;
+    //
-                mqtt::pump_info(
+    //             pump_info(plant_id, true, pump_ineffective, 0, 0, 0, false).await;
-                    plant_id,
+    //
-                    false,
+    //             let result = do_secure_pump(plant_id, plant_config, dry_run).await?;
-                    pump_ineffective,
+    //             board.board_hal.pump(plant_id, false).await?;
-                    result.median_current_ma,
+    //             pump_info(
-                    result.max_current_ma,
+    //                 plant_id,
-                    result.min_current_ma,
+    //                 false,
-                    result.error,
+    //                 pump_ineffective,
-                )
+    //                 result.median_current_ma,
-                .await;
+    //                 result.max_current_ma,
-            } else if !state.pump_in_timeout(plant_config, &timezone_time) {
+    //                 result.min_current_ma,
-                // plant does not need to be watered and is not in timeout
+    //                 result.error,
-                // -> reset consecutive pump count
+    //             )
-                board
+    //             .await;
-                    .board_hal
+    //         } else if !state.pump_in_timeout(plant_config, &timezone_time) {
-                    .get_esp()
+    //             // plant does not need to be watered and is not in timeout
-                    .store_consecutive_pump_count(plant_id, 0);
+    //             // -> reset consecutive pump count
-            }
+    //             board
-        }
+    //                 .board_hal
-    }
+    //                 .get_esp()
+    //                 .store_consecutive_pump_count(plant_id, 0);
+    //         }
+    //     }
+    // }
 
     info!("state of charg");
     let is_day = board.board_hal.is_day();
@@ -561,8 +555,7 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
 
     if stay_alive {
         let reboot_now = Arc::new(AtomicBool::new(false));
-
+        let _webserver = http_server(reboot_now.clone(), stack.take().unwrap());
-        spawner.spawn(http_server(reboot_now.clone(), stack.take().unwrap())?);
         wait_infinity(board, WaitType::MqttConfig, reboot_now.clone(), UTC).await;
     } else {
         //TODO wait for all mqtt publishes?
@@ -703,6 +696,204 @@ async fn update_charge_indicator(
     Ok(())
 }
 
+async fn publish_tank_state(
+    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
+    tank_state: &TankState,
+    water_temp: FatResult<f32>,
+) {
+    let state = serde_json::to_string(
+        &tank_state.as_mqtt_info(&board.board_hal.get_config().tank, &water_temp),
+    )
+    .unwrap();
+    let _ = mqtt::publish("/water", &*state).await;
+}
+
+async fn publish_plant_states(
+    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
+    timezone_time: &DateTime<Tz>,
+    plantstate: &[PlantState; 8],
+) {
+    for (plant_id, (plant_state, plant_conf)) in plantstate
+        .iter()
+        .zip(&board.board_hal.get_config().plants.clone())
+        .enumerate()
+    {
+        let state =
+            serde_json::to_string(&plant_state.to_mqtt_info(plant_conf, timezone_time)).unwrap();
+        let plant_topic = format!("/plant{}", plant_id + 1);
+        let _ = mqtt::publish(&plant_topic, &state).await;
+    }
+}
+
+async fn publish_firmware_info(
+    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
+    version: VersionInfo,
+    ip_address: &str,
+    timezone_time: &str,
+) {
+    mqtt::publish("/firmware/address", ip_address).await;
+    mqtt::publish("/firmware/state", &serde_json::to_string(&version).unwrap())
+        .await;
+    mqtt::publish("/firmware/last_online", timezone_time)
+        .await;
+    mqtt::publish("/state", "online").await;
+}
+macro_rules! mk_static {
+    ($t:ty,$val:expr) => {{
+        static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
+        #[deny(unused_attributes)]
+        let x = STATIC_CELL.uninit().write(($val));
+        x
+    }};
+}
+async fn try_connect_wifi_sntp_mqtt(
+    board: &mut MutexGuard<'static, CriticalSectionRawMutex, HAL<'static>>,
+    stack_store: &mut OptionLock<Stack<'static>>,
+    spawner: Spawner,
+) -> NetworkMode {
+    let nw_conf = &board.board_hal.get_config().network.clone();
+    match board.board_hal.get_esp().wifi(nw_conf, spawner).await {
+        Ok(stack) => {
+            stack_store.replace(stack);
+
+            let sntp_mode: SntpMode = match board.board_hal.get_esp().sntp(1000 * 10, stack).await {
+                Ok(new_time) => {
+                    info!("Using time from sntp {}", new_time.to_rfc3339());
+                    let _ = board
+                        .board_hal
+                        .get_rtc_module()
+                        .set_rtc_time(&new_time)
+                        .await;
+                    SntpMode::SYNC { current: new_time }
+                }
+                Err(err) => {
+                    warn!("sntp error: {err}");
+                    board.board_hal.general_fault(true).await;
+                    SntpMode::OFFLINE
+                }
+            };
+
+            let mqtt_connected = if board.board_hal.get_config().network.mqtt_url.is_some() {
+                let nw_config = board.board_hal.get_config().network.clone();
+                let nw_config = mk_static!(NetworkConfig, nw_config);
+                match mqtt::mqtt_init(nw_config, stack, spawner).await {
+                    Ok(_) => {
+                        info!("Mqtt connection ready");
+                        true
+                    }
+                    Err(err) => {
+                        warn!("Could not connect mqtt due to {err}");
+                        false
+                    }
+                }
+            } else {
+                false
+            };
+
+            let ip = match stack.config_v4() {
+                Some(config) => config.address.address().to_string(),
+                None => match stack.config_v6() {
+                    Some(config) => config.address.address().to_string(),
+                    None => String::from("No IP"),
+                },
+            };
+            NetworkMode::WIFI {
+                sntp: sntp_mode,
+                mqtt: mqtt_connected,
+                ip_address: ip,
+            }
+        }
+        Err(err) => {
+            info!("Offline mode due to {err}");
+            board.board_hal.general_fault(true).await;
+            NetworkMode::OFFLINE
+        }
+    }
+}
+
+async fn pump_info(
+    plant_id: usize,
+    pump_active: bool,
+    pump_ineffective: bool,
+    median_current_ma: u16,
+    max_current_ma: u16,
+    min_current_ma: u16,
+    _error: bool,
+) {
+    let pump_info = mqtt::PumpInfo {
+        enabled: pump_active,
+        pump_ineffective,
+        median_current_ma,
+        max_current_ma,
+        min_current_ma,
+    };
+    let pump_topic = format!("/pump{}", plant_id + 1);
+
+    match serde_json::to_string(&pump_info) {
+        Ok(state) => {
+            let _ = mqtt::publish(&pump_topic, &state).await;
+        }
+        Err(err) => {
+            warn!("Error publishing pump state {}", err);
+        }
+    };
+}
+
+async fn publish_mppt_state(
+    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
+) -> FatResult<()> {
+    let current = board.board_hal.get_mptt_current().await?;
+    let voltage = board.board_hal.get_mptt_voltage().await?;
+    let solar_state = mqtt::Solar {
+        current_ma: current.as_milliamperes() as u32,
+        voltage_ma: voltage.as_millivolts() as u32,
+    };
+    if let Ok(serialized_solar_state_bytes) = serde_json::to_string(&solar_state) {
+        let _ = mqtt::publish("/mppt", &serialized_solar_state_bytes).await;
+    }
+    Ok(())
+}
+
+async fn publish_battery_state(
+    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
+) -> () {
+    let telemetry = match board
+        .board_hal
+        .get_battery_monitor()
+        .get_battery_state()
+        .await
+    {
+        Ok(BatteryState::Info(info)) => info,
+        Ok(BatteryState::Unknown) => BatteryInfo {
+            voltage_mv: None,
+            current_ma: None,
+            soc_pct: None,
+            soh_pct: None,
+            temperature_c: None,
+            cycle_count: None,
+            remaining_mah: None,
+            design_mah: None,
+            error: Some(BatteryError::NoBatteryMonitor),
+        },
+        Err(e) => BatteryInfo {
+            voltage_mv: None,
+            current_ma: None,
+            soc_pct: None,
+            soh_pct: None,
+            temperature_c: None,
+            cycle_count: None,
+            remaining_mah: None,
+            design_mah: None,
+            error: Some(BatteryError::CommunicationError {
+                message: alloc::format!("{:?}", e),
+            }),
+        },
+    };
+    if let Ok(json) = serde_json::to_string(&telemetry) {
+        let _ = mqtt::publish("/battery", &json).await;
+    }
+}
+
 async fn wait_infinity(
     board: MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
     wait_type: WaitType,

rust/src/mqtt.rs

@@ -1,23 +1,16 @@
+use crate::bail;
 use crate::config::NetworkConfig;
 use crate::fat_error::{ContextExt, FatError, FatResult};
-use crate::hal::battery::{BatteryError, BatteryInfo, BatteryState};
+use crate::hal::PlantHal;
-use crate::hal::{PlantHal, HAL};
 use crate::log::{log, LogMessage};
-use crate::plant_state::PlantState;
-use crate::tank::TankState;
-use crate::{bail, VersionInfo};
 use alloc::string::String;
 use alloc::{format, string::ToString};
-use chrono::DateTime;
-use chrono_tz::Tz;
 use core::sync::atomic::Ordering;
 use embassy_executor::Spawner;
 use embassy_net::Stack;
-use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-use embassy_sync::mutex::MutexGuard;
 use embassy_sync::once_lock::OnceLock;
 use embassy_time::{Duration, Timer, WithTimeout};
-use log::{info, warn};
+use log::info;
 use mcutie::{
     Error, McutieBuilder, McutieReceiver, McutieTask, MqttMessage, PublishDisplay, Publishable,
     QoS, Topic,
@@ -25,6 +18,21 @@ use mcutie::{
 use portable_atomic::AtomicBool;
 use serde::{Deserialize, Serialize};
 
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+pub struct PumpInfo {
+    pub enabled: bool,
+    pub pump_ineffective: bool,
+    pub median_current_ma: u16,
+    pub max_current_ma: u16,
+    pub min_current_ma: u16,
+}
+
+#[derive(Serialize, Debug, PartialEq)]
+pub struct Solar {
+    pub current_ma: u32,
+    pub voltage_ma: u32,
+}
+
 static MQTT_CONNECTED_EVENT_RECEIVED: AtomicBool = AtomicBool::new(false);
 static MQTT_ROUND_TRIP_RECEIVED: AtomicBool = AtomicBool::new(false);
 pub static MQTT_STAY_ALIVE: AtomicBool = AtomicBool::new(false);
@@ -102,7 +110,14 @@ async fn publish_inner(subtopic: &str, message: &str) -> FatResult<()> {
     }
 }
 
-use crate::util::mk_static;
+macro_rules! mk_static {
+    ($t:ty,$val:expr) => {{
+        static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
+        #[deny(unused_attributes)]
+        let x = STATIC_CELL.uninit().write(($val));
+        x
+    }};
+}
 
 pub async fn mqtt_init(
     network_config: &'static NetworkConfig,
@@ -257,142 +272,3 @@ async fn mqtt_incoming_task(
         }
     }
 }
-
-pub async fn publish_tank_state(
-    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
-    tank_state: &TankState,
-    water_temp: FatResult<f32>,
-) {
-    let state = serde_json::to_string(
-        &tank_state.as_mqtt_info(&board.board_hal.get_config().tank, &water_temp),
-    )
-    .unwrap();
-    let _ = publish("/water", &*state).await;
-}
-
-pub async fn publish_plant_states(
-    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
-    timezone_time: &DateTime<Tz>,
-    plantstate: &[PlantState; 8],
-) {
-    for (plant_id, (plant_state, plant_conf)) in plantstate
-        .iter()
-        .zip(&board.board_hal.get_config().plants.clone())
-        .enumerate()
-    {
-        let state =
-            serde_json::to_string(&plant_state.to_mqtt_info(plant_conf, timezone_time)).unwrap();
-        let plant_topic = format!("/plant{}", plant_id + 1);
-        let _ = publish(&plant_topic, &state).await;
-    }
-}
-
-pub async fn publish_firmware_info(
-    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
-    version: VersionInfo,
-    ip_address: &str,
-    timezone_time: &str,
-) {
-    publish("/firmware/address", ip_address).await;
-    publish("/firmware/state", &serde_json::to_string(&version).unwrap()).await;
-    publish("/firmware/last_online", timezone_time).await;
-    publish("/state", "online").await;
-}
-
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
-struct PumpInfo {
-    pub enabled: bool,
-    pub pump_ineffective: bool,
-    pub median_current_ma: u16,
-    pub max_current_ma: u16,
-    pub min_current_ma: u16,
-}
-
-pub async fn pump_info(
-    plant_id: usize,
-    pump_active: bool,
-    pump_ineffective: bool,
-    median_current_ma: u16,
-    max_current_ma: u16,
-    min_current_ma: u16,
-    _error: bool,
-) {
-    let pump_info = PumpInfo {
-        enabled: pump_active,
-        pump_ineffective,
-        median_current_ma,
-        max_current_ma,
-        min_current_ma,
-    };
-    let pump_topic = format!("/pump{}", plant_id + 1);
-
-    match serde_json::to_string(&pump_info) {
-        Ok(state) => {
-            let _ = publish(&pump_topic, &state).await;
-        }
-        Err(err) => {
-            warn!("Error publishing pump state {}", err);
-        }
-    };
-}
-
-#[derive(Serialize, Debug, PartialEq)]
-pub struct Solar {
-    pub current_ma: u32,
-    pub voltage_ma: u32,
-}
-
-pub async fn publish_mppt_state(
-    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
-) -> FatResult<()> {
-    let current = board.board_hal.get_mptt_current().await?;
-    let voltage = board.board_hal.get_mptt_voltage().await?;
-    let solar_state = Solar {
-        current_ma: current.as_milliamperes() as u32,
-        voltage_ma: voltage.as_millivolts() as u32,
-    };
-    if let Ok(serialized_solar_state_bytes) = serde_json::to_string(&solar_state) {
-        let _ = publish("/mppt", &serialized_solar_state_bytes).await;
-    }
-    Ok(())
-}
-
-pub async fn publish_battery_state(
-    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
-) -> () {
-    let telemetry = match board
-        .board_hal
-        .get_battery_monitor()
-        .get_battery_state()
-        .await
-    {
-        Ok(BatteryState::Info(info)) => info,
-        Ok(BatteryState::Unknown) => BatteryInfo {
-            voltage_mv: None,
-            avg_current_ma: None,
-            soc_pct: None,
-            soh_pct: None,
-            temperature_c: None,
-            cycle_count: None,
-            remaining_mah: None,
-            design_mah: None,
-            error: Some(BatteryError::NoBatteryMonitor),
-        },
-        Err(e) => BatteryInfo {
-            voltage_mv: None,
-            avg_current_ma: None,
-            soc_pct: None,
-            soh_pct: None,
-            temperature_c: None,
-            cycle_count: None,
-            remaining_mah: None,
-            design_mah: None,
-            error: Some(BatteryError::CommunicationError {
-                message: alloc::format!("{:?}", e),
-            }),
-        },
-    };
-    if let Ok(json) = serde_json::to_string(&telemetry) {
-        let _ = publish("/battery", &json).await;
-    }
-}

rust/src/network.rs

@@ -1,419 +0,0 @@
-use crate::bail;
-use crate::config::NetworkConfig;
-use crate::fat_error::{ContextExt, FatError, FatResult};
-use crate::hal::{PlantHal, HAL};
-use crate::mqtt;
-use crate::util::mk_static;
-use alloc::string::{String, ToString};
-use alloc::sync::Arc;
-use chrono::{DateTime, Utc};
-use core::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4};
-use embassy_executor::Spawner;
-use embassy_net::dns::DnsQueryType;
-use embassy_net::udp::{PacketMetadata, UdpSocket};
-use embassy_net::{DhcpConfig, Runner, Stack, StackResources, StaticConfigV4};
-use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-use embassy_sync::mutex::{Mutex, MutexGuard};
-use embassy_time::{Duration, Timer, WithTimeout};
-use option_lock::OptionLock;
-use edge_dhcp::{
-    io::{self, DEFAULT_SERVER_PORT},
-    server::{Server, ServerOptions},
-};
-use edge_nal::UdpBind;
-use edge_nal_embassy::{Udp, UdpBuffers};
-use esp_hal::rng::Rng;
-use esp_println::println;
-use esp_radio::wifi::ap::AccessPointConfig;
-use esp_radio::wifi::sta::StationConfig;
-use esp_radio::wifi::{AuthenticationMethod, Config, Interface};
-use log::{info, warn, error};
-use serde::Serialize;
-use sntpc::{NtpContext, NtpTimestampGenerator, NtpUdpSocket, get_time};
-
-const NTP_SERVER: &str = "pool.ntp.org";
-
-#[derive(Copy, Clone, Default)]
-struct Timestamp {
-    stamp: DateTime<Utc>,
-}
-
-impl NtpTimestampGenerator for Timestamp {
-    fn init(&mut self) {
-        self.stamp = DateTime::default();
-    }
-
-    fn timestamp_sec(&self) -> u64 {
-        self.stamp.timestamp() as u64
-    }
-
-    fn timestamp_subsec_micros(&self) -> u32 {
-        self.stamp.timestamp_subsec_micros()
-    }
-}
-
-struct EmbassyNtpSocket<'a, 'b> {
-    socket: &'a UdpSocket<'b>,
-}
-
-impl<'a, 'b> EmbassyNtpSocket<'a, 'b> {
-    fn new(socket: &'a UdpSocket<'b>) -> Self {
-        Self { socket }
-    }
-}
-
-impl NtpUdpSocket for EmbassyNtpSocket<'_, '_> {
-    async fn send_to(&self, buf: &[u8], addr: SocketAddr) -> sntpc::Result<usize> {
-        self.socket
-            .send_to(buf, addr)
-            .await
-            .map_err(|_| sntpc::Error::Network)?;
-        Ok(buf.len())
-    }
-
-    async fn recv_from(&self, buf: &mut [u8]) -> sntpc::Result<(usize, SocketAddr)> {
-        let (len, metadata) = self
-            .socket
-            .recv_from(buf)
-            .await
-            .map_err(|_| sntpc::Error::Network)?;
-        let addr = match metadata.endpoint.addr {
-            embassy_net::IpAddress::Ipv4(ip) => IpAddr::V4(ip),
-            embassy_net::IpAddress::Ipv6(ip) => IpAddr::V6(ip),
-        };
-        Ok((len, SocketAddr::new(addr, metadata.endpoint.port)))
-    }
-}
-
-pub async fn sntp(max_wait_ms: u32, stack: Stack<'_>) -> FatResult<DateTime<Utc>> {
-    println!("start sntp");
-    let mut rx_meta = [PacketMetadata::EMPTY; 16];
-    let mut rx_buffer = [0; 4096];
-    let mut tx_meta = [PacketMetadata::EMPTY; 16];
-    let mut tx_buffer = [0; 4096];
-
-    let mut socket = UdpSocket::new(
-        stack,
-        &mut rx_meta,
-        &mut rx_buffer,
-        &mut tx_meta,
-        &mut tx_buffer,
-    );
-    socket.bind(123).context("Could not bind UDP socket")?;
-
-    let context = NtpContext::new(Timestamp::default());
-    let ntp_socket = EmbassyNtpSocket::new(&socket);
-
-    let ntp_addrs = stack
-        .dns_query(NTP_SERVER, DnsQueryType::A)
-        .await
-        .context("Failed to resolve DNS")?;
-
-    if ntp_addrs.is_empty() {
-        bail!("No IP addresses found for NTP server");
-    }
-    let ntp = ntp_addrs[0];
-    info!("NTP server: {ntp:?}");
-
-    let mut counter = 0;
-    loop {
-        let addr: IpAddr = ntp.into();
-        let timeout = get_time(SocketAddr::from((addr, 123)), &ntp_socket, context)
-            .with_timeout(Duration::from_millis((max_wait_ms / 10) as u64))
-            .await;
-
-        match timeout {
-            Ok(result) => {
-                let time = result?;
-                info!("Time: {time:?}");
-                return DateTime::from_timestamp(time.seconds as i64, 0)
-                    .context("Could not convert Sntp result");
-            }
-            Err(err) => {
-                warn!("sntp timeout, retry: {err:?}");
-                counter += 1;
-                if counter > 10 {
-                    bail!("Failed to get time from NTP server");
-                }
-                Timer::after(Duration::from_millis(100)).await;
-            }
-        }
-    }
-}
-
-#[derive(Serialize, Debug, PartialEq)]
-pub enum SntpMode {
-    OFFLINE,
-    SYNC { current: DateTime<Utc> },
-}
-
-#[derive(Serialize, Debug, PartialEq)]
-pub enum NetworkMode {
-    WIFI {
-        sntp: SntpMode,
-        mqtt: bool,
-        ip_address: String,
-    },
-    OFFLINE,
-}
-
-#[embassy_executor::task(pool_size = 2)]
-pub(crate) async fn net_task(mut runner: Runner<'static, Interface<'static>>) {
-    runner.run().await;
-}
-
-#[embassy_executor::task]
-pub(crate) async fn run_dhcp(stack: Stack<'static>, ip: Ipv4Addr) {
-    let mut buf = [0u8; 1500];
-
-    let mut gw_buf = [Ipv4Addr::UNSPECIFIED];
-
-    let buffers = UdpBuffers::<3, 1024, 1024, 10>::new();
-    let unbound_socket = Udp::new(stack, &buffers);
-    let mut bound_socket = match unbound_socket
-        .bind(SocketAddr::V4(SocketAddrV4::new(
-            Ipv4Addr::UNSPECIFIED,
-            DEFAULT_SERVER_PORT,
-        )))
-        .await
-    {
-        Ok(s) => s,
-        Err(e) => {
-            error!("dhcp task failed to bind socket: {:?}", e);
-            return;
-        }
-    };
-
-    loop {
-        _ = io::server::run(
-            &mut Server::<_, 64>::new_with_et(ip),
-            &ServerOptions::new(ip, Some(&mut gw_buf)),
-            &mut bound_socket,
-            &mut buf,
-        )
-        .await
-        .inspect_err(|e| warn!("DHCP server error: {e:?}"));
-        Timer::after(Duration::from_millis(500)).await;
-    }
-}
-
-pub async fn wifi_ap(
-    ssid: String,
-    interface_ap: Interface<'static>,
-    controller: &Arc<Mutex<CriticalSectionRawMutex, esp_radio::wifi::WifiController<'static>>>,
-    rng: &mut Rng,
-    spawner: Spawner,
-) -> FatResult<Stack<'static>> {
-    let gw_ip_addr = Ipv4Addr::new(192, 168, 71, 1);
-
-    let config = embassy_net::Config::ipv4_static(StaticConfigV4 {
-        address: embassy_net::Ipv4Cidr::new(gw_ip_addr, 24),
-        gateway: Some(gw_ip_addr),
-        dns_servers: Default::default(),
-    });
-
-    let seed = (rng.random() as u64) << 32 | rng.random() as u64;
-
-    println!("init secondary stack");
-    let (stack, runner) = embassy_net::new(
-        interface_ap,
-        config,
-        mk_static!(StackResources<4>, StackResources::<4>::new()),
-        seed,
-    );
-    let stack = mk_static!(Stack, stack);
-
-    let client_config =
-        Config::AccessPoint(AccessPointConfig::default().with_ssid(ssid.clone()));
-    controller.lock().await.set_config(&client_config)?;
-
-    println!("start net task");
-    spawner.spawn(net_task(runner)?);
-    println!("run dhcp");
-    spawner.spawn(run_dhcp(*stack, gw_ip_addr)?);
-
-    loop {
-        if stack.is_link_up() {
-            break;
-        }
-        Timer::after(Duration::from_millis(500)).await;
-    }
-    while !stack.is_config_up() {
-        Timer::after(Duration::from_millis(100)).await
-    }
-    println!("Connect to the AP `${ssid}` and point your browser to http://{gw_ip_addr}/");
-    stack
-        .config_v4()
-        .inspect(|c| println!("ipv4 config: {c:?}"));
-
-    Ok(*stack)
-}
-
-pub async fn wifi(
-    network_config: &NetworkConfig,
-    interface_sta: Interface<'static>,
-    controller: &Arc<Mutex<CriticalSectionRawMutex, esp_radio::wifi::WifiController<'static>>>,
-    rng: &mut Rng,
-    spawner: Spawner,
-) -> FatResult<Stack<'static>> {
-    esp_radio::wifi_set_log_verbose();
-    let ssid = match &network_config.ssid {
-        Some(ssid) => {
-            if ssid.is_empty() {
-                bail!("Wifi ssid was empty")
-            }
-            ssid.as_str().to_string()
-        }
-        None => {
-            bail!("Wifi ssid was empty")
-        }
-    };
-    info!("attempting to connect wifi {ssid}");
-    let password = match network_config.password {
-        Some(ref password) => password.as_str().to_string(),
-        None => "".to_string(),
-    };
-    let max_wait = network_config.max_wait;
-
-    let config = embassy_net::Config::dhcpv4(DhcpConfig::default());
-
-    let seed = (rng.random() as u64) << 32 | rng.random() as u64;
-
-    let (stack, runner) = embassy_net::new(
-        interface_sta,
-        config,
-        mk_static!(StackResources<8>, StackResources::<8>::new()),
-        seed,
-    );
-    let stack = mk_static!(Stack, stack);
-
-    let auth_method = if password.is_empty() {
-        AuthenticationMethod::None
-    } else {
-        AuthenticationMethod::Wpa2Personal
-    };
-    let client_config = StationConfig::default()
-        .with_ssid(ssid)
-        .with_auth_method(auth_method)
-        .with_scan_method(esp_radio::wifi::sta::ScanMethod::AllChannels)
-        .with_listen_interval(10)
-        .with_beacon_timeout(10)
-        .with_failure_retry_cnt(3)
-        .with_password(password);
-
-    controller
-        .lock()
-        .await
-        .set_config(&Config::Station(client_config))?;
-    spawner.spawn(net_task(runner)?);
-    controller
-        .lock()
-        .await
-        .connect_async()
-        .with_timeout(Duration::from_millis(max_wait as u64 * 1000))
-        .await
-        .context("Timeout waiting for wifi sta connected")??;
-
-    let res = async {
-        while !stack.is_link_up() {
-            Timer::after(Duration::from_millis(500)).await;
-        }
-        Ok::<(), FatError>(())
-    }
-    .with_timeout(Duration::from_millis(max_wait as u64 * 1000))
-    .await;
-
-    if res.is_err() {
-        bail!("Timeout waiting for wifi link up")
-    }
-
-    let res = async {
-        while !stack.is_config_up() {
-            Timer::after(Duration::from_millis(100)).await
-        }
-        Ok::<(), FatError>(())
-    }
-    .with_timeout(Duration::from_millis(max_wait as u64 * 1000))
-    .await;
-
-    if res.is_err() {
-        bail!("Timeout waiting for wifi config up")
-    }
-
-    info!("Connected WIFI, dhcp: {:?}", stack.config_v4());
-    Ok(*stack)
-}
-
-pub async fn try_connect_wifi_sntp_mqtt(
-    board: &mut MutexGuard<'static, CriticalSectionRawMutex, HAL<'static>>,
-    stack_store: &mut OptionLock<Stack<'static>>,
-    spawner: Spawner,
-) -> NetworkMode {
-    let nw_conf = &board.board_hal.get_config().network.clone();
-    let esp = board.board_hal.get_esp();
-    let device = match esp.interface_sta.take() {
-        Some(d) => d,
-        None => {
-            info!("Offline mode due to STA interface already taken");
-            board.board_hal.general_fault(true).await;
-            return NetworkMode::OFFLINE;
-        }
-    };
-    match wifi(nw_conf, device, &esp.controller, &mut esp.rng, spawner).await {
-        Ok(stack) => {
-            stack_store.replace(stack);
-
-            let sntp_mode: SntpMode = match sntp(1000 * 10, stack).await {
-                Ok(new_time) => {
-                    info!("Using time from sntp {}", new_time.to_rfc3339());
-                    let _ = board
-                        .board_hal
-                        .get_rtc_module()
-                        .set_rtc_time(&new_time)
-                        .await;
-                    SntpMode::SYNC { current: new_time }
-                }
-                Err(err) => {
-                    warn!("sntp error: {err}");
-                    board.board_hal.general_fault(true).await;
-                    SntpMode::OFFLINE
-                }
-            };
-
-            let mqtt_connected = if board.board_hal.get_config().network.mqtt_url.is_some() {
-                let nw_config = board.board_hal.get_config().network.clone();
-                let nw_config = mk_static!(NetworkConfig, nw_config);
-                match mqtt::mqtt_init(nw_config, stack, spawner).await {
-                    Ok(_) => {
-                        info!("Mqtt connection ready");
-                        true
-                    }
-                    Err(err) => {
-                        warn!("Could not connect mqtt due to {err}");
-                        false
-                    }
-                }
-            } else {
-                false
-            };
-
-            let ip = match stack.config_v4() {
-                Some(config) => config.address.address().to_string(),
-                None => match stack.config_v6() {
-                    Some(config) => config.address.address().to_string(),
-                    None => String::from("No IP"),
-                },
-            };
-            NetworkMode::WIFI {
-                sntp: sntp_mode,
-                mqtt: mqtt_connected,
-                ip_address: ip,
-            }
-        }
-        Err(err) => {
-            info!("Offline mode due to {err}");
-            board.board_hal.general_fault(true).await;
-            NetworkMode::OFFLINE
-        }
-    }
-}

rust/src/plant_state.rs

@@ -300,7 +300,7 @@ impl PlantState {
                 false
             },
             cooldown: self.pump_in_timeout(plant_conf, current_time),
-            out_of_work_hour: !in_time_range(
+            out_of_work_hour: in_time_range(
                 current_time,
                 plant_conf.pump_hour_start,
                 plant_conf.pump_hour_end,

rust/src/tank.rs

@@ -144,13 +144,13 @@ impl TankState {
             warn_level,
             volume_ml: left_ml,
             sensor_error: tank_err,
-            fill_raw_v: raw,
+            raw,
             water_frozen: water_temp
                 .as_ref()
                 .is_ok_and(|temp| *temp < WATER_FROZEN_THRESH),
             water_temp_c: water_temp.as_ref().copied().ok(),
             temp_sensor_error: water_temp.as_ref().err().map(|err| err.to_string()),
-            fill_pct: percent,
+            pct: percent,
         }
     }
 }
@@ -184,9 +184,9 @@ pub struct TankInfo {
     /// if there is an issue with the water level sensor
     pub(crate) sensor_error: Option<TankError>,
     /// raw water sensor value
-    pub(crate) fill_raw_v: Option<f32>,
+    pub(crate) raw: Option<f32>,
     /// percent value
-    pub(crate) fill_pct: Option<f32>,
+    pub(crate) pct: Option<f32>,
     /// water in the tank might be frozen
     pub(crate) water_frozen: bool,
     /// water temperature

rust/src/util.rs

@@ -1,10 +0,0 @@
-macro_rules! mk_static {
-    ($t:ty,$val:expr) => {{
-        static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
-        #[deny(unused_attributes)]
-        let x = STATIC_CELL.uninit().write(($val));
-        x
-    }};
-}
-
-pub(crate) use mk_static;

rust/src/webserver/mod.rs

@@ -30,80 +30,59 @@ use core::result::Result::Ok;
 use core::sync::atomic::{AtomicBool, Ordering};
 use edge_http::io::server::{Connection, Handler, Server};
 use edge_http::Method;
-use edge_nal::io::{Read, Write};
 use edge_nal::TcpBind;
+use edge_nal::io::{Read, Write};
 use edge_nal_embassy::{Tcp, TcpBuffers};
 use embassy_net::Stack;
 use embassy_time::Instant;
-use log::{error, info};
+use log::info;
 
-pub(crate) async fn ota_operations<T, const N: usize>(
+// fn ota(
-    conn: &mut Connection<'_, T, { N }>,
+//     request: &mut Request<&mut EspHttpConnection>,
-    method: Method,
+// ) -> Result<Option<std::string::String>, anyhow::Error> {
-) -> Result<Option<u32>, FatError>
+//     let mut board = BOARD_ACCESS.lock().unwrap();
-where
+//     let mut ota = OtaUpdate::begin()?;
-    T: Read + Write,
+//     log::info!("start ota");
-{
+//
-    Ok(match method {
+//     //having a larger buffer is not really faster, requires more stack and prevents the progress bar from working ;)
-        Method::Options => {
+//     const BUFFER_SIZE: usize = 512;
-            conn.initiate_response(
+//     let mut buffer: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE];
-                200,
+//     let mut total_read: usize = 0;
-                Some("OK"),
+//     let mut lastiter = 0;
-                &[
+//     loop {
-                    ("Access-Control-Allow-Origin", "*"),
+//         let read = request.read(&mut buffer)?;
-                    ("Access-Control-Allow-Headers", "*"),
+//         total_read += read;
-                    ("Access-Control-Allow-Methods", "*"),
+//         let to_write = &buffer[0..read];
-                ],
+//         //delay for watchdog and wifi stuff
-            )
+//         board.board_hal.get_esp().delay.delay_ms(1);
-            .await?;
+//
-            Some(200)
+//         let iter = (total_read / 1024) % 8;
-        }
+//         if iter != lastiter {
-        Method::Post => {
+//             board.board_hal.general_fault(iter % 5 == 0);
-            let mut offset = 0_usize;
+//             for i in 0..PLANT_COUNT {
-            let mut chunk = 0;
+//                 let _ = board.board_hal.fault(i, iter == i);
-            loop {
+//             }
-                let buf = read_up_to_bytes_from_request(conn, Some(4096)).await?;
+//             lastiter = iter;
-                if buf.is_empty() {
+//         }
-                    info!("file request for  ota finished");
+//
-                    let mut board = BOARD_ACCESS.get().await.lock().await;
+//         ota.write(to_write)?;
-                    board.board_hal.get_esp().finalize_ota().await?;
+//         if read == 0 {
-                    break;
+//             break;
-                } else {
+//         }
-                    let mut board = BOARD_ACCESS.get().await.lock().await;
+//     }
-                    board.board_hal.progress(chunk as u32).await;
+//     log::info!("wrote bytes ota {total_read}");
-                    // Erase next block if we are at a 4K boundary (including the first block at offset 0)
+//     log::info!("finish ota");
-                    board
+//     let partition = ota.raw_partition();
-                        .board_hal
+//     log::info!("finalizing and changing boot partition to {partition:?}");
-                        .get_esp()
+//
-                        .write_ota(offset as u32, &buf)
+//     let mut finalizer = ota.finalize()?;
-                        .await?;
+//     log::info!("changing boot partition");
-                }
+//     board.board_hal.get_esp().set_restart_to_conf(true);
-                offset += buf.len();
+//     drop(board);
-                chunk += 1;
+//     finalizer.set_as_boot_partition()?;
-            }
+//     anyhow::Ok(None)
-            BOARD_ACCESS
+// }
-                .get()
+//
-                .await
-                .lock()
-                .await
-                .board_hal
-                .clear_progress()
-                .await;
-            conn.initiate_response(
-                200,
-                Some("OK"),
-                &[
-                    ("Access-Control-Allow-Origin", "*"),
-                    ("Access-Control-Allow-Headers", "*"),
-                    ("Access-Control-Allow-Methods", "*"),
-                ],
-            )
-            .await?;
-            Some(200)
-        }
-        _ => None,
-    })
-}
 
 struct HTTPRequestRouter {
     reboot_now: Arc<AtomicBool>,
@@ -126,12 +105,7 @@ impl Handler for HTTPRequestRouter {
         let path = headers.path;
 
         let prefix = "/file?filename=";
-        let status = if path == "/ota" {
+        let status = if path.starts_with(prefix) {
-            ota_operations(conn, method).await.map_err(|e| {
-                error!("Error handling ota: {e}");
-                e
-            })?
-        } else if path.starts_with(prefix) {
             file_operations(conn, method, &path, &prefix).await?
         } else {
             match method {
@@ -221,18 +195,12 @@ where
     let mut data_store = Vec::new();
     let mut total_read = 0;
     loop {
-        let left = max_read - total_read;
         let mut buf = [0_u8; 64];
-        let s_buf = if buf.len() <= left {
+        let read = request.read(&mut buf).await?;
-            &mut buf
-        } else {
-            &mut buf[0..left]
-        };
-        let read = request.read(s_buf).await?;
         if read == 0 {
             break;
         }
-        let actual_data = &s_buf[0..read];
+        let actual_data = &buf[0..read];
         total_read += read;
         if total_read > max_read {
             bail!("Request too large {total_read} > {max_read}");

rust/src_webpack/src/api.ts

@@ -157,13 +157,7 @@ export interface Moistures {
 export interface VersionInfo {
     git_hash: string,
     build_time: string,
-    current: string,
+    partition: string
-    slot0_state: string,
-    slot1_state: string,
-    heap_total: number,
-    heap_used: number,
-    heap_free: number,
-    heap_max_used: number,
 }
 
 export interface BatteryState {

rust/src_webpack/src/main.ts

@@ -31,7 +31,6 @@ import {
     FileList, SolarState, PumpTestResult
 } from "./api";
 import {SolarView} from "./solarview";
-import {toast} from "./toast";
 
 export class Controller {
     loadTankInfo(): Promise<void> {
@@ -201,22 +200,15 @@ export class Controller {
         }, false);
         ajax.addEventListener("load", () => {
             controller.progressview.removeProgress("ota_upload")
-            const status = ajax.status;
+            controller.reboot();
-            if (status >= 200 && status < 300) {
-                controller.reboot();
-            } else {
-                const statusText = ajax.statusText || "";
-                const body = ajax.responseText || "";
-                toast.error(`OTA update error (${status}${statusText ? ' ' + statusText : ''}): ${body}`);
-            }
         }, false);
         ajax.addEventListener("error", () => {
+            alert("Error ota")
             controller.progressview.removeProgress("ota_upload")
-            toast.error("OTA upload failed due to a network error.");
         }, false);
         ajax.addEventListener("abort", () => {
+            alert("abort ota")
             controller.progressview.removeProgress("ota_upload")
-            toast.error("OTA upload was aborted.");
         }, false);
         ajax.open("POST", PUBLIC_URL + "/ota");
         ajax.send(file);

rust/src_webpack/src/ota.html

@@ -1,27 +1,23 @@
 <style>
-    .otakey {
+  .otakey{
-        min-width: 100px;
+    min-width: 100px;
-    }
+  }
-
+  .otavalue{
-    .otavalue {
+    flex-grow: 1;
-        flex-grow: 1;
+  }
-    }
+  .otaform {
-
+    min-width: 100px;
-    .otaform {
+    flex-grow: 1;
-        min-width: 100px;
+  }
-        flex-grow: 1;
+  .otachooser {
-    }
+    min-width: 100px;
-
+    width: 100%;
-    .otachooser {
+  }
-        min-width: 100px;
-        width: 100%;
-    }
 </style>
 <div class="flexcontainer">
     <div class="subtitle">
         Current Firmware
     </div>
-    <button style="margin-left: auto;" type="button" id="refresh_firmware_info">Refresh</button>
 </div>
 <div class="flexcontainer">
     <span class="otakey">Buildtime:</span>
@@ -32,46 +28,14 @@
     <span class="otavalue" id="firmware_githash"></span>
 </div>
 <div class="flexcontainer">
-    <span class="otakey">Partition:</span>
+  <span class="otakey">Partition:</span>
-    <span class="otavalue" id="firmware_partition"></span>
+  <span class="otavalue" id="firmware_partition"></span>
-</div>
-<div class="flexcontainer">
-    <span class="otakey">State0:</span>
-    <span class="otavalue" id="firmware_state0"></span>
-</div>
-<div class="flexcontainer">
-    <span class="otakey">State1:</span>
-    <span class="otavalue" id="firmware_state1"></span>
 </div>
 <div class="flexcontainer">
     <form class="otaform" id="upload_form" method="post">
         <input class="otachooser" type="file" name="file1" id="firmware_file"><br>
     </form>
 </div>
-<div class="flexcontainer">
-    <div class="subtitle">
-        Heap Memory
-    </div>
-    <div></div>
-</div>
-<div class="flexcontainer">
-    <span class="otakey">Free:</span>
-    <span class="otavalue" id="heap_free"></span>
-</div>
-<div class="flexcontainer">
-    <span class="otakey">Used:</span>
-    <span class="otavalue" id="heap_used"></span>
-</div>
-<div class="flexcontainer">
-    <span class="otakey">Total:</span>
-    <span class="otavalue" id="heap_total"></span>
-</div>
-<div class="flexcontainer">
-    <span class="otakey">Peak used:</span>
-    <span class="otavalue" id="heap_max_used"></span>
-</div>
-
-
 <div class="display:flex">
     <button style="margin-left: 16px; margin-top: 8px;" class="col-6" type="button" id="test">Self-Test</button>
 </div>

rust/src_webpack/src/ota.ts

@@ -1,37 +1,21 @@
-import {Controller} from "./main";
+import { Controller } from "./main";
 import {VersionInfo} from "./api";
 
-function fmtBytes(n: number): string {
-    return `${n} B (${(n / 1024).toFixed(1)} KiB)`;
-}
-
 export class OTAView {
     readonly file1Upload: HTMLInputElement;
     readonly firmware_buildtime: HTMLDivElement;
     readonly firmware_githash: HTMLDivElement;
     readonly firmware_partition: HTMLDivElement;
-    readonly firmware_state0: HTMLDivElement;
-    readonly firmware_state1: HTMLDivElement;
-    readonly heap_free: HTMLDivElement;
-    readonly heap_used: HTMLDivElement;
-    readonly heap_total: HTMLDivElement;
-    readonly heap_max_used: HTMLDivElement;
 
     constructor(controller: Controller) {
         (document.getElementById("firmwareview") as HTMLElement).innerHTML = require("./ota.html")
 
-        let test = document.getElementById("test") as HTMLButtonElement;
+        let test  = document.getElementById("test") as HTMLButtonElement;
-        let refresh = document.getElementById("refresh_firmware_info") as HTMLButtonElement;
 
         this.firmware_buildtime = document.getElementById("firmware_buildtime") as HTMLDivElement;
         this.firmware_githash = document.getElementById("firmware_githash") as HTMLDivElement;
         this.firmware_partition = document.getElementById("firmware_partition") as HTMLDivElement;
-        this.firmware_state0 = document.getElementById("firmware_state0") as HTMLDivElement;
+
-        this.firmware_state1 = document.getElementById("firmware_state1") as HTMLDivElement;
-        this.heap_free = document.getElementById("heap_free") as HTMLDivElement;
-        this.heap_used = document.getElementById("heap_used") as HTMLDivElement;
-        this.heap_total = document.getElementById("heap_total") as HTMLDivElement;
-        this.heap_max_used = document.getElementById("heap_max_used") as HTMLDivElement;
         
         const file = document.getElementById("firmware_file") as HTMLInputElement;
         this.file1Upload = file
@@ -47,21 +31,11 @@ export class OTAView {
         test.onclick = () => {
             controller.selfTest();
         }
-
-        refresh.onclick = () => {
-            controller.version();
-        }
     }
 
     setVersion(versionInfo: VersionInfo) {
         this.firmware_buildtime.innerText = versionInfo.build_time;
         this.firmware_githash.innerText = versionInfo.git_hash;
-        this.firmware_partition.innerText = versionInfo.current;
+        this.firmware_partition.innerText = versionInfo.partition;
-        this.firmware_state0.innerText = versionInfo.slot0_state;
-        this.firmware_state1.innerText = versionInfo.slot1_state;
-        this.heap_free.innerText = fmtBytes(versionInfo.heap_free);
-        this.heap_used.innerText = fmtBytes(versionInfo.heap_used);
-        this.heap_total.innerText = fmtBytes(versionInfo.heap_total);
-        this.heap_max_used.innerText = fmtBytes(versionInfo.heap_max_used);
     }
 }

rust/src_webpack/src/toast.ts

@@ -1,94 +0,0 @@
-class ToastService {
-  private container: HTMLElement;
-  private stylesInjected = false;
-
-  constructor() {
-    this.container = this.ensureContainer();
-    this.injectStyles();
-  }
-
-  info(message: string, timeoutMs: number = 5000) {
-    const el = this.createToast(message, 'info');
-    this.container.appendChild(el);
-    // Auto-dismiss after timeout
-    const timer = window.setTimeout(() => this.dismiss(el), timeoutMs);
-    // Dismiss on click immediately
-    el.addEventListener('click', () => {
-      window.clearTimeout(timer);
-      this.dismiss(el);
-    });
-  }
-
-  error(message: string) {
-    console.error(message);
-    const el = this.createToast(message, 'error');
-    this.container.appendChild(el);
-    // Only dismiss on click
-    el.addEventListener('click', () => this.dismiss(el));
-  }
-
-  private dismiss(el: HTMLElement) {
-    if (!el.parentElement) return;
-    el.parentElement.removeChild(el);
-  }
-
-  private createToast(message: string, type: 'info' | 'error'): HTMLElement {
-    const div = document.createElement('div');
-    div.className = `toast ${type}`;
-    div.textContent = message;
-    div.setAttribute('role', 'status');
-    div.setAttribute('aria-live', 'polite');
-    return div;
-  }
-
-  private ensureContainer(): HTMLElement {
-    let container = document.getElementById('toast-container');
-    if (!container) {
-      container = document.createElement('div');
-      container.id = 'toast-container';
-      document.body.appendChild(container);
-    }
-    return container;
-  }
-
-  private injectStyles() {
-    if (this.stylesInjected) return;
-    const style = document.createElement('style');
-    style.textContent = `
-#toast-container {
-  position: fixed;
-  top: 12px;
-  right: 12px;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  z-index: 9999;
-}
-.toast {
-  max-width: 320px;
-  padding: 10px 12px;
-  border-radius: 6px;
-  box-shadow: 0 2px 6px rgba(0,0,0,0.2);
-  cursor: pointer;
-  user-select: none;
-  font-family: sans-serif;
-  font-size: 14px;
-  line-height: 1.3;
-}
-.toast.info {
-  background-color: #d4edda; /* green-ish */
-  color: #155724;
-  border-left: 4px solid #28a745;
-}
-.toast.error {
-  background-color: #f8d7da; /* red-ish */
-  color: #721c24;
-  border-left: 4px solid #dc3545;
-}
-`;
-    document.head.appendChild(style);
-    this.stylesInjected = true;
-  }
-}
-
-export const toast = new ToastService();