implement async mqtt config update trigger and fix mqtt.rs corruption

.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/main.rs

@@ -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;
@@ -122,6 +122,8 @@ pub struct PumpResult {
     pump_time_s: u16,
 }
 
+
+
 async fn safe_main(spawner: Spawner) -> FatResult<()> {
     info!("Startup Rust");
 
@@ -195,15 +197,10 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
         info!("No wifi configured, starting initial config mode");
 
         let esp = board.board_hal.get_esp();
-        let ssid = esp
+        let ssid = esp.load_config().await
-            .load_config()
-            .await
             .map(|config| config.network.ap_ssid.to_string())
             .unwrap_or_else(|_| String::from("PlantCtrl Emergency Mode"));
-        let device = esp
+        let device = esp.interface_ap.take().context("AP interface already taken")?;
-            .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));
@@ -228,18 +225,14 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
 
         let res = {
             let esp = board.board_hal.get_esp();
-            let ssid = esp
+            let ssid = esp.load_config().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 {
+                    return Err(FatError::String { error: "AP interface already taken".to_string() });
-                        error: "AP interface already taken".to_string(),
-                    });
                 }
             };
             network::wifi_ap(ssid, device, &esp.controller, &mut esp.rng, spawner).await
@@ -275,6 +268,7 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
         publish_firmware_info(&mut board, version, ip_address, &timezone_time.to_rfc3339()).await;
         publish_battery_state(&mut board).await;
         let _ = publish_mppt_state(&mut board).await;
+        publish_config(&mut board).await;
     }
 
     log(
@@ -309,7 +303,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 +340,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,7 +348,7 @@ 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.));
@@ -374,70 +368,74 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
 
     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);
-                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?;
+    //
-                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 +559,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?
@@ -808,6 +805,21 @@ async fn publish_battery_state(
     }
 }
 
+async fn publish_config(
+    board: &mut MutexGuard<'_, CriticalSectionRawMutex, HAL<'_>>,
+) {
+    let config = board.board_hal.get_config();
+    match serde_json::to_string(&config) {
+        Ok(serialized) => {
+            let _ = mqtt::publish("/config", &serialized).await;
+        }
+        Err(err) => {
+            info!("Error serializing config: {}", err);
+        }
+    }
+}
+
+
 async fn wait_infinity(
     board: MutexGuard<'_, CriticalSectionRawMutex, HAL<'static>>,
     wait_type: WaitType,

rust/src/mqtt.rs

@@ -4,10 +4,12 @@ use crate::fat_error::{ContextExt, FatError, FatResult};
 use crate::hal::PlantHal;
 use crate::log::{log, LogMessage};
 use alloc::string::String;
-use alloc::{format, string::ToString};
+use alloc::{format, string::ToString, vec::Vec};
 use core::sync::atomic::Ordering;
 use embassy_executor::Spawner;
 use embassy_net::Stack;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
+use embassy_sync::mutex::Mutex;
 use embassy_sync::once_lock::OnceLock;
 use embassy_time::{Duration, Timer, WithTimeout};
 use log::info;
@@ -37,6 +39,7 @@ 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);
 static MQTT_BASE_TOPIC: OnceLock<String> = OnceLock::new();
+static MQTT_CONFIG_UPDATE_PAYLOAD: Mutex<CriticalSectionRawMutex, Option<String>> = Mutex::new(None);
 
 pub fn is_stay_alive() -> bool {
     MQTT_STAY_ALIVE.load(Ordering::Relaxed)
@@ -141,6 +144,8 @@ pub async fn mqtt_init(
     let last_will_topic = format!("{base_topic}/state");
     let round_trip_topic = format!("{base_topic}/internal/roundtrip");
     let stay_alive_topic = format!("{base_topic}/stay_alive");
+    let config_update_payload_topic = format!("{base_topic}/config/update_payload");
+    let config_update_topic = format!("{base_topic}/config/update");
 
     let mut builder: McutieBuilder<'_, String, PublishDisplay<String, &str>, 0> =
         McutieBuilder::new(stack, "plant ctrl", mqtt_url);
@@ -159,10 +164,12 @@ pub async fn mqtt_init(
     //TODO make configurable
     builder = builder.with_device_id("plantctrl");
 
-    let builder: McutieBuilder<'_, String, PublishDisplay<String, &str>, 2> = builder
+    let builder: McutieBuilder<'_, String, PublishDisplay<String, &str>, 4> = builder
         .with_subscriptions([
             Topic::General(round_trip_topic.clone()),
             Topic::General(stay_alive_topic.clone()),
+            Topic::General(config_update_payload_topic.clone()),
+            Topic::General(config_update_topic.clone()),
         ]);
 
     let keep_alive = Duration::from_secs(60 * 60 * 2).as_secs() as u16;
@@ -172,6 +179,8 @@ pub async fn mqtt_init(
         receiver,
         round_trip_topic.clone(),
         stay_alive_topic.clone(),
+        config_update_payload_topic.clone(),
+        config_update_topic.clone(),
     )?);
     spawner.spawn(mqtt_runner(task)?);
 
@@ -218,7 +227,7 @@ pub async fn mqtt_init(
 
 #[embassy_executor::task]
 async fn mqtt_runner(
-    task: McutieTask<'static, String, PublishDisplay<'static, String, &'static str>, 2>,
+    task: McutieTask<'static, String, PublishDisplay<'static, String, &'static str>, 4>,
 ) {
     task.run().await;
 }
@@ -228,6 +237,8 @@ async fn mqtt_incoming_task(
     receiver: McutieReceiver,
     round_trip_topic: String,
     stay_alive_topic: String,
+    config_update_payload_topic: String,
+    config_update_topic: String,
 ) {
     loop {
         let message = receiver.receive().await;
@@ -253,6 +264,43 @@ async fn mqtt_incoming_task(
                         };
                         log(LogMessage::MqttStayAliveRec, a, 0, "", "");
                         MQTT_STAY_ALIVE.store(value, Ordering::Relaxed);
+                    } else if subtopic.eq(config_update_payload_topic.as_str()) {
+                        let payload_str = String::from_utf8_lossy(&payload[..]).to_string();
+                        let mut buffer = MQTT_CONFIG_UPDATE_PAYLOAD.lock().await;
+                        *buffer = Some(payload_str);
+                        info!("MQTT config update payload received");
+                    } else if subtopic.eq(config_update_topic.as_str()) {
+                        let update_requested = payload.eq_ignore_ascii_case("true".as_ref())
+                            || payload.eq_ignore_ascii_case("1".as_ref());
+                        if update_requested {
+                            info!("MQTT config update requested");
+                            let payload_lock = MQTT_CONFIG_UPDATE_PAYLOAD.lock().await;
+                            if let Some(payload_str) = payload_lock.as_ref() {
+                                match serde_json::from_str::<crate::config::PlantControllerConfig>(payload_str) {
+                                    Ok(config) => {
+                                        info!("Deserialized config, applying...");
+                                        let board_mutex = crate::BOARD_ACCESS.get().await;
+                                        let mut board = board_mutex.lock().await;
+                                        if let Err(e) = board.board_hal.get_esp().save_config(payload_str.as_bytes().to_vec()).await {
+                                            info!("Error saving config to flash: {}", e);
+                                            let _ = publish("/config/update", "false").await;
+                                        } else {
+                                            board.board_hal.set_config(config);
+                                            info!("Config applied, rebooting");
+                                            let _ = publish("/config/update", "false").await;
+                                            board.board_hal.get_esp().deep_sleep_ms(0);
+                                        }
+                                    }
+                                    Err(e) => {
+                                        info!("Error deserializing config: {}", e);
+                                        let _ = publish("/config/update", "false").await;
+                                    }
+                                }
+                            } else {
+                                info!("No config update payload available");
+                                let _ = publish("/config/update", "false").await;
+                            }
+                        }
                     } else {
                         log(LogMessage::UnknownTopic, 0, 0, "", &topic);
                     }

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;
-            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

@@ -2,16 +2,13 @@
   .otakey{
     min-width: 100px;
   }
-
   .otavalue{
     flex-grow: 1;
   }
-
   .otaform {
     min-width: 100px;
     flex-grow: 1;
   }
-
   .otachooser {
     min-width: 100px;
     width: 100%;
@@ -21,7 +18,6 @@
     <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>
@@ -35,43 +31,11 @@
   <span class="otakey">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 {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 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();