setup cargo run to use containerized build tools that are not rust tools

bin/build-esp-plant-dev-tools.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+CONTAINER_NAME="localhost/esp-plant-dev-tools:latest"
+CONTAINER_TOOLS_BASEDIR="$(dirname "$(readlink -f "$0")")"
+
+pushd "$CONTAINER_TOOLS_BASEDIR"
+podman build -t "$CONTAINER_NAME" -f "esp-plant-dev-tools.Containerfile" .
+popd

bin/esp-plant-dev-tools.Containerfile

@@ -0,0 +1,16 @@
+FROM debian:latest
+
+RUN apt update -y && apt upgrade -y && apt install unzip curl xz-utils nodejs -y
+
+RUN cd /root && \
+    curl -L -o xpack-riscv-toolchain.tar.gz "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-3/xpack-riscv-none-elf-gcc-14.2.0-3-linux-x64.tar.gz" && \
+    mkdir xpack-toolchain && \
+    tar -xvf xpack-riscv-toolchain.tar.gz -C xpack-toolchain --strip-components=1 && \
+    mv xpack-toolchain/bin/* /usr/local/bin && \
+    mv xpack-toolchain/lib/ /usr/local && \
+    mv xpack-toolchain/lib64/ /usr/local && \
+    mv xpack-toolchain/libexec /usr/local && \
+    mv xpack-toolchain/riscv-none-elf /usr/local && \
+    rm -rf xpack-toolchain xpack-riscv-toolchain.tar.gz
+
+RUN apt install npm -y

bin/npm

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+CONTAINER_IMAGE="localhost/esp-plant-dev-tools:latest"
+CONTAINER_TOOLS_BASEDIR="$(dirname "$(readlink -f "$0")")"
+PLANTCTL_PROJECT_DIR="$(readlink -f "$CONTAINER_TOOLS_BASEDIR/..")"
+
+function _fatal {
+	echo -e "\e[31mERROR\e[0m   $(</dev/stdin)$*" 1>&2
+	exit 1
+}
+
+declare -a PODMAN_ARGS=(
+	"--rm" "-i" "--log-driver=none"
+	"-v" "$PLANTCTL_PROJECT_DIR:$PLANTCTL_PROJECT_DIR:rw"
+	"-v" "$PWD:$PWD:rw"
+	"-w" "$PWD"
+)
+
+[[ -t 1 ]] && PODMAN_ARGS+=("-t")
+
+if ! podman image exists "$CONTAINER_IMAGE"; then
+    #attempt to build container
+    "$CONTAINER_TOOLS_BASEDIR/build-esp-plant-dev-tools.sh" 1>&2 ||
+        _fatal "faild to build local image, cannot continue! … please ensure you have an internet connection"
+fi
+
+podman run "${PODMAN_ARGS[@]}" --entrypoint npm "$CONTAINER_IMAGE" "$@"

bin/npx

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+CONTAINER_IMAGE="localhost/esp-plant-dev-tools:latest"
+CONTAINER_TOOLS_BASEDIR="$(dirname "$(readlink -f "$0")")"
+PLANTCTL_PROJECT_DIR="$(readlink -f "$CONTAINER_TOOLS_BASEDIR/..")"
+
+function _fatal {
+	echo -e "\e[31mERROR\e[0m   $(</dev/stdin)$*" 1>&2
+	exit 1
+}
+
+declare -a PODMAN_ARGS=(
+	"--rm" "-i" "--log-driver=none"
+	"-v" "$PLANTCTL_PROJECT_DIR:$PLANTCTL_PROJECT_DIR:rw"
+	"-v" "$PWD:$PWD:rw"
+	"-w" "$PWD"
+)
+
+[[ -t 1 ]] && PODMAN_ARGS+=("-t")
+
+if ! podman image exists "$CONTAINER_IMAGE"; then
+    #attempt to build container
+    "$CONTAINER_TOOLS_BASEDIR/build-esp-plant-dev-tools.sh" 1>&2 ||
+        _fatal "faild to build local image, cannot continue! … please ensure you have an internet connection"
+fi
+
+podman run "${PODMAN_ARGS[@]}" --entrypoint npx "$CONTAINER_IMAGE" "$@"

bin/riscv32-unknown-elf-gcc

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+CONTAINER_IMAGE="localhost/esp-plant-dev-tools:latest"
+CONTAINER_TOOLS_BASEDIR="$(dirname "$(readlink -f "$0")")"
+PLANTCTL_PROJECT_DIR="$(readlink -f "$CONTAINER_TOOLS_BASEDIR/..")"
+
+function _fatal {
+	echo -e "\e[31mERROR\e[0m   $(</dev/stdin)$*" 1>&2
+	exit 1
+}
+
+declare -a PODMAN_ARGS=(
+	"--rm" "-i" "--log-driver=none"
+	"-v" "$PLANTCTL_PROJECT_DIR:$PLANTCTL_PROJECT_DIR:rw"
+	"-v" "$PWD:$PWD:rw"
+	"-w" "$PWD"
+)
+
+[[ -t 1 ]] && PODMAN_ARGS+=("-t")
+
+if ! podman image exists "$CONTAINER_IMAGE"; then
+    #attempt to build container
+    "$CONTAINER_TOOLS_BASEDIR/build-esp-plant-dev-tools.sh" 1>&2 ||
+        _fatal "faild to build local image, cannot continue! … please ensure you have an internet connection"
+fi
+
+podman run "${PODMAN_ARGS[@]}" --entrypoint riscv-none-elf-gcc "$CONTAINER_IMAGE" "$@"

board/modules/Sensors_simplified/Sensors/Sensors.kicad_pro

@@ -460,6 +460,7 @@
       "single_global_label": "ignore",
       "unannotated": "error",
       "unconnected_wire_endpoint": "warning",
+      "undefined_netclass": "error",
       "unit_value_mismatch": "error",
       "unresolved_variable": "error",
       "wire_dangling": "error"

rust/.cargo/config.toml

@@ -1,26 +1,32 @@
 [build]
-#target = "xtensa-esp32-espidf"
+rustflags = [
-target = "riscv32imac-esp-espidf"
+    # Required to obtain backtraces (e.g. when using the "esp-backtrace" crate.)
+    # NOTE: May negatively impact performance of produced code
+    "-C", "force-frame-pointers",
+    "-Z", "stack-protector=all",
+    "-C", "link-arg=-Tlinkall.x",
+]
 
-[target.riscv32imac-esp-espidf]
+target = "riscv32imac-unknown-none-elf"
-linker = "ldproxy"
+
+[target.riscv32imac-unknown-none-elf]
+runner = "espflash flash --monitor --chip esp32c6 --baud 921600 --partition-table partitions.csv"
 #runner = "espflash flash --monitor --baud 921600 --partition-table partitions.csv -b no-reset" # Select this runner in case of usb ttl
-runner = "espflash flash --monitor"
+#runner = "espflash flash --monitor"
 #runner = "cargo runner"
 
 
 #runner = "espflash flash --monitor --partition-table partitions.csv -b no-reset" # create upgrade image file for webupload
 # runner = espflash erase-parts otadata  //ensure flash is clean
 
-rustflags = ["--cfg", "espidf_time64"] # Extending time_t for ESP IDF 5: https://github.com/esp-rs/rust/issues/110
-
-[unstable]
-build-std = ["std", "panic_abort"]
-
 [env]
-MCU = "esp32c6"
-# Note: this variable is not used by the pio builder (`cargo build --features pio`)
-ESP_IDF_VERSION = "v5.2.1"
 CHRONO_TZ_TIMEZONE_FILTER = "UTC|America/New_York|America/Chicago|America/Los_Angeles|Europe/London|Europe/Berlin|Europe/Paris|Asia/Tokyo|Asia/Shanghai|Asia/Kolkata|Australia/Sydney|America/Sao_Paulo|Africa/Johannesburg|Asia/Dubai|Pacific/Auckland"
 CARGO_WORKSPACE_DIR = { value = "", relative = true }
-RUST_BACKTRACE = "full"
+ESP_LOG = "info"
+PATH = { value = "../bin:/usr/bin:/usr/local/bin", force = true, relative = true }
+
+
+
+[unstable]
+build-std = ["alloc", "core"]
+

rust/Cargo.toml

@@ -1,21 +1,17 @@
 [package]
-name = "plant-ctrl2"
-version = "0.1.0"
-authors = ["Empire Phoenix"]
 edition = "2021"
-resolver = "2"
+name = "plant-ctrl2"
-#rust-version = "1.71"
+rust-version = "1.86"
-
+version = "0.1.0"
-[profile.dev]
-# Explicitly disable LTO which the Xtensa codegen backend has issues
-lto = false
-strip = false
-debug = true
-overflow-checks = true
-panic = "abort"
-incremental = true
-opt-level = 2
 
+# Explicitly configure the binary target and disable building it as a test/bench.
+[[bin]]
+name = "plant-ctrl2"
+path = "src/main.rs"
+# Prevent IDEs/Cargo from trying to compile a test harness for this no_std binary.
+test = false
+bench = false
+doc = false
 
 [package.metadata.cargo_runner]
 # The string `$TARGET_FILE` will be replaced with the path from cargo.
@@ -31,73 +27,127 @@ command = [
 ]
 
 
+lto = "fat"
+strip = true
+debug = false
+overflow-checks = true
+panic = "abort"
+incremental = true
+opt-level = "z"
+
+
 [package.metadata.espflash]
 partition_table = "partitions.csv"
 
-[features]
-default = ["std", "esp-idf-svc/native"]
-pio = ["esp-idf-svc/pio"]
-std = ["alloc", "esp-idf-svc/binstart", "esp-idf-svc/std"]
-alloc = ["esp-idf-svc/alloc"]
-nightly = ["esp-idf-svc/nightly"]
-experimental = ["esp-idf-svc/experimental"]
-#embassy = ["esp-idf-svc/embassy-sync", "esp-idf-svc/critical-section", "esp-idf-svc/embassy-time-driver"]
-
 [dependencies]
 #ESP stuff
-embedded-svc = { version = "0.28.1", features = ["experimental"] }
+esp-bootloader-esp-idf = { version = "0.2.0", features = ["esp32c6"] }
-esp-idf-hal = "0.45.2"
+esp-hal = { version = "=1.0.0-rc.0", features = [
-esp-idf-sys = { version = "0.36.1", features = ["binstart", "native"] }
+    "esp32c6",
-esp-idf-svc = { version = "0.51.0", default-features = false }
+    "log-04",
+    "unstable",
+    "rt"
+] }
+log = "0.4.27"
+
+embassy-net = { version = "0.7.1", default-features = false, features = [
+    "dhcpv4",
+    "log",
+    "medium-ethernet",
+    "tcp",
+    "udp",
+] }
+embedded-io = "0.6.1"
+embedded-io-async = "0.6.1"
+esp-alloc = "0.8.0"
+esp-backtrace = { version = "0.17.0", features = [
+    "esp32c6",
+    "exception-handler",
+    "panic-handler",
+    "println",
+    "colors",
+    "custom-halt"
+] }
+esp-println = { version = "0.15.0", features = ["esp32c6", "log-04"] }
+# for more networking protocol support see https://crates.io/crates/edge-net
+embassy-executor = { version = "0.7.0", features = [
+    "log",
+    "task-arena-size-64",
+    "nightly"
+] }
+embassy-time = { version = "0.5.0", features = ["log"], default-features = false }
+esp-hal-embassy = { version = "0.9.0", features = ["esp32c6", "log-04"] }
+esp-storage = { version = "0.7.0", features = ["esp32c6"] }
+
+esp-wifi = { version = "0.15.0", features = [
+    "builtin-scheduler",
+    "esp-alloc",
+    "esp32c6",
+    "log-04",
+    "smoltcp",
+    "wifi",
+] }
+smoltcp = { version = "0.12.0", default-features = false, features = [
+    "alloc",
+    "log",
+    "medium-ethernet",
+    "multicast",
+    "proto-dhcpv4",
+    "proto-dns",
+    "proto-ipv4",
+    "socket-dns",
+    "socket-icmp",
+    "socket-raw",
+    "socket-tcp",
+    "socket-udp",
+] }
+#static_cell = "2.1.1"
 embedded-hal = "1.0.0"
 heapless = { version = "0.8", features = ["serde"] }
-embedded-hal-bus = { version = "0.3.0", features = ["std"] }
+embedded-hal-bus = { version = "0.3.0" }
 
 #Hardware additional driver
-ds18b20 = "0.1.1"
+
-bq34z100 = { version = "0.3.0", features = ["flashstream"] }
+#bq34z100 = { version = "0.3.0", default-features = false }
-one-wire-bus = "0.1.1"
+onewire = "0.4.0"
+#strum = { version = "0.27.0", default-feature = false, features = ["derive"] }
+measurements = "0.11.0"
 ds323x = "0.6.0"
 
-#pure code dependencies
-once_cell = "1.19.0"
-anyhow = { version = "1.0.75", features = ["std", "backtrace"] }
-strum = { version = "0.27.0", features = ["derive"] }
-measurements = "0.11.0"
-
 #json
-serde = { version = "1.0.192", features = ["derive"] }
+serde = { version = "1.0.219", features = ["derive", "alloc"], default-features = false }
-serde_json = "1.0.108"
+serde_json = { version = "1.0.143", default-features = false, features = ["alloc"] }
 
 #timezone
-
+chrono = { version = "0.4.42", default-features = false, features = ["iana-time-zone", "alloc", "serde"] }
-chrono = { version = "0.4.23", default-features = false, features = ["iana-time-zone", "alloc", "serde"] }
+chrono-tz = { version = "0.10.4", default-features = false, features = ["filter-by-regex"] }
-chrono-tz = { version = "0.10.3", default-features = false, features = ["filter-by-regex"] }
 eeprom24x = "0.7.2"
-url = "2.5.3"
 crc = "3.2.1"
-bincode = "2.0.1"
-ringbuffer = "0.15.0"
-text-template = "0.1.0"
 strum_macros = "0.27.0"
-esp-ota = { version = "0.2.2", features = ["log"] }
 unit-enum = "1.4.1"
-pca9535 = { version = "2.0.0", features = ["std"] }
+pca9535 = { version = "2.0.0" }
-ina219 = { version = "0.2.0", features = ["std"] }
+ina219 = { version = "0.2.0" }
 embedded-storage = "=0.3.1"
 ekv = "1.0.0"
 embedded-can = "0.4.1"
-
+portable-atomic = "1.11.1"
+embassy-sync = { version = "0.7.2", features = ["log"] }
+async-trait = "0.1.89"
+bq34z100 = { version = "0.4.0", default-features = false }
+edge-dhcp = "0.6.0"
+edge-nal = "0.5.0"
+edge-nal-embassy = "0.6.0"
+static_cell = "2.1.1"
+edge-http = { version = "0.6.1", features = ["log"] }
+littlefs2 = { version = "0.6.1", features = ["c-stubs", "alloc"] }
+littlefs2-core = "0.1.1"
+bytemuck = { version = "1.23.2", features = ["derive", "min_const_generics", "pod_saturating", "extern_crate_alloc"] }
+deranged = "0.5.3"
+embassy-embedded-hal = "0.5.0"
+bincode = { version = "2.0.1", default-features = false, features = ["derive"] }
 
 [patch.crates-io]
-#esp-idf-hal = { git = "https://github.com/esp-rs/esp-idf-hal.git" }
-#esp-idf-hal = { git = "https://github.com/empirephoenix/esp-idf-hal.git" }
-#esp-idf-sys = { git = "https://github.com/empirephoenix/esp-idf-sys.git" }
-#esp-idf-sys = { git = "https://github.com/esp-rs/esp-idf-sys.git" }
-#esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc.git" }
 #bq34z100 = { path = "../../bq34z100_rust" }
 
 [build-dependencies]
-cc = "=1.1.30"
-embuild = { version = "0.32.0", features = ["espidf"] }
 vergen = { version = "8.2.6", features = ["build", "git", "gitcl"] }

rust/build.rs

@@ -1,10 +1,67 @@
-use std::process::Command;
+use std::{collections::VecDeque, env, process::Command};
 
 use vergen::EmitBuilder;
+
+fn linker_be_nice() {
+    let args: Vec<String> = std::env::args().collect();
+    if args.len() > 1 {
+        let kind = &args[1];
+        let what = &args[2];
+
+        match kind.as_str() {
+            "undefined-symbol" => match what.as_str() {
+                "_defmt_timestamp" => {
+                    eprintln!();
+                    eprintln!("💡 `defmt` not found - make sure `defmt.x` is added as a linker script and you have included `use defmt_rtt as _;`");
+                    eprintln!();
+                }
+                "_stack_start" => {
+                    eprintln!();
+                    eprintln!("💡 Is the linker script `linkall.x` missing?");
+                    eprintln!();
+                }
+                "esp_wifi_preempt_enable"
+                | "esp_wifi_preempt_yield_task"
+                | "esp_wifi_preempt_task_create" => {
+                    eprintln!();
+                    eprintln!("💡 `esp-wifi` has no scheduler enabled. Make sure you have the `builtin-scheduler` feature enabled, or that you provide an external scheduler.");
+                    eprintln!();
+                }
+                "embedded_test_linker_file_not_added_to_rustflags" => {
+                    eprintln!();
+                    eprintln!("💡 `embedded-test` not found - make sure `embedded-test.x` is added as a linker script for tests");
+                    eprintln!();
+                }
+                _ => (),
+            },
+            // we don't have anything helpful for "missing-lib" yet
+            _ => {
+                std::process::exit(1);
+            }
+        }
+
+        std::process::exit(0);
+    }
+
+    println!(
+        "cargo:rustc-link-arg=--error-handling-script={}",
+        std::env::current_exe().unwrap().display()
+    );
+}
+
 fn main() {
-    println!("cargo:rerun-if-changed=./src/src_webpack");
+    if Command::new("podman").arg("--version").output().is_err() {
+        println!("Could not find `podman` installation, assuming the developer has setup all required tool for build manually! … ")
+    }
+    webpack();
+    linker_be_nice();
+    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")
+        .arg("./src/webserver/bundle.js.gz")
         .output()
         .unwrap();
 
@@ -27,14 +84,14 @@ fn main() {
             let _ = Command::new("cmd")
                 .arg("/K")
                 .arg("move")
-                .arg("./src_webpack/bundle.js")
+                .arg("./src_webpack/bundle.js.gz")
                 .arg("./src/webserver")
                 .output()
                 .unwrap();
             let _ = Command::new("cmd")
                 .arg("/K")
                 .arg("move")
-                .arg("./src_webpack/index.html")
+                .arg("./src_webpack/index.html.gz")
                 .arg("./src/webserver")
                 .output()
                 .unwrap();
@@ -53,18 +110,15 @@ fn main() {
 
             // move webpack results to rust webserver src
             let _ = Command::new("mv")
-                .arg("./src_webpack/bundle.js")
+                .arg("./src_webpack/bundle.js.gz")
                 .arg("./src/webserver")
                 .output()
                 .unwrap();
             let _ = Command::new("mv")
-                .arg("./src_webpack/index.html")
+                .arg("./src_webpack/index.html.gz")
                 .arg("./src/webserver")
                 .output()
                 .unwrap();
         }
     }
-
-    embuild::espidf::sysenv::output();
-    let _ = EmitBuilder::builder().all_git().all_build().emit();
 }

rust/espflash.toml

@@ -1,5 +1,8 @@
-partition_table = "partitions.csv"
 [connection]
-serial = "/dev/ttyACM0"
+
+[[usb_device]]
+vid = "303a"
+pid = "1001"
+
 [flash]
-size = "16MB"
+size = "16MB"

rust/partitions.csv

@@ -3,4 +3,4 @@ otadata,  data, ota,     ,        8k,
 phy_init, data, phy,     ,        4k,
 ota_0,    app,  ota_0,   ,        3968k,
 ota_1,    app,  ota_1,   ,        3968k,
-storage,  data, spiffs,  ,        8M,
+storage,  data, littlefs,,        8M,

rust/rust-toolchain.toml

@@ -1,3 +1,2 @@
 [toolchain]
 channel = "nightly"
-toolchain = "esp"

rust/scratch/v3_hal.rs

@@ -10,14 +10,12 @@ use crate::{
 };
 use anyhow::{bail, Ok, Result};
 use embedded_hal::digital::OutputPin;
-use esp_idf_hal::{
-    gpio::{AnyInputPin, IOPin, InputOutput, PinDriver, Pull},
-    pcnt::{PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex},
-};
-use esp_idf_sys::{gpio_hold_dis, gpio_hold_en};
 use measurements::{Current, Voltage};
 use plant_ctrl2::sipo::ShiftRegister40;
-use std::result::Result::Ok as OkStd;
+use core::result::Result::Ok as OkStd;
+use alloc::string::ToString;
+use alloc::boxed::Box;
+use esp_hall::gpio::Pull;
 
 const PUMP8_BIT: usize = 0;
 const PUMP1_BIT: usize = 1;
@@ -94,7 +92,7 @@ pub(crate) fn create_v3(
     battery_monitor: Box<dyn BatteryInteraction + Send>,
     rtc_module: Box<dyn RTCModuleInteraction + Send>,
 ) -> Result<Box<dyn BoardInteraction<'static> + Send>> {
-    println!("Start v3");
+    log::info!("Start v3");
     let mut clock = PinDriver::input_output(peripherals.gpio15.downgrade())?;
     clock.set_pull(Pull::Floating)?;
     let mut latch = PinDriver::input_output(peripherals.gpio3.downgrade())?;
@@ -210,7 +208,7 @@ impl<'a> BoardInteraction<'a> for V3<'a> {
         &self.config
     }
 
-    fn get_battery_monitor(&mut self) -> &mut Box<(dyn BatteryInteraction + Send + 'static)> {
+    fn get_battery_monitor(&mut self) -> &mut Box<dyn BatteryInteraction + Send + 'static> {
         &mut self.battery_monitor
     }
 

rust/src/config.rs

@@ -1,7 +1,8 @@
+use alloc::string::String;
+use core::str::FromStr;
 use crate::hal::PLANT_COUNT;
 use crate::plant_state::PlantWateringMode;
 use serde::{Deserialize, Serialize};
-use std::str::FromStr;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 #[serde(default)]
@@ -11,6 +12,8 @@ pub struct NetworkConfig {
     pub password: Option<heapless::String<64>>,
     pub mqtt_url: Option<heapless::String<128>>,
     pub base_topic: Option<heapless::String<64>>,
+    pub mqtt_user: Option<heapless::String<32>>,
+    pub mqtt_password: Option<heapless::String<64>>,
     pub max_wait: u32,
 }
 impl Default for NetworkConfig {
@@ -21,6 +24,8 @@ impl Default for NetworkConfig {
             password: None,
             mqtt_url: None,
             base_topic: None,
+            mqtt_user: None,
+            mqtt_password: None,
             max_wait: 10000,
         }
     }

rust/src/fat_error.rs

@@ -0,0 +1,259 @@
+use alloc::format;
+use alloc::string::{String, ToString};
+use core::convert::Infallible;
+use core::fmt;
+use core::str::Utf8Error;
+use embassy_embedded_hal::shared_bus::I2cDeviceError;
+use embassy_executor::SpawnError;
+use embassy_sync::mutex::TryLockError;
+use esp_hal::i2c::master::ConfigError;
+use esp_wifi::wifi::WifiError;
+use ina219::errors::{BusVoltageReadError, ShuntVoltageReadError};
+use littlefs2_core::PathError;
+use onewire::Error;
+use pca9535::ExpanderError;
+
+//All error superconstruct
+#[derive(Debug)]
+pub enum FatError {
+    OneWireError {
+        error: Error<Infallible>,
+    },
+    String {
+        error: String,
+    },
+    LittleFSError {
+        error: littlefs2_core::Error,
+    },
+    PathError {
+        error: PathError,
+    },
+    TryLockError {
+        error: TryLockError,
+    },
+    WifiError {
+        error: WifiError,
+    },
+    SerdeError {
+        error: serde_json::Error,
+    },
+    PreconditionFailed {
+        error: String,
+    },
+    NoBatteryMonitor,
+    SpawnError {
+        error: SpawnError,
+    },
+    PartitionError {
+        error: esp_bootloader_esp_idf::partitions::Error,
+    },
+    I2CConfigError {
+        error: ConfigError,
+    },
+    DS323 {
+        error: String,
+    },
+    Eeprom24x {
+        error: String,
+    },
+    ExpanderError {
+        error: String,
+    },
+}
+
+pub type FatResult<T> = Result<T, FatError>;
+
+impl fmt::Display for FatError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FatError::SpawnError { error } => {
+                write!(f, "SpawnError {:?}", error.to_string())
+            }
+            FatError::OneWireError { error } => write!(f, "OneWireError {:?}", error),
+            FatError::String { error } => write!(f, "{}", error),
+            FatError::LittleFSError { error } => write!(f, "LittleFSError {:?}", error),
+            FatError::PathError { error } => write!(f, "PathError {:?}", error),
+            FatError::TryLockError { error } => write!(f, "TryLockError {:?}", error),
+            FatError::WifiError { error } => write!(f, "WifiError {:?}", error),
+            FatError::SerdeError { error } => write!(f, "SerdeError {:?}", error),
+            FatError::PreconditionFailed { error } => write!(f, "PreconditionFailed {:?}", error),
+            FatError::PartitionError { error } => {
+                write!(f, "PartitionError {:?}", error)
+            }
+            FatError::NoBatteryMonitor => {
+                write!(f, "No Battery Monitor")
+            }
+            FatError::I2CConfigError { error } => write!(f, "I2CConfigError {:?}", error),
+            FatError::DS323 { error } => write!(f, "DS323 {:?}", error),
+            FatError::Eeprom24x { error } => write!(f, "Eeprom24x {:?}", error),
+            FatError::ExpanderError { error } => write!(f, "ExpanderError {:?}", error),
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! bail {
+    ($msg:literal $(,)?) => {
+        return $crate::fat_error::fat_bail($msg)
+    };
+    ($fmt:literal, $($arg:tt)*) => {
+        return $crate::fat_error::fat_bail(&alloc::format!($fmt, $($arg)*))
+    };
+}
+
+pub fn fat_bail<X>(message: &str) -> Result<X, FatError> {
+    Err(FatError::String {
+        error: message.to_string(),
+    })
+}
+
+pub trait ContextExt<T> {
+    fn context<C>(self, context: C) -> Result<T, FatError>
+    where
+        C: AsRef<str>;
+}
+impl<T> ContextExt<T> for Option<T> {
+    fn context<C>(self, context: C) -> Result<T, FatError>
+    where
+        C: AsRef<str>,
+    {
+        match self {
+            Some(value) => Ok(value),
+            None => Err(FatError::PreconditionFailed {
+                error: context.as_ref().to_string(),
+            }),
+        }
+    }
+}
+
+impl From<Error<Infallible>> for FatError {
+    fn from(error: Error<Infallible>) -> Self {
+        FatError::OneWireError { error }
+    }
+}
+impl From<littlefs2_core::Error> for FatError {
+    fn from(value: littlefs2_core::Error) -> Self {
+        FatError::LittleFSError { error: value }
+    }
+}
+
+impl From<PathError> for FatError {
+    fn from(value: PathError) -> Self {
+        FatError::PathError { error: value }
+    }
+}
+
+impl From<TryLockError> for FatError {
+    fn from(value: TryLockError) -> Self {
+        FatError::TryLockError { error: value }
+    }
+}
+
+impl From<WifiError> for FatError {
+    fn from(value: WifiError) -> Self {
+        FatError::WifiError { error: value }
+    }
+}
+
+impl From<serde_json::error::Error> for FatError {
+    fn from(value: serde_json::Error) -> Self {
+        FatError::SerdeError { error: value }
+    }
+}
+
+impl From<SpawnError> for FatError {
+    fn from(value: SpawnError) -> Self {
+        FatError::SpawnError { error: value }
+    }
+}
+
+impl From<esp_bootloader_esp_idf::partitions::Error> for FatError {
+    fn from(value: esp_bootloader_esp_idf::partitions::Error) -> Self {
+        FatError::PartitionError { error: value }
+    }
+}
+
+impl From<Utf8Error> for FatError {
+    fn from(value: Utf8Error) -> Self {
+        FatError::String {
+            error: value.to_string(),
+        }
+    }
+}
+
+impl<E: core::fmt::Debug> From<edge_http::io::Error<E>> for FatError {
+    fn from(value: edge_http::io::Error<E>) -> Self {
+        FatError::String {
+            error: format!("{:?}", value),
+        }
+    }
+}
+
+impl<E: core::fmt::Debug> From<ds323x::Error<E>> for FatError {
+    fn from(value: ds323x::Error<E>) -> Self {
+        FatError::DS323 {
+            error: format!("{:?}", value),
+        }
+    }
+}
+
+impl<E: core::fmt::Debug> From<eeprom24x::Error<E>> for FatError {
+    fn from(value: eeprom24x::Error<E>) -> Self {
+        FatError::Eeprom24x {
+            error: format!("{:?}", value),
+        }
+    }
+}
+
+impl<E: core::fmt::Debug> From<ExpanderError<I2cDeviceError<E>>> for FatError {
+    fn from(value: ExpanderError<I2cDeviceError<E>>) -> Self {
+        FatError::ExpanderError {
+            error: format!("{:?}", value),
+        }
+    }
+}
+
+impl From<bincode::error::DecodeError> for FatError {
+    fn from(value: bincode::error::DecodeError) -> Self {
+        FatError::Eeprom24x {
+            error: format!("{:?}", value),
+        }
+    }
+}
+
+impl From<bincode::error::EncodeError> for FatError {
+    fn from(value: bincode::error::EncodeError) -> Self {
+        FatError::Eeprom24x {
+            error: format!("{:?}", value),
+        }
+    }
+}
+
+impl From<ConfigError> for FatError {
+    fn from(value: ConfigError) -> Self {
+        FatError::I2CConfigError { error: value }
+    }
+}
+
+impl<E: core::fmt::Debug> From<I2cDeviceError<E>> for FatError {
+    fn from(value: I2cDeviceError<E>) -> Self {
+        FatError::String {
+            error: format!("{:?}", value),
+        }
+    }
+}
+
+impl<E: core::fmt::Debug> From<BusVoltageReadError<I2cDeviceError<E>>> for FatError {
+    fn from(value: BusVoltageReadError<I2cDeviceError<E>>) -> Self {
+        FatError::String {
+            error: format!("{:?}", value),
+        }
+    }
+}
+impl<E: core::fmt::Debug> From<ShuntVoltageReadError<I2cDeviceError<E>>> for FatError {
+    fn from(value: ShuntVoltageReadError<I2cDeviceError<E>>) -> Self {
+        FatError::String {
+            error: format!("{:?}", value),
+        }
+    }
+}

rust/src/hal/battery.rs

@@ -1,22 +1,28 @@
-use anyhow::anyhow;
+use crate::hal::Box;
-use bq34z100::{Bq34Z100Error, Bq34z100g1, Bq34z100g1Driver};
+use crate::fat_error::{FatError, FatResult};
-use embedded_hal_bus::i2c::MutexDevice;
+use alloc::string::String;
-use esp_idf_hal::delay::Delay;
+use async_trait::async_trait;
-use esp_idf_hal::i2c::{I2cDriver, I2cError};
+use bq34z100::{Bq34z100g1, Bq34z100g1Driver, Flags};
+use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
+use esp_hal::delay::Delay;
+use esp_hal::i2c::master::I2c;
+use esp_hal::Blocking;
 use measurements::Temperature;
 use serde::Serialize;
 
+#[async_trait]
 pub trait BatteryInteraction {
-    fn state_charge_percent(&mut self) -> Result<f32, BatteryError>;
+    async fn state_charge_percent(&mut self) -> FatResult<f32>;
-    fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>;
+    async fn remaining_milli_ampere_hour(&mut self) -> FatResult<u16>;
-    fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>;
+    async fn max_milli_ampere_hour(&mut self) -> FatResult<u16>;
-    fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>;
+    async fn design_milli_ampere_hour(&mut self) -> FatResult<u16>;
-    fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError>;
+    async fn voltage_milli_volt(&mut self) -> FatResult<u16>;
-    fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError>;
+    async fn average_current_milli_ampere(&mut self) -> FatResult<i16>;
-    fn cycle_count(&mut self) -> Result<u16, BatteryError>;
+    async fn cycle_count(&mut self) -> FatResult<u16>;
-    fn state_health_percent(&mut self) -> Result<u16, BatteryError>;
+    async fn state_health_percent(&mut self) -> FatResult<u16>;
-    fn bat_temperature(&mut self) -> Result<u16, BatteryError>;
+    async fn bat_temperature(&mut self) -> FatResult<u16>;
-    fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError>;
+    async fn get_battery_state(&mut self) -> FatResult<BatteryState>;
 }
 
 #[derive(Debug, Serialize)]
@@ -37,13 +43,13 @@ pub enum BatteryError {
     CommunicationError(String),
 }
 
-impl From<Bq34Z100Error<esp_idf_hal::i2c::I2cError>> for BatteryError {
+// impl From<Bq34Z100Error<esp_idf_hal::i2c::I2cError>> for BatteryError {
-    fn from(err: Bq34Z100Error<esp_idf_hal::i2c::I2cError>) -> Self {
+//     fn from(err: Bq34Z100Error<esp_idf_hal::i2c::I2cError>) -> Self {
-        BatteryError::CommunicationError(
+//         BatteryError::CommunicationError(
-            anyhow!("failed to communicate with battery monitor: {:?}", err).to_string(),
+//             anyhow!("failed to communicate with battery monitor: {:?}", err).to_string(),
-        )
+//         )
-    }
+//     }
-}
+// }
 
 #[derive(Debug, Serialize)]
 pub enum BatteryState {
@@ -53,45 +59,45 @@ pub enum BatteryState {
 
 /// If no battery monitor is installed this implementation will be used
 pub struct NoBatteryMonitor {}
-
+#[async_trait]
 impl BatteryInteraction for NoBatteryMonitor {
-    fn state_charge_percent(&mut self) -> Result<f32, BatteryError> {
+    async fn state_charge_percent(&mut self) -> FatResult<f32> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
+    async fn remaining_milli_ampere_hour(&mut self) -> FatResult<u16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
+    async fn max_milli_ampere_hour(&mut self) -> FatResult<u16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
+    async fn design_milli_ampere_hour(&mut self) -> FatResult<u16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError> {
+    async fn voltage_milli_volt(&mut self) -> FatResult<u16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError> {
+    async fn average_current_milli_ampere(&mut self) -> FatResult<i16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn cycle_count(&mut self) -> Result<u16, BatteryError> {
+    async fn cycle_count(&mut self) -> FatResult<u16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn state_health_percent(&mut self) -> Result<u16, BatteryError> {
+    async fn state_health_percent(&mut self) -> FatResult<u16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn bat_temperature(&mut self) -> Result<u16, BatteryError> {
+    async fn bat_temperature(&mut self) -> FatResult<u16> {
-        Err(BatteryError::NoBatteryMonitor)
+        Err(FatError::NoBatteryMonitor)
     }
 
-    fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError> {
+    async fn get_battery_state(&mut self) -> FatResult<BatteryState> {
         Ok(BatteryState::Unknown)
     }
 }
@@ -100,115 +106,167 @@ impl BatteryInteraction for NoBatteryMonitor {
 #[allow(dead_code)]
 pub struct WchI2cSlave {}
 
-pub struct BQ34Z100G1<'a> {
+pub type I2cDev = I2cDevice<'static, CriticalSectionRawMutex, I2c<'static, Blocking>>;
-    pub battery_driver: Bq34z100g1Driver<MutexDevice<'a, I2cDriver<'a>>, Delay>,
+
+pub struct BQ34Z100G1 {
+    pub battery_driver: Bq34z100g1Driver<I2cDev, Delay>,
 }
 
-impl BatteryInteraction for BQ34Z100G1<'_> {
+#[async_trait]
-    fn state_charge_percent(&mut self) -> Result<f32, BatteryError> {
+impl BatteryInteraction for BQ34Z100G1 {
-        Ok(self.battery_driver.state_of_charge().map(f32::from)?)
+    async fn state_charge_percent(&mut self) -> FatResult<f32> {
+        self.battery_driver
+            .state_of_charge()
+            .map(|v| v as f32)
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
+    async fn remaining_milli_ampere_hour(&mut self) -> FatResult<u16> {
-        Ok(self.battery_driver.remaining_capacity()?)
+        self.battery_driver
+            .remaining_capacity()
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
+    async fn max_milli_ampere_hour(&mut self) -> FatResult<u16> {
-        Ok(self.battery_driver.full_charge_capacity()?)
+        self.battery_driver
+            .full_charge_capacity()
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
+    async fn design_milli_ampere_hour(&mut self) -> FatResult<u16> {
-        Ok(self.battery_driver.design_capacity()?)
+        self.battery_driver
+            .design_capacity()
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError> {
+    async fn voltage_milli_volt(&mut self) -> FatResult<u16> {
-        Ok(self.battery_driver.voltage()?)
+        self.battery_driver.voltage().map_err(|e| FatError::String {
+            error: alloc::format!("{:?}", e),
+        })
     }
 
-    fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError> {
+    async fn average_current_milli_ampere(&mut self) -> FatResult<i16> {
-        Ok(self.battery_driver.average_current()?)
+        self.battery_driver
+            .average_current()
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn cycle_count(&mut self) -> Result<u16, BatteryError> {
+    async fn cycle_count(&mut self) -> FatResult<u16> {
-        Ok(self.battery_driver.cycle_count()?)
+        self.battery_driver
+            .cycle_count()
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn state_health_percent(&mut self) -> Result<u16, BatteryError> {
+    async fn state_health_percent(&mut self) -> FatResult<u16> {
-        Ok(self.battery_driver.state_of_health()?)
+        self.battery_driver
+            .state_of_health()
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn bat_temperature(&mut self) -> Result<u16, BatteryError> {
+    async fn bat_temperature(&mut self) -> FatResult<u16> {
-        Ok(self.battery_driver.temperature()?)
+        self.battery_driver
+            .temperature()
+            .map_err(|e| FatError::String {
+                error: alloc::format!("{:?}", e),
+            })
     }
 
-    fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError> {
+    async fn get_battery_state(&mut self) -> FatResult<BatteryState> {
         Ok(BatteryState::Info(BatteryInfo {
-            voltage_milli_volt: self.voltage_milli_volt()?,
+            voltage_milli_volt: self.voltage_milli_volt().await?,
-            average_current_milli_ampere: self.average_current_milli_ampere()?,
+            average_current_milli_ampere: self.average_current_milli_ampere().await?,
-            cycle_count: self.cycle_count()?,
+            cycle_count: self.cycle_count().await?,
-            design_milli_ampere_hour: self.design_milli_ampere_hour()?,
+            design_milli_ampere_hour: self.design_milli_ampere_hour().await?,
-            remaining_milli_ampere_hour: self.remaining_milli_ampere_hour()?,
+            remaining_milli_ampere_hour: self.remaining_milli_ampere_hour().await?,
-            state_of_charge: self.state_charge_percent()?,
+            state_of_charge: self.state_charge_percent().await?,
-            state_of_health: self.state_health_percent()?,
+            state_of_health: self.state_health_percent().await?,
-            temperature: self.bat_temperature()?,
+            temperature: self.bat_temperature().await?,
         }))
     }
 }
 
 pub fn print_battery_bq34z100(
-    battery_driver: &mut Bq34z100g1Driver<MutexDevice<I2cDriver<'_>>, Delay>,
+    battery_driver: &mut Bq34z100g1Driver<I2cDevice<CriticalSectionRawMutex, I2c<Blocking>>, Delay>,
-) -> anyhow::Result<(), Bq34Z100Error<I2cError>> {
+) -> FatResult<()> {
-    println!("Try communicating with battery");
+    log::info!("Try communicating with battery");
     let fwversion = battery_driver.fw_version().unwrap_or_else(|e| {
-        println!("Firmware {:?}", e);
+        log::info!("Firmware {:?}", e);
         0
     });
-    println!("fw version is {}", fwversion);
+    log::info!("fw version is {}", fwversion);
 
     let design_capacity = battery_driver.design_capacity().unwrap_or_else(|e| {
-        println!("Design capacity {:?}", e);
+        log::info!("Design capacity {:?}", e);
         0
     });
-    println!("Design Capacity {}", design_capacity);
+    log::info!("Design Capacity {}", design_capacity);
     if design_capacity == 1000 {
-        println!("Still stock configuring battery, readouts are likely to be wrong!");
+        log::info!("Still stock configuring battery, readouts are likely to be wrong!");
     }
 
-    let flags = battery_driver.get_flags_decoded()?;
+    let flags = battery_driver.get_flags_decoded().unwrap_or(Flags {
-    println!("Flags {:?}", flags);
+        fast_charge_allowed: false,
+        full_chage: false,
+        charging_not_allowed: false,
+        charge_inhibit: false,
+        bat_low: false,
+        bat_high: false,
+        over_temp_discharge: false,
+        over_temp_charge: false,
+        discharge: false,
+        state_of_charge_f: false,
+        state_of_charge_1: false,
+        cf: false,
+        ocv_taken: false,
+    });
+    log::info!("Flags {:?}", flags);
 
     let chem_id = battery_driver.chem_id().unwrap_or_else(|e| {
-        println!("Chemid {:?}", e);
+        log::info!("Chemid {:?}", e);
         0
     });
 
     let bat_temp = battery_driver.internal_temperature().unwrap_or_else(|e| {
-        println!("Bat Temp {:?}", e);
+        log::info!("Bat Temp {:?}", e);
         0
     });
     let temp_c = Temperature::from_kelvin(bat_temp as f64 / 10_f64).as_celsius();
     let voltage = battery_driver.voltage().unwrap_or_else(|e| {
-        println!("Bat volt {:?}", e);
+        log::info!("Bat volt {:?}", e);
         0
     });
     let current = battery_driver.current().unwrap_or_else(|e| {
-        println!("Bat current {:?}", e);
+        log::info!("Bat current {:?}", e);
         0
     });
     let state = battery_driver.state_of_charge().unwrap_or_else(|e| {
-        println!("Bat Soc {:?}", e);
+        log::info!("Bat Soc {:?}", e);
         0
     });
     let charge_voltage = battery_driver.charge_voltage().unwrap_or_else(|e| {
-        println!("Bat Charge Volt {:?}", e);
+        log::info!("Bat Charge Volt {:?}", e);
         0
     });
     let charge_current = battery_driver.charge_current().unwrap_or_else(|e| {
-        println!("Bat Charge Current {:?}", e);
+        log::info!("Bat Charge Current {:?}", e);
         0
     });
-    println!("ChemId: {} Current voltage {} and current {} with charge {}% and temp {} CVolt: {} CCur {}", chem_id, voltage, current, state, temp_c, charge_voltage, charge_current);
+    log::info!("ChemId: {} Current voltage {} and current {} with charge {}% and temp {} CVolt: {} CCur {}", chem_id, voltage, current, state, temp_c, charge_voltage, charge_current);
     let _ = battery_driver.unsealed();
     let _ = battery_driver.it_enable();
-    anyhow::Result::Ok(())
+    Ok(())
 }

rust/src/hal/initial_hal.rs

@@ -1,64 +1,63 @@
+use crate::alloc::boxed::Box;
 use crate::hal::esp::Esp;
 use crate::hal::rtc::{BackupHeader, RTCModuleInteraction};
 use crate::hal::water::TankSensor;
-use crate::hal::{deep_sleep, BoardInteraction, FreePeripherals, Sensor};
+use crate::hal::{BoardInteraction, FreePeripherals, Sensor};
+use crate::fat_error::{FatError, FatResult};
 use crate::{
+    bail,
     config::PlantControllerConfig,
     hal::battery::{BatteryInteraction, NoBatteryMonitor},
 };
-use anyhow::{bail, Result};
+use async_trait::async_trait;
 use chrono::{DateTime, Utc};
-use embedded_hal::digital::OutputPin;
+use esp_hal::gpio::{Level, Output, OutputConfig};
-use esp_idf_hal::gpio::{IOPin, Pull};
-use esp_idf_hal::gpio::{InputOutput, PinDriver};
 use measurements::{Current, Voltage};
 
 pub struct Initial<'a> {
-    pub(crate) general_fault: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
+    pub(crate) general_fault: Output<'a>,
     pub(crate) esp: Esp<'a>,
     pub(crate) config: PlantControllerConfig,
     pub(crate) battery: Box<dyn BatteryInteraction + Send>,
     pub rtc: Box<dyn RTCModuleInteraction + Send>,
 }
 
-struct NoRTC {}
+pub(crate) struct NoRTC {}
 
+#[async_trait]
 impl RTCModuleInteraction for NoRTC {
-    fn get_backup_info(&mut self) -> Result<BackupHeader> {
+    async fn get_backup_info(&mut self) -> Result<BackupHeader, FatError> {
         bail!("Please configure board revision")
     }
 
-    fn get_backup_config(&mut self) -> Result<Vec<u8>> {
+    async fn get_backup_config(&mut self, _chunk: usize) -> FatResult<([u8; 32], usize, u16)> {
         bail!("Please configure board revision")
     }
 
-    fn backup_config(&mut self, _bytes: &[u8]) -> Result<()> {
+    async fn backup_config(&mut self, _offset: usize, _bytes: &[u8]) -> FatResult<()> {
         bail!("Please configure board revision")
     }
 
-    fn get_rtc_time(&mut self) -> Result<DateTime<Utc>> {
+    async fn backup_config_finalize(&mut self, _crc: u16, _length: usize) -> FatResult<()> {
         bail!("Please configure board revision")
     }
 
-    fn set_rtc_time(&mut self, _time: &DateTime<Utc>) -> Result<()> {
+    async fn get_rtc_time(&mut self) -> Result<DateTime<Utc>, FatError> {
+        bail!("Please configure board revision")
+    }
+
+    async fn set_rtc_time(&mut self, _time: &DateTime<Utc>) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 }
 
 pub(crate) fn create_initial_board(
-    free_pins: FreePeripherals,
+    free_pins: FreePeripherals<'static>,
-    fs_mount_error: bool,
     config: PlantControllerConfig,
     esp: Esp<'static>,
-) -> Result<Box<dyn BoardInteraction<'static> + Send>> {
+) -> Result<Box<dyn BoardInteraction<'static> + Send>, FatError> {
-    println!("Start initial");
+    log::info!("Start initial");
-    let mut general_fault = PinDriver::input_output(free_pins.gpio6.downgrade())?;
+    let general_fault = Output::new(free_pins.gpio23, Level::Low, OutputConfig::default());
-    general_fault.set_pull(Pull::Floating)?;
-    general_fault.set_low()?;
-
-    if fs_mount_error {
-        general_fault.set_high()?
-    }
     let v = Initial {
         general_fault,
         config,
@@ -69,9 +68,10 @@ pub(crate) fn create_initial_board(
     Ok(Box::new(v))
 }
 
+#[async_trait]
 impl<'a> BoardInteraction<'a> for Initial<'a> {
-    fn get_tank_sensor(&mut self) -> Option<&mut TankSensor<'a>> {
+    fn get_tank_sensor(&mut self) -> Result<&mut TankSensor<'a>, FatError> {
-        None
+        bail!("Please configure board revision")
     }
 
     fn get_esp(&mut self) -> &mut Esp<'a> {
@@ -90,55 +90,57 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
         &mut self.rtc
     }
 
-    fn set_charge_indicator(&mut self, _charging: bool) -> Result<()> {
+    fn set_charge_indicator(&mut self, _charging: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    fn deep_sleep(&mut self, duration_in_ms: u64) -> ! {
+    async fn deep_sleep(&mut self, duration_in_ms: u64) -> ! {
-        deep_sleep(duration_in_ms)
+        self.esp.deep_sleep(duration_in_ms).await;
     }
     fn is_day(&self) -> bool {
         false
     }
-    fn light(&mut self, _enable: bool) -> Result<()> {
+    async fn light(&mut self, _enable: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    fn pump(&mut self, _plant: usize, _enable: bool) -> Result<()> {
+    async fn pump(&mut self, _plant: usize, _enable: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    fn pump_current(&mut self, _plant: usize) -> Result<Current> {
+    async fn pump_current(&mut self, _plant: usize) -> Result<Current, FatError> {
         bail!("Please configure board revision")
     }
 
-    fn fault(&mut self, _plant: usize, _enable: bool) -> Result<()> {
+    async fn fault(&mut self, _plant: usize, _enable: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    fn measure_moisture_hz(&mut self, _plant: usize, _sensor: Sensor) -> Result<f32> {
+    async fn measure_moisture_hz(
+        &mut self,
+        _plant: usize,
+        _sensor: Sensor,
+    ) -> Result<f32, FatError> {
         bail!("Please configure board revision")
     }
 
-    fn general_fault(&mut self, enable: bool) {
+    async fn general_fault(&mut self, enable: bool) {
-        let _ = self.general_fault.set_state(enable.into());
+        self.general_fault.set_level(enable.into());
     }
 
-    fn test(&mut self) -> Result<()> {
+    async fn test(&mut self) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    fn set_config(&mut self, config: PlantControllerConfig) -> anyhow::Result<()> {
+    fn set_config(&mut self, config: PlantControllerConfig) {
         self.config = config;
-        self.esp.save_config(&self.config)?;
-        anyhow::Ok(())
     }
 
-    fn get_mptt_voltage(&mut self) -> Result<Voltage> {
+    async fn get_mptt_voltage(&mut self) -> Result<Voltage, FatError> {
         bail!("Please configure board revision")
     }
 
-    fn get_mptt_current(&mut self) -> Result<Current> {
+    async fn get_mptt_current(&mut self) -> Result<Current, FatError> {
         bail!("Please configure board revision")
     }
 }

rust/src/hal/little_fs2storage_adapter.rs

@@ -0,0 +1,63 @@
+use embedded_storage::{ReadStorage, Storage};
+use esp_bootloader_esp_idf::partitions::FlashRegion;
+use esp_storage::FlashStorage;
+use littlefs2::consts::U512 as lfsCache;
+use littlefs2::consts::U512 as lfsLookahead;
+use littlefs2::driver::Storage as lfs2Storage;
+use littlefs2::io::Error as lfs2Error;
+use littlefs2::io::Result as lfs2Result;
+use log::error;
+
+pub struct LittleFs2Filesystem {
+    pub(crate) storage: &'static mut FlashRegion<'static, FlashStorage>,
+}
+
+impl lfs2Storage for LittleFs2Filesystem {
+    const READ_SIZE: usize = 256;
+    const WRITE_SIZE: usize = 512;
+    const BLOCK_SIZE: usize = 512; //usually optimal for flash access
+    const BLOCK_COUNT: usize = 8 * 1024 * 1024 / 512; //8mb in 32kb blocks
+    const BLOCK_CYCLES: isize = 100;
+    type CACHE_SIZE = lfsCache;
+    type LOOKAHEAD_SIZE = lfsLookahead;
+
+    fn read(&mut self, off: usize, buf: &mut [u8]) -> lfs2Result<usize> {
+        let read_size: usize = Self::READ_SIZE;
+        assert_eq!(off % read_size, 0);
+        assert_eq!(buf.len() % read_size, 0);
+        match self.storage.read(off as u32, buf) {
+            Ok(..) => Ok(buf.len()),
+            Err(err) => {
+                error!("Littlefs2Filesystem read error: {:?}", err);
+                Err(lfs2Error::IO)
+            }
+        }
+    }
+
+    fn write(&mut self, off: usize, data: &[u8]) -> lfs2Result<usize> {
+        let write_size: usize = Self::WRITE_SIZE;
+        assert_eq!(off % write_size, 0);
+        assert_eq!(data.len() % write_size, 0);
+        match self.storage.write(off as u32, data) {
+            Ok(..) => Ok(data.len()),
+            Err(err) => {
+                error!("Littlefs2Filesystem write error: {:?}", err);
+                Err(lfs2Error::IO)
+            }
+        }
+    }
+
+    fn erase(&mut self, off: usize, len: usize) -> lfs2Result<usize> {
+        let block_size: usize = Self::BLOCK_SIZE;
+        debug_assert!(off % block_size == 0);
+        debug_assert!(len % block_size == 0);
+        //match self.storage.erase(off as u32, len as u32) {
+        //anyhow::Result::Ok(..) => lfs2Result::Ok(len),
+        //Err(err) => {
+        //error!("Littlefs2Filesystem erase error: {:?}", err);
+        //Err(lfs2Error::IO)
+        //    }
+        //}
+        lfs2Result::Ok(len)
+    }
+}

rust/src/hal/mod.rs

@@ -1,81 +1,120 @@
 pub(crate) mod battery;
-mod esp;
+pub mod esp;
 mod initial_hal;
-mod rtc;
+mod little_fs2storage_adapter;
-mod v3_hal;
+pub(crate) mod rtc;
 mod v4_hal;
-mod water;
 mod v4_sensor;
+mod water;
 
+use crate::alloc::string::ToString;
 use crate::hal::rtc::{DS3231Module, RTCModuleInteraction};
-use crate::hal::water::TankSensor;
+use esp_hal::peripherals::Peripherals;
+use esp_hal::peripherals::ADC1;
+use esp_hal::peripherals::APB_SARADC;
+use esp_hal::peripherals::GPIO0;
+use esp_hal::peripherals::GPIO1;
+use esp_hal::peripherals::GPIO10;
+use esp_hal::peripherals::GPIO11;
+use esp_hal::peripherals::GPIO12;
+use esp_hal::peripherals::GPIO13;
+use esp_hal::peripherals::GPIO14;
+use esp_hal::peripherals::GPIO15;
+use esp_hal::peripherals::GPIO16;
+use esp_hal::peripherals::GPIO17;
+use esp_hal::peripherals::GPIO18;
+use esp_hal::peripherals::GPIO2;
+use esp_hal::peripherals::GPIO21;
+use esp_hal::peripherals::GPIO22;
+use esp_hal::peripherals::GPIO23;
+use esp_hal::peripherals::GPIO24;
+use esp_hal::peripherals::GPIO25;
+use esp_hal::peripherals::GPIO26;
+use esp_hal::peripherals::GPIO27;
+use esp_hal::peripherals::GPIO28;
+use esp_hal::peripherals::GPIO29;
+use esp_hal::peripherals::GPIO3;
+use esp_hal::peripherals::GPIO30;
+use esp_hal::peripherals::GPIO4;
+use esp_hal::peripherals::GPIO5;
+use esp_hal::peripherals::GPIO6;
+use esp_hal::peripherals::GPIO7;
+use esp_hal::peripherals::GPIO8;
+use esp_hal::peripherals::PCNT;
+use esp_hal::peripherals::TWAI0;
+
 use crate::{
+    bail,
     config::{BatteryBoardVersion, BoardVersion, PlantControllerConfig},
     hal::{
-        battery::{print_battery_bq34z100, BatteryInteraction, NoBatteryMonitor},
+        battery::{BatteryInteraction, NoBatteryMonitor},
         esp::Esp,
     },
-    log::{log, LogMessage},
+    log::LogMessage,
+    BOARD_ACCESS,
 };
-use anyhow::{Ok, Result};
+use alloc::boxed::Box;
-use battery::BQ34Z100G1;
+use alloc::format;
+use alloc::sync::Arc;
+use async_trait::async_trait;
 use bq34z100::Bq34z100g1Driver;
+use chrono::{DateTime, FixedOffset, Utc};
+use core::cell::RefCell;
+use ds323x::ic::DS3231;
+use ds323x::interface::I2cInterface;
 use ds323x::{DateTimeAccess, Ds323x};
+use eeprom24x::addr_size::TwoBytes;
+use eeprom24x::page_size::B32;
+use eeprom24x::unique_serial::No;
 use eeprom24x::{Eeprom24x, SlaveAddr, Storage};
-use embedded_hal_bus::i2c::MutexDevice;
+use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
-use esp_idf_hal::pcnt::PCNT1;
+use embassy_executor::Spawner;
-use esp_idf_hal::{
+use embassy_sync::blocking_mutex::CriticalSectionMutex;
-    adc::ADC1,
+//use battery::BQ34Z100G1;
-    delay::Delay,
+//use bq34z100::Bq34z100g1Driver;
-    gpio::{
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-        Gpio0, Gpio1, Gpio10, Gpio11, Gpio12, Gpio13, Gpio14, Gpio15, Gpio16, Gpio17, Gpio18,
+use esp_bootloader_esp_idf::partitions::{
-        Gpio2, Gpio21, Gpio22, Gpio23, Gpio24, Gpio25, Gpio26, Gpio27, Gpio28, Gpio29, Gpio3,
+    AppPartitionSubType, DataPartitionSubType, FlashRegion, PartitionEntry,
-        Gpio30, Gpio4, Gpio5, Gpio6, Gpio7, Gpio8, IOPin, PinDriver, Pull,
-    },
-    i2c::{APBTickType, I2cConfig, I2cDriver},
-    pcnt::PCNT0,
-    prelude::Peripherals,
-    reset::ResetReason,
-    units::FromValueType,
 };
-use esp_idf_svc::{eventloop::EspSystemEventLoop, nvs::EspDefaultNvsPartition, wifi::EspWifi};
+use esp_hal::clock::CpuClock;
-use esp_idf_sys::{
+use esp_hal::gpio::{Input, InputConfig, Pull};
-    esp_deep_sleep, esp_restart, esp_sleep_enable_ext1_wakeup,
-    esp_sleep_ext1_wakeup_mode_t_ESP_EXT1_WAKEUP_ANY_LOW,
-};
-use esp_ota::mark_app_valid;
 use measurements::{Current, Voltage};
-use once_cell::sync::Lazy;
+
-use std::result::Result::Ok as OkStd;
+use crate::hal::battery::{print_battery_bq34z100, BQ34Z100G1};
-use std::sync::Mutex;
+use crate::hal::little_fs2storage_adapter::LittleFs2Filesystem;
-use std::time::Duration;
+use crate::hal::water::TankSensor;
-use esp_idf_hal::can::CAN;
+use crate::log::LOG_ACCESS;
-use esp_idf_hal::pcnt::PCNT1;
+use crate::fat_error::FatError;
+use embassy_sync::mutex::Mutex;
+use embassy_sync::once_lock::OnceLock;
+use esp_alloc as _;
+use esp_backtrace as _;
+use esp_bootloader_esp_idf::ota::Slot;
+use esp_hal::delay::Delay;
+use esp_hal::i2c::master::{BusTimeout, Config, I2c};
+use esp_hal::pcnt::unit::Unit;
+use esp_hal::pcnt::Pcnt;
+use esp_hal::rng::Rng;
+use esp_hal::rtc_cntl::{Rtc, SocResetReason};
+use esp_hal::system::reset_reason;
+use esp_hal::time::Rate;
+use esp_hal::timer::timg::TimerGroup;
+use esp_hal::Blocking;
+use esp_storage::FlashStorage;
+use esp_wifi::{init, EspWifiController};
+use littlefs2::fs::{Allocation, Filesystem as lfs2Filesystem};
+use littlefs2::object_safe::DynStorage;
+use log::{info, warn};
+
+pub static TIME_ACCESS: OnceLock<Rtc> = OnceLock::new();
 
 //Only support for 8 right now!
 pub const PLANT_COUNT: usize = 8;
 
 const TANK_MULTI_SAMPLE: usize = 11;
-
+pub static I2C_DRIVER: OnceLock<
-pub static I2C_DRIVER: Lazy<Mutex<I2cDriver<'static>>> = Lazy::new(PlantHal::create_i2c);
+    embassy_sync::blocking_mutex::Mutex<CriticalSectionRawMutex, RefCell<I2c<Blocking>>>,
-
+> = OnceLock::new();
-fn deep_sleep(duration_in_ms: u64) -> ! {
-    unsafe {
-        //if we don't do this here, we might just revert newly flashed firmware
-        mark_app_valid();
-        //allow early wakeup by pressing the boot button
-        if duration_in_ms == 0 {
-            esp_restart();
-        } else {
-            //configure gpio 1 to wakeup on low, reused boot button for this
-            esp_sleep_enable_ext1_wakeup(
-                0b10u64,
-                esp_sleep_ext1_wakeup_mode_t_ESP_EXT1_WAKEUP_ANY_LOW,
-            );
-            esp_deep_sleep(duration_in_ms);
-        }
-    };
-}
 
 #[derive(Debug, PartialEq)]
 pub enum Sensor {
@@ -89,205 +128,367 @@ pub struct HAL<'a> {
     pub board_hal: Box<dyn BoardInteraction<'a> + Send>,
 }
 
+#[async_trait]
 pub trait BoardInteraction<'a> {
-    fn get_tank_sensor(&mut self) -> Option<&mut TankSensor<'a>>;
+    fn get_tank_sensor(&mut self) -> Result<&mut TankSensor<'a>, FatError>;
     fn get_esp(&mut self) -> &mut Esp<'a>;
     fn get_config(&mut self) -> &PlantControllerConfig;
     fn get_battery_monitor(&mut self) -> &mut Box<dyn BatteryInteraction + Send>;
     fn get_rtc_module(&mut self) -> &mut Box<dyn RTCModuleInteraction + Send>;
-    fn set_charge_indicator(&mut self, charging: bool) -> Result<()>;
+    fn set_charge_indicator(&mut self, charging: bool) -> Result<(), FatError>;
-    fn deep_sleep(&mut self, duration_in_ms: u64) -> !;
+    async fn deep_sleep(&mut self, duration_in_ms: u64) -> !;
 
     fn is_day(&self) -> bool;
     //should be multsampled
-    fn light(&mut self, enable: bool) -> Result<()>;
+    async fn light(&mut self, enable: bool) -> Result<(), FatError>;
-    fn pump(&mut self, plant: usize, enable: bool) -> Result<()>;
+    async fn pump(&mut self, plant: usize, enable: bool) -> Result<(), FatError>;
-    fn pump_current(&mut self, plant: usize) -> Result<Current>;
+    async fn pump_current(&mut self, plant: usize) -> Result<Current, FatError>;
-    fn fault(&mut self, plant: usize, enable: bool) -> Result<()>;
+    async fn fault(&mut self, plant: usize, enable: bool) -> Result<(), FatError>;
-    fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> Result<f32>;
+    async fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> Result<f32, FatError>;
-    fn general_fault(&mut self, enable: bool);
+    async fn general_fault(&mut self, enable: bool);
-    fn test(&mut self) -> Result<()>;
+    async fn test(&mut self) -> Result<(), FatError>;
-    fn set_config(&mut self, config: PlantControllerConfig) -> Result<()>;
+    fn set_config(&mut self, config: PlantControllerConfig);
-    fn get_mptt_voltage(&mut self) -> anyhow::Result<Voltage>;
+    async fn get_mptt_voltage(&mut self) -> Result<Voltage, FatError>;
-    fn get_mptt_current(&mut self) -> anyhow::Result<Current>;
+    async fn get_mptt_current(&mut self) -> Result<Current, FatError>;
-}
 
-impl dyn BoardInteraction<'_> {
+    async fn progress(&mut self, counter: u32) {
-    //the counter is just some arbitrary number that increases whenever some progress was made, try to keep the updates < 10 per second for ux reasons
+        let current = counter % PLANT_COUNT as u32;
-    fn progress(&mut self, counter: u32) {
-        let even = counter % 2 == 0;
-        let current = counter / (PLANT_COUNT as u32);
         for led in 0..PLANT_COUNT {
-            self.fault(led, current == led as u32).unwrap();
+            if let Err(err) = self.fault(led, current == led as u32).await {
+                warn!("Fault on plant {}: {:?}", led, err);
+            }
         }
-        let _ = self.general_fault(even.into());
+        let even = counter % 2 == 0;
+        let _ = self.general_fault(even.into()).await;
+    }
+
+    async fn clear_progress(&mut self) {
+        for led in 0..PLANT_COUNT {
+            if let Err(err) = self.fault(led, false).await {
+                warn!("Fault on plant {}: {:?}", led, err);
+            }
+        }
+        let _ = self.general_fault(false).await;
     }
 }
 
 #[allow(dead_code)]
-pub struct FreePeripherals {
+pub struct FreePeripherals<'a> {
-    pub gpio0: Gpio0,
+    pub gpio0: GPIO0<'a>,
-    pub gpio1: Gpio1,
+    pub gpio1: GPIO1<'a>,
-    pub gpio2: Gpio2,
+    pub gpio2: GPIO2<'a>,
-    pub gpio3: Gpio3,
+    pub gpio3: GPIO3<'a>,
-    pub gpio4: Gpio4,
+    pub gpio4: GPIO4<'a>,
-    pub gpio5: Gpio5,
+    pub gpio5: GPIO5<'a>,
-    pub gpio6: Gpio6,
+    pub gpio6: GPIO6<'a>,
-    pub gpio7: Gpio7,
+    pub gpio7: GPIO7<'a>,
-    pub gpio8: Gpio8,
+    pub gpio8: GPIO8<'a>,
-    //config button here
+    // //config button here
-    pub gpio10: Gpio10,
+    pub gpio10: GPIO10<'a>,
-    pub gpio11: Gpio11,
+    pub gpio11: GPIO11<'a>,
-    pub gpio12: Gpio12,
+    pub gpio12: GPIO12<'a>,
-    pub gpio13: Gpio13,
+    pub gpio13: GPIO13<'a>,
-    pub gpio14: Gpio14,
+    pub gpio14: GPIO14<'a>,
-    pub gpio15: Gpio15,
+    pub gpio15: GPIO15<'a>,
-    pub gpio16: Gpio16,
+    pub gpio16: GPIO16<'a>,
-    pub gpio17: Gpio17,
+    pub gpio17: GPIO17<'a>,
-    pub gpio18: Gpio18,
+    pub gpio18: GPIO18<'a>,
-    //i2c here
+    // //i2c here
-    pub gpio21: Gpio21,
+    pub gpio21: GPIO21<'a>,
-    pub gpio22: Gpio22,
+    pub gpio22: GPIO22<'a>,
-    pub gpio23: Gpio23,
+    pub gpio23: GPIO23<'a>,
-    pub gpio24: Gpio24,
+    pub gpio24: GPIO24<'a>,
-    pub gpio25: Gpio25,
+    pub gpio25: GPIO25<'a>,
-    pub gpio26: Gpio26,
+    pub gpio26: GPIO26<'a>,
-    pub gpio27: Gpio27,
+    pub gpio27: GPIO27<'a>,
-    pub gpio28: Gpio28,
+    pub gpio28: GPIO28<'a>,
-    pub gpio29: Gpio29,
+    pub gpio29: GPIO29<'a>,
-    pub gpio30: Gpio30,
+    pub gpio30: GPIO30<'a>,
-    pub pcnt0: PCNT0,
+    pub twai: TWAI0<'a>,
-    pub pcnt1: PCNT1,
+    pub pcnt0: Unit<'a, 0>,
-    pub adc1: ADC1,
+    pub pcnt1: Unit<'a, 1>,
-    pub can: CAN,
+    pub adc1: ADC1<'a>,
 }
 
+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
+    }};
+}
+
+const GW_IP_ADDR_ENV: Option<&'static str> = option_env!("GATEWAY_IP");
+
 impl PlantHal {
-    fn create_i2c() -> Mutex<I2cDriver<'static>> {
+    pub async fn create(
-        let peripherals = unsafe { Peripherals::new() };
+        spawner: Spawner,
+    ) -> Result<Mutex<CriticalSectionRawMutex, HAL<'static>>, FatError> {
+        let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
+        let peripherals: Peripherals = esp_hal::init(config);
 
-        let config = I2cConfig::new()
+        esp_alloc::heap_allocator!(size: 64 * 1024);
-            .scl_enable_pullup(true)
+        esp_alloc::heap_allocator!(#[link_section = ".dram2_uninit"] size: 64000);
-            .sda_enable_pullup(true)
-            .baudrate(100_u32.kHz().into())
-            .timeout(APBTickType::from(Duration::from_millis(100)));
 
-        let i2c = peripherals.i2c0;
+        let rtc: Rtc = Rtc::new(peripherals.LPWR);
-        let scl = peripherals.pins.gpio19.downgrade();
+        TIME_ACCESS.init(rtc).map_err(|_| FatError::String {
-        let sda = peripherals.pins.gpio20.downgrade();
+            error: "Init error rct".to_string(),
+        })?;
 
-        Mutex::new(I2cDriver::new(i2c, sda, scl, &config).unwrap())
+        let systimer = SystemTimer::new(peripherals.SYSTIMER);
-    }
 
-    pub fn create() -> Result<Mutex<HAL<'static>>> {
+        let boot_button = Input::new(
-        let peripherals = Peripherals::take()?;
+            peripherals.GPIO9,
-        let sys_loop = EspSystemEventLoop::take()?;
+            InputConfig::default().with_pull(Pull::None),
-        let nvs = EspDefaultNvsPartition::take()?;
+        );
-        let wifi_driver = EspWifi::new(peripherals.modem, sys_loop, Some(nvs))?;
 
-        let mut boot_button = PinDriver::input(peripherals.pins.gpio9.downgrade())?;
+        let rng = Rng::new(peripherals.RNG);
-        boot_button.set_pull(Pull::Floating)?;
+        let timg0 = TimerGroup::new(peripherals.TIMG0);
+        let esp_wifi_ctrl = &*mk_static!(
+            EspWifiController<'static>,
+            init(timg0.timer0, rng.clone()).expect("Could not init wifi controller")
+        );
+
+        let (controller, interfaces) =
+            esp_wifi::wifi::new(&esp_wifi_ctrl, peripherals.WIFI).expect("Could not init wifi");
+
+        use esp_hal::timer::systimer::SystemTimer;
+        esp_hal_embassy::init(systimer.alarm0);
+
+        //let mut adc1 = Adc::new(peripherals.ADC1, adc1_config);
+        //
+
+        let pcnt_module = Pcnt::new(peripherals.PCNT);
 
         let free_pins = FreePeripherals {
-            can: peripherals.can,
+            //     can: peripherals.can,
-            adc1: peripherals.adc1,
+            //     adc1: peripherals.adc1,
-            pcnt0: peripherals.pcnt0,
+            //     pcnt0: peripherals.pcnt0,
-            pcnt1: peripherals.pcnt1,
+            //     pcnt1: peripherals.pcnt1,
-            gpio0: peripherals.pins.gpio0,
+            gpio0: peripherals.GPIO0,
-            gpio1: peripherals.pins.gpio1,
+            gpio1: peripherals.GPIO1,
-            gpio2: peripherals.pins.gpio2,
+            gpio2: peripherals.GPIO2,
-            gpio3: peripherals.pins.gpio3,
+            gpio3: peripherals.GPIO3,
-            gpio4: peripherals.pins.gpio4,
+            gpio4: peripherals.GPIO4,
-            gpio5: peripherals.pins.gpio5,
+            gpio5: peripherals.GPIO5,
-            gpio6: peripherals.pins.gpio6,
+            gpio6: peripherals.GPIO6,
-            gpio7: peripherals.pins.gpio7,
+            gpio7: peripherals.GPIO7,
-            gpio8: peripherals.pins.gpio8,
+            gpio8: peripherals.GPIO8,
-            gpio10: peripherals.pins.gpio10,
+            gpio10: peripherals.GPIO10,
-            gpio11: peripherals.pins.gpio11,
+            gpio11: peripherals.GPIO11,
-            gpio12: peripherals.pins.gpio12,
+            gpio12: peripherals.GPIO12,
-            gpio13: peripherals.pins.gpio13,
+            gpio13: peripherals.GPIO13,
-            gpio14: peripherals.pins.gpio14,
+            gpio14: peripherals.GPIO14,
-            gpio15: peripherals.pins.gpio15,
+            gpio15: peripherals.GPIO15,
-            gpio16: peripherals.pins.gpio16,
+            gpio16: peripherals.GPIO16,
-            gpio17: peripherals.pins.gpio17,
+            gpio17: peripherals.GPIO17,
-            gpio18: peripherals.pins.gpio18,
+            gpio18: peripherals.GPIO18,
-            gpio21: peripherals.pins.gpio21,
+            gpio21: peripherals.GPIO21,
-            gpio22: peripherals.pins.gpio22,
+            gpio22: peripherals.GPIO22,
-            gpio23: peripherals.pins.gpio23,
+            gpio23: peripherals.GPIO23,
-            gpio24: peripherals.pins.gpio24,
+            gpio24: peripherals.GPIO24,
-            gpio25: peripherals.pins.gpio25,
+            gpio25: peripherals.GPIO25,
-            gpio26: peripherals.pins.gpio26,
+            gpio26: peripherals.GPIO26,
-            gpio27: peripherals.pins.gpio27,
+            gpio27: peripherals.GPIO27,
-            gpio28: peripherals.pins.gpio28,
+            gpio28: peripherals.GPIO28,
-            gpio29: peripherals.pins.gpio29,
+            gpio29: peripherals.GPIO29,
-            gpio30: peripherals.pins.gpio30,
+            gpio30: peripherals.GPIO30,
+            twai: peripherals.TWAI0,
+            pcnt0: pcnt_module.unit0,
+            pcnt1: pcnt_module.unit1,
+            adc1: peripherals.ADC1,
         };
 
+        let tablebuffer = mk_static!(
+            [u8; esp_bootloader_esp_idf::partitions::PARTITION_TABLE_MAX_LEN],
+            [0u8; esp_bootloader_esp_idf::partitions::PARTITION_TABLE_MAX_LEN]
+        );
+        let storage_ota = mk_static!(FlashStorage, FlashStorage::new());
+        let pt =
+            esp_bootloader_esp_idf::partitions::read_partition_table(storage_ota, tablebuffer)?;
+
+        // List all partitions - this is just FYI
+        for i in 0..pt.len() {
+            info!("{:?}", pt.get_partition(i));
+        }
+        let ota_data = mk_static!(
+            PartitionEntry,
+            pt.find_partition(esp_bootloader_esp_idf::partitions::PartitionType::Data(
+                DataPartitionSubType::Ota,
+            ))?
+            .expect("No OTA data partition found")
+        );
+
+        let ota_data = mk_static!(
+            FlashRegion<FlashStorage>,
+            ota_data.as_embedded_storage(storage_ota)
+        );
+
+        let mut ota = esp_bootloader_esp_idf::ota::Ota::new(ota_data)?;
+
+        let ota_partition = match ota.current_slot()? {
+            Slot::None => {
+                panic!("No OTA slot active?");
+            }
+            Slot::Slot0 => pt
+                .find_partition(esp_bootloader_esp_idf::partitions::PartitionType::App(
+                    AppPartitionSubType::Ota0,
+                ))?
+                .expect("No OTA slot0 found"),
+            Slot::Slot1 => pt
+                .find_partition(esp_bootloader_esp_idf::partitions::PartitionType::App(
+                    AppPartitionSubType::Ota1,
+                ))?
+                .expect("No OTA slot1 found"),
+        };
+
+        let ota_next = mk_static!(PartitionEntry, ota_partition);
+        let storage_ota = mk_static!(FlashStorage, FlashStorage::new());
+        let ota_next = mk_static!(
+            FlashRegion<FlashStorage>,
+            ota_next.as_embedded_storage(storage_ota)
+        );
+
+        let data_partition = pt
+            .find_partition(esp_bootloader_esp_idf::partitions::PartitionType::Data(
+                DataPartitionSubType::LittleFs,
+            ))?
+            .expect("Data partition with littlefs not found");
+        let data_partition = mk_static!(PartitionEntry, data_partition);
+
+        let storage_data = mk_static!(FlashStorage, FlashStorage::new());
+        let data = mk_static!(
+            FlashRegion<FlashStorage>,
+            data_partition.as_embedded_storage(storage_data)
+        );
+        let lfs2filesystem = mk_static!(LittleFs2Filesystem, LittleFs2Filesystem { storage: data });
+        let alloc = mk_static!(Allocation<LittleFs2Filesystem>, lfs2Filesystem::allocate());
+        if lfs2filesystem.is_mountable() {
+            log::info!("Littlefs2 filesystem is mountable");
+        } else {
+            match lfs2filesystem.format() {
+                Result::Ok(..) => {
+                    log::info!("Littlefs2 filesystem is formatted");
+                }
+                Err(err) => {
+                    bail!("Littlefs2 filesystem could not be formatted: {:?}", err);
+                }
+            }
+        }
+
+        let fs = Arc::new(Mutex::new(
+            lfs2Filesystem::mount(alloc, lfs2filesystem).expect("Could not mount lfs2 filesystem"),
+        ));
+
         let mut esp = Esp {
-            mqtt_client: None,
+            fs,
-            wifi_driver,
+            rng,
+            controller: Arc::new(Mutex::new(controller)),
+            interfaces: Some(interfaces),
             boot_button,
-            delay: Delay::new(1000),
+            mqtt_client: None,
+            ota,
+            ota_next,
         };
 
         //init,reset rtc memory depending on cause
         let mut init_rtc_store: bool = false;
         let mut to_config_mode: bool = false;
-        let reasons = ResetReason::get();
+        let reasons = match reset_reason() {
-        match reasons {
+            None => "unknown",
-            ResetReason::Software => {}
+            Some(reason) => match reason {
-            ResetReason::ExternalPin => {}
+                SocResetReason::ChipPowerOn => "power on",
-            ResetReason::Watchdog => {
+                SocResetReason::CoreSw => "software reset",
-                init_rtc_store = true;
+                SocResetReason::CoreDeepSleep => "deep sleep",
-            }
+                SocResetReason::CoreSDIO => "sdio reset",
-            ResetReason::Sdio => init_rtc_store = true,
+                SocResetReason::CoreMwdt0 => "Watchdog Main",
-            ResetReason::Panic => init_rtc_store = true,
+                SocResetReason::CoreMwdt1 => "Watchdog 1",
-            ResetReason::InterruptWatchdog => init_rtc_store = true,
+                SocResetReason::CoreRtcWdt => "Watchdog RTC",
-            ResetReason::PowerOn => init_rtc_store = true,
+                SocResetReason::Cpu0Mwdt0 => "Watchdog MCpu0",
-            ResetReason::Unknown => init_rtc_store = true,
+                SocResetReason::Cpu0Sw => "software reset cpu0",
-            ResetReason::Brownout => init_rtc_store = true,
+                SocResetReason::Cpu0RtcWdt => {
-            ResetReason::TaskWatchdog => init_rtc_store = true,
+                    init_rtc_store = true;
-            ResetReason::DeepSleep => {}
+                    "Watchdog RTC cpu0"
-            ResetReason::USBPeripheral => {
+                }
-                init_rtc_store = true;
+                SocResetReason::SysBrownOut => "sys brown out",
-                to_config_mode = true;
+                SocResetReason::SysRtcWdt => "Watchdog Sys rtc",
-            }
+                SocResetReason::Cpu0Mwdt1 => "cpu0 mwdt1",
-            ResetReason::JTAG => init_rtc_store = true,
+                SocResetReason::SysSuperWdt => "Watchdog Super",
+                SocResetReason::CoreEfuseCrc => "core efuse crc",
+                SocResetReason::CoreUsbUart => {
+                    to_config_mode = true;
+                    "core usb uart"
+                }
+                SocResetReason::CoreUsbJtag => "core usb jtag",
+                SocResetReason::Cpu0JtagCpu => "cpu0 jtag cpu",
+            },
         };
-        log(
+        LOG_ACCESS
-            LogMessage::ResetReason,
+            .lock()
-            init_rtc_store as u32,
+            .await
-            to_config_mode as u32,
+            .log(
-            "",
+                LogMessage::ResetReason,
-            &format!("{reasons:?}"),
+                init_rtc_store as u32,
-        );
+                to_config_mode as u32,
-
+                "",
-        esp.init_rtc_deepsleep_memory(init_rtc_store, to_config_mode);
+                &format!("{reasons:?}"),
-        let fs_mount_error = esp.mount_file_system().is_err();
-
-        let config = esp.load_config();
-
-        println!("Init rtc driver");
-        let mut rtc = Ds323x::new_ds3231(MutexDevice::new(&I2C_DRIVER));
-
-        println!("Init rtc eeprom driver");
-        let eeprom = {
-            Eeprom24x::new_24x32(
-                MutexDevice::new(&I2C_DRIVER),
-                SlaveAddr::Alternative(true, true, true),
             )
-        };
+            .await;
+
+        esp.init_rtc_deepsleep_memory(init_rtc_store, to_config_mode)
+            .await;
+
+        let config = esp.load_config().await;
+
+        log::info!("Init rtc driver");
+
+        let sda = peripherals.GPIO20;
+        let scl = peripherals.GPIO19;
+
+        let i2c = I2c::new(
+            peripherals.I2C0,
+            Config::default()
+                .with_frequency(Rate::from_hz(100))
+                .with_timeout(BusTimeout::Maximum),
+        )?
+        .with_scl(scl)
+        .with_sda(sda);
+        let i2c_bus: embassy_sync::blocking_mutex::Mutex<
+            CriticalSectionRawMutex,
+            RefCell<I2c<Blocking>>,
+        > = CriticalSectionMutex::new(RefCell::new(i2c));
+
+        I2C_DRIVER.init(i2c_bus).expect("Could not init i2c driver");
+
+        let i2c_bus = I2C_DRIVER.get().await;
+        let rtc_device = I2cDevice::new(&i2c_bus);
+        let eeprom_device = I2cDevice::new(&i2c_bus);
+
+        let mut rtc: Ds323x<
+            I2cInterface<I2cDevice<CriticalSectionRawMutex, I2c<Blocking>>>,
+            DS3231,
+        > = Ds323x::new_ds3231(rtc_device);
+
+        info!("Init rtc eeprom driver");
+        let eeprom = Eeprom24x::new_24x32(eeprom_device, SlaveAddr::Alternative(true, true, true));
         let rtc_time = rtc.datetime();
         match rtc_time {
-            OkStd(tt) => {
+            Ok(tt) => {
-                println!("Rtc Module reports time at UTC {}", tt);
+                log::info!("Rtc Module reports time at UTC {}", tt);
             }
             Err(err) => {
-                println!("Rtc Module could not be read {:?}", err);
+                log::info!("Rtc Module could not be read {:?}", err);
             }
         }
 
-        let storage = Storage::new(eeprom, Delay::new(1000));
+        let storage: Storage<
+            I2cDevice<'static, CriticalSectionRawMutex, I2c<Blocking>>,
+            B32,
+            TwoBytes,
+            No,
+            Delay,
+        > = Storage::new(eeprom, Delay::new());
         let rtc_module: Box<dyn RTCModuleInteraction + Send> =
             Box::new(DS3231Module { rtc, storage }) as Box<dyn RTCModuleInteraction + Send>;
 
@@ -297,22 +498,27 @@ impl PlantHal {
                     match config.hardware.battery {
                         BatteryBoardVersion::Disabled => Box::new(NoBatteryMonitor {}),
                         BatteryBoardVersion::BQ34Z100G1 => {
+                            let battery_device = I2cDevice::new(I2C_DRIVER.get().await);
                             let mut battery_driver = Bq34z100g1Driver {
-                                i2c: MutexDevice::new(&I2C_DRIVER),
+                                i2c: battery_device,
-                                delay: Delay::new(0),
+                                delay: Delay::new(),
                                 flash_block_data: [0; 32],
                             };
                             let status = print_battery_bq34z100(&mut battery_driver);
                             match status {
-                                OkStd(_) => {}
+                                Ok(_) => {}
                                 Err(err) => {
-                                    log(
+                                    LOG_ACCESS
-                                        LogMessage::BatteryCommunicationError,
+                                        .lock()
-                                        0u32,
+                                        .await
-                                        0,
+                                        .log(
-                                        "",
+                                            LogMessage::BatteryCommunicationError,
-                                        &format!("{err:?})"),
+                                            0u32,
-                                    );
+                                            0,
+                                            "",
+                                            &format!("{err:?})"),
+                                        )
+                                        .await;
                                 }
                             }
                             Box::new(BQ34Z100G1 { battery_driver })
@@ -325,30 +531,37 @@ impl PlantHal {
 
                 let board_hal: Box<dyn BoardInteraction + Send> = match config.hardware.board {
                     BoardVersion::INITIAL => {
-                        initial_hal::create_initial_board(free_pins, fs_mount_error, config, esp)?
+                        initial_hal::create_initial_board(free_pins, config, esp)?
-                    }
-                    BoardVersion::V3 => {
-                        v3_hal::create_v3(free_pins, esp, config, battery_interaction, rtc_module)?
                     }
+                    // BoardVersion::V3 => {
+                    //     v3_hal::create_v3(free_pins, esp, config, battery_interaction, rtc_module)?
+                    // }
                     BoardVersion::V4 => {
-                        v4_hal::create_v4(free_pins, esp, config, battery_interaction, rtc_module)?
+                        v4_hal::create_v4(free_pins, esp, config, battery_interaction, rtc_module)
+                            .await?
+                    }
+                    _ => {
+                        bail!("Unknown board version");
                     }
                 };
 
                 HAL { board_hal }
             }
             Err(err) => {
-                log(
+                LOG_ACCESS
-                    LogMessage::ConfigModeMissingConfig,
+                    .lock()
-                    0,
+                    .await
-                    0,
+                    .log(
-                    "",
+                        LogMessage::ConfigModeMissingConfig,
-                    &err.to_string(),
+                        0,
-                );
+                        0,
+                        "",
+                        &err.to_string(),
+                    )
+                    .await;
                 HAL {
                     board_hal: initial_hal::create_initial_board(
                         free_pins,
-                        fs_mount_error,
                         PlantControllerConfig::default(),
                         esp,
                     )?,
@@ -359,3 +572,23 @@ impl PlantHal {
         Ok(Mutex::new(hal))
     }
 }
+
+pub async fn esp_time() -> DateTime<Utc> {
+    DateTime::from_timestamp_micros(TIME_ACCESS.get().await.current_time_us() as i64).unwrap()
+}
+
+pub async fn esp_set_time(time: DateTime<FixedOffset>) {
+    TIME_ACCESS
+        .get()
+        .await
+        .set_current_time_us(time.timestamp_micros() as u64);
+    BOARD_ACCESS
+        .get()
+        .await
+        .lock()
+        .await
+        .board_hal
+        .get_rtc_module()
+        .set_rtc_time(&time.to_utc())
+        .await;
+}

rust/src/hal/rtc.rs

@@ -1,132 +1,133 @@
-use anyhow::{anyhow, bail};
+use crate::hal::Box;
+use crate::fat_error::FatResult;
+use async_trait::async_trait;
 use bincode::config::Configuration;
 use bincode::{config, Decode, Encode};
 use chrono::{DateTime, Utc};
+use ds323x::ic::DS3231;
+use ds323x::interface::I2cInterface;
 use ds323x::{DateTimeAccess, Ds323x};
 use eeprom24x::addr_size::TwoBytes;
 use eeprom24x::page_size::B32;
 use eeprom24x::unique_serial::No;
-use eeprom24x::Storage;
+use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
-use embedded_hal_bus::i2c::MutexDevice;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-use embedded_storage::ReadStorage as embedded_storage_ReadStorage;
+use embedded_storage::{ReadStorage, Storage};
-use embedded_storage::Storage as embedded_storage_Storage;
+use esp_hal::delay::Delay;
-use esp_idf_hal::delay::Delay;
+use esp_hal::i2c::master::I2c;
-use esp_idf_hal::i2c::I2cDriver;
+use esp_hal::Blocking;
 use serde::{Deserialize, Serialize};
-use std::result::Result::Ok as OkStd;
 
-const X25: crc::Crc<u16> = crc::Crc::<u16>::new(&crc::CRC_16_IBM_SDLC);
+pub const X25: crc::Crc<u16> = crc::Crc::<u16>::new(&crc::CRC_16_IBM_SDLC);
 const CONFIG: Configuration = config::standard();
-
+//
+#[async_trait]
 pub trait RTCModuleInteraction {
-    fn get_backup_info(&mut self) -> anyhow::Result<BackupHeader>;
+    async fn get_backup_info(&mut self) -> FatResult<BackupHeader>;
-    fn get_backup_config(&mut self) -> anyhow::Result<Vec<u8>>;
+    async fn get_backup_config(&mut self, chunk: usize) -> FatResult<([u8; 32], usize, u16)>;
-    fn backup_config(&mut self, bytes: &[u8]) -> anyhow::Result<()>;
+    async fn backup_config(&mut self, offset: usize, bytes: &[u8]) -> FatResult<()>;
-    fn get_rtc_time(&mut self) -> anyhow::Result<DateTime<Utc>>;
+    async fn backup_config_finalize(&mut self, crc: u16, length: usize) -> FatResult<()>;
-    fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> anyhow::Result<()>;
+    async fn get_rtc_time(&mut self) -> FatResult<DateTime<Utc>>;
+    async fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> FatResult<()>;
 }
-
+//
 const BACKUP_HEADER_MAX_SIZE: usize = 64;
+
 #[derive(Serialize, Deserialize, PartialEq, Debug, Default, Encode, Decode)]
 pub struct BackupHeader {
     pub timestamp: i64,
     crc16: u16,
     pub size: u16,
 }
+//
+pub struct DS3231Module {
+    pub(crate) rtc: Ds323x<
+        I2cInterface<I2cDevice<'static, CriticalSectionRawMutex, I2c<'static, Blocking>>>,
+        DS3231,
+    >,
 
-pub struct DS3231Module<'a> {
+    pub(crate) storage: eeprom24x::Storage<
-    pub(crate) rtc:
+        I2cDevice<'static, CriticalSectionRawMutex, I2c<'static, Blocking>>,
-        Ds323x<ds323x::interface::I2cInterface<MutexDevice<'a, I2cDriver<'a>>>, ds323x::ic::DS3231>,
+        B32,
-
+        TwoBytes,
-    pub(crate) storage: Storage<MutexDevice<'a, I2cDriver<'a>>, B32, TwoBytes, No, Delay>,
+        No,
+        Delay,
+    >,
 }
 
-impl RTCModuleInteraction for DS3231Module<'_> {
+#[async_trait]
-    fn get_backup_info(&mut self) -> anyhow::Result<BackupHeader> {
+impl RTCModuleInteraction for DS3231Module {
+    async fn get_backup_info(&mut self) -> FatResult<BackupHeader> {
         let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE];
 
-        self.storage
+        self.storage.read(0, &mut header_page_buffer)?;
-            .read(0, &mut header_page_buffer)
-            .map_err(|err| anyhow!("Error reading eeprom header {:?}", err))?;
 
         let (header, len): (BackupHeader, usize) =
             bincode::decode_from_slice(&header_page_buffer[..], CONFIG)?;
 
-        println!("Raw header is {:?} with size {}", header_page_buffer, len);
+        log::info!("Raw header is {:?} with size {}", header_page_buffer, len);
-        anyhow::Ok(header)
+        Ok(header)
     }
 
-    fn get_backup_config(&mut self) -> anyhow::Result<Vec<u8>> {
+    async fn get_backup_config(&mut self, chunk: usize) -> FatResult<([u8; 32], usize, u16)> {
         let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE];
 
-        self.storage
+        self.storage.read(0, &mut header_page_buffer)?;
-            .read(0, &mut header_page_buffer)
-            .map_err(|err| anyhow!("Error reading eeprom header {:?}", err))?;
         let (header, _header_size): (BackupHeader, usize) =
             bincode::decode_from_slice(&header_page_buffer[..], CONFIG)?;
 
-        let mut data_buffer = vec![0_u8; header.size as usize];
+        let mut buf = [0_u8; 32];
-        //read the specified number of bytes after the header
+        let offset = chunk * buf.len() + BACKUP_HEADER_MAX_SIZE;
-        self.storage
-            .read(BACKUP_HEADER_MAX_SIZE as u32, &mut data_buffer)
-            .map_err(|err| anyhow!("Error reading eeprom data {:?}", err))?;
 
-        let checksum = X25.checksum(&data_buffer);
+        let end: usize = header.size as usize + BACKUP_HEADER_MAX_SIZE;
-        if checksum != header.crc16 {
+        let current_end = offset + buf.len();
-            bail!(
+        let chunk_size = if current_end > end {
-                "Invalid checksum, got {} but expected {}",
+            end - offset
-                checksum,
+        } else {
-                header.crc16
+            buf.len()
-            );
+        };
+        if chunk_size == 0 {
+            Ok((buf, 0, header.crc16))
+        } else {
+            self.storage.read(offset as u32, &mut buf)?;
+            //&buf[..chunk_size];
+            Ok((buf, chunk_size, header.crc16))
         }
-
-        anyhow::Ok(data_buffer)
     }
-    fn backup_config(&mut self, bytes: &[u8]) -> anyhow::Result<()> {
+    async fn backup_config(&mut self, offset: usize, bytes: &[u8]) -> FatResult<()> {
+        //skip header and write after
+        self.storage
+            .write((BACKUP_HEADER_MAX_SIZE + offset) as u32, &bytes)?;
+
+        Ok(())
+    }
+
+    async fn backup_config_finalize(&mut self, crc: u16, length: usize) -> FatResult<()> {
         let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE];
 
-        let time = self.get_rtc_time()?.timestamp_millis();
+        let time = self.get_rtc_time().await?.timestamp_millis();
-        let checksum = X25.checksum(bytes);
-
         let header = BackupHeader {
-            crc16: checksum,
+            crc16: crc,
             timestamp: time,
-            size: bytes.len() as u16,
+            size: length as u16,
         };
         let config = config::standard();
         let encoded = bincode::encode_into_slice(&header, &mut header_page_buffer, config)?;
-        println!(
+        log::info!(
             "Raw header is {:?} with size {}",
-            header_page_buffer, encoded
+            header_page_buffer,
+            encoded
         );
-        self.storage
+        self.storage.write(0, &header_page_buffer)?;
-            .write(0, &header_page_buffer)
+        Ok(())
-            .map_err(|err| anyhow!("Error writing header {:?}", err))?;
-
-        //write rest after the header
-        self.storage
-            .write(BACKUP_HEADER_MAX_SIZE as u32, &bytes)
-            .map_err(|err| anyhow!("Error writing body {:?}", err))?;
-
-        anyhow::Ok(())
     }
 
-    fn get_rtc_time(&mut self) -> anyhow::Result<DateTime<Utc>> {
+    async fn get_rtc_time(&mut self) -> FatResult<DateTime<Utc>> {
-        match self.rtc.datetime() {
+        Ok(self.rtc.datetime()?.and_utc())
-            OkStd(rtc_time) => anyhow::Ok(rtc_time.and_utc()),
-            Err(err) => {
-                bail!("Error getting rtc time {:?}", err)
-            }
-        }
     }
 
-    fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> anyhow::Result<()> {
+    async fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> FatResult<()> {
         let naive_time = time.naive_utc();
-        match self.rtc.set_datetime(&naive_time) {
+        Ok(self.rtc.set_datetime(&naive_time)?)
-            OkStd(_) => anyhow::Ok(()),
-            Err(err) => {
-                bail!("Error getting rtc time {:?}", err)
-            }
-        }
     }
 }

rust/src/hal/v4_hal.rs

@@ -2,44 +2,78 @@ use crate::config::PlantControllerConfig;
 use crate::hal::battery::BatteryInteraction;
 use crate::hal::esp::Esp;
 use crate::hal::rtc::RTCModuleInteraction;
-use crate::hal::v4_sensor::SensorImpl;
-use crate::hal::v4_sensor::SensorInteraction;
 use crate::hal::water::TankSensor;
-use crate::hal::{
+use crate::hal::{BoardInteraction, FreePeripherals, Sensor, I2C_DRIVER, PLANT_COUNT};
-    deep_sleep, BoardInteraction, FreePeripherals, Sensor, I2C_DRIVER, PLANT_COUNT
+use alloc::boxed::Box;
-};
+use alloc::string::ToString;
-use crate::log::{log, LogMessage};
+use async_trait::async_trait;
-use anyhow::bail;
+use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
-use embedded_hal::digital::OutputPin;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
-use embedded_hal_bus::i2c::MutexDevice;
+use embassy_time::Timer;
-use esp_idf_hal::gpio::{AnyInputPin, IOPin, InputOutput, Output, PinDriver, Pull};
+use esp_hal::analog::adc::{Adc, AdcConfig, Attenuation};
-use esp_idf_hal::i2c::{I2cDriver, I2cError};
+use esp_hal::{twai, Blocking};
-use esp_idf_hal::pcnt::{
+//use embedded_hal_bus::i2c::MutexDevice;
-    PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex,
+use crate::bail;
-};
+use crate::hal::v4_sensor::{SensorImpl, SensorInteraction};
-use esp_idf_sys::{gpio_hold_dis, gpio_hold_en};
+use crate::fat_error::{FatError, FatResult};
+use esp_hal::gpio::{Flex, Input, InputConfig, Level, Output, OutputConfig, Pull};
+use esp_hal::i2c::master::I2c;
+use esp_hal::pcnt::Pcnt;
+use esp_hal::twai::{EspTwaiFrame, StandardId, TwaiMode};
+use esp_println::println;
 use ina219::address::{Address, Pin};
 use ina219::calibration::UnCalibrated;
-use ina219::configuration::{Configuration, OperatingMode};
+use ina219::configuration::{Configuration, OperatingMode, Resolution};
 use ina219::SyncIna219;
-use measurements::{Current, Resistance, Voltage};
+use measurements::Resistance;
-use pca9535::{ExpanderError, GPIOBank, Pca9535Immediate, StandardExpanderInterface};
+use measurements::{Current, Voltage};
-use std::result::Result::Ok as OkStd;
+use pca9535::{GPIOBank, Pca9535Immediate, StandardExpanderInterface};
-use embedded_can::nb::Can;
+use crate::log::{LogMessage, LOG_ACCESS};
-use embedded_can::Frame;
+
-use embedded_can::StandardId;
+const MPPT_CURRENT_SHUNT_OHMS: f64 = 0.05_f64;
-use esp_idf_hal::prelude::*;
+const TWAI_BAUDRATE: twai::BaudRate = twai::BaudRate::B125K;
-use esp_idf_hal::can;
 
 pub enum Charger<'a> {
     SolarMpptV1 {
-        mppt_ina: SyncIna219<MutexDevice<'a, I2cDriver<'a>>, UnCalibrated>,
+        mppt_ina: SyncIna219<
-        solar_is_day: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, esp_idf_hal::gpio::Input>,
+            I2cDevice<'a, CriticalSectionRawMutex, I2c<'static, Blocking>>,
-        charge_indicator: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
+            UnCalibrated,
+        >,
+        solar_is_day: Input<'a>,
+        charge_indicator: Output<'a>,
     },
     ErrorInit {},
 }
 
+impl<'a> Charger<'a> {
+    pub(crate) fn get_mppt_current(&mut self) -> FatResult<Current> {
+        match self {
+            Charger::SolarMpptV1 { mppt_ina, .. } => {
+                let v = mppt_ina.shunt_voltage()?;
+                let shunt_voltage = Voltage::from_microvolts(v.shunt_voltage_uv().abs() as f64);
+                let shut_value = Resistance::from_ohms(MPPT_CURRENT_SHUNT_OHMS);
+                let current = shunt_voltage.as_volts() / shut_value.as_ohms();
+                Ok(Current::from_amperes(current))
+            }
+            Charger::ErrorInit { .. } => {
+                bail!("hardware error during init");
+            }
+        }
+    }
+
+    pub(crate) fn get_mptt_voltage(&mut self) -> FatResult<Voltage> {
+        match self {
+            Charger::SolarMpptV1 { mppt_ina, .. } => {
+                let v = mppt_ina.bus_voltage()?;
+                Ok(Voltage::from_millivolts(v.voltage_mv() as f64))
+            }
+            Charger::ErrorInit { .. } => {
+                bail!("hardware error during init");
+            }
+        }
+    }
+}
+
 impl Charger<'_> {
     pub(crate) fn power_save(&mut self) {
         match self {
@@ -54,7 +88,7 @@ impl Charger<'_> {
                         operating_mode: OperatingMode::PowerDown,
                     })
                     .map_err(|e| {
-                        println!(
+                        log::info!(
                     "Error setting ina mppt configuration during deep sleep preparation{:?}",
                     e
                 );
@@ -63,12 +97,12 @@ impl Charger<'_> {
             _ => {}
         }
     }
-    fn set_charge_indicator(&mut self, charging: bool) -> anyhow::Result<()> {
+    fn set_charge_indicator(&mut self, charging: bool) -> FatResult<()> {
         match self {
             Self::SolarMpptV1 {
                 charge_indicator, ..
             } => {
-                charge_indicator.set_state(charging.into())?;
+                charge_indicator.set_level(charging.into());
             }
             _ => {}
         }
@@ -77,37 +111,10 @@ impl Charger<'_> {
 
     fn is_day(&self) -> bool {
         match self {
-            Charger::SolarMpptV1 { solar_is_day, .. } => solar_is_day.get_level().into(),
+            Charger::SolarMpptV1 { solar_is_day, .. } => solar_is_day.is_high(),
             _ => true,
         }
     }
-
-    fn get_mptt_voltage(&mut self) -> anyhow::Result<Voltage> {
-        let voltage = match self {
-            Charger::SolarMpptV1 { mppt_ina, .. } => mppt_ina
-                .bus_voltage()
-                .map(|v| Voltage::from_millivolts(v.voltage_mv() as f64))?,
-            _ => {
-                bail!("hardware error during init")
-            }
-        };
-        Ok(voltage)
-    }
-
-    fn get_mptt_current(&mut self) -> anyhow::Result<Current> {
-        let current = match self {
-            Charger::SolarMpptV1 { mppt_ina, .. } => mppt_ina.shunt_voltage().map(|v| {
-                let shunt_voltage = Voltage::from_microvolts(v.shunt_voltage_uv().abs() as f64);
-                let shut_value = Resistance::from_ohms(0.05_f64);
-                let current = shunt_voltage.as_volts() / shut_value.as_ohms();
-                Current::from_amperes(current)
-            })?,
-            _ => {
-                bail!("hardware error during init")
-            }
-        };
-        Ok(current)
-    }
 }
 
 pub struct V4<'a> {
@@ -118,40 +125,45 @@ pub struct V4<'a> {
     battery_monitor: Box<dyn BatteryInteraction + Send>,
     config: PlantControllerConfig,
 
-    awake: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, Output>,
+    awake: Output<'a>,
-    light: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
+    light: Output<'a>,
-    general_fault: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
+    general_fault: Output<'a>,
-    pump_expander: Pca9535Immediate<MutexDevice<'a, I2cDriver<'a>>>,
+    pump_expander: Pca9535Immediate<I2cDevice<'a, CriticalSectionRawMutex, I2c<'static, Blocking>>>,
-    pump_ina: Option<SyncIna219<MutexDevice<'a, I2cDriver<'a>>, UnCalibrated>>,
+    pump_ina: Option<
-    sensor: SensorImpl<'a>,
+        SyncIna219<I2cDevice<'a, CriticalSectionRawMutex, I2c<'static, Blocking>>, UnCalibrated>,
-    extra1: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, Output>,
+    >,
-    extra2: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, Output>,
+    sensor: SensorImpl,
+    extra1: Output<'a>,
+    extra2: Output<'a>,
 }
 
-pub(crate) fn create_v4(
+struct InputOutput<'a> {
-    peripherals: FreePeripherals,
+    pin: Flex<'a>,
+}
+
+pub(crate) async fn create_v4(
+    peripherals: FreePeripherals<'static>,
     esp: Esp<'static>,
     config: PlantControllerConfig,
     battery_monitor: Box<dyn BatteryInteraction + Send>,
     rtc_module: Box<dyn RTCModuleInteraction + Send>,
-) -> anyhow::Result<Box<dyn BoardInteraction<'static> + Send + 'static>> {
+) -> Result<Box<dyn BoardInteraction<'static> + Send + 'static>, FatError> {
-    println!("Start v4");
+    log::info!("Start v4");
-    let mut awake = PinDriver::output(peripherals.gpio21.downgrade())?;
+    let mut awake = Output::new(peripherals.gpio21, Level::High, OutputConfig::default());
-    awake.set_high()?;
+    awake.set_high();
 
-    let mut general_fault = PinDriver::input_output(peripherals.gpio23.downgrade())?;
+    let mut general_fault = Output::new(peripherals.gpio23, Level::Low, OutputConfig::default());
-    general_fault.set_pull(Pull::Floating)?;
+    general_fault.set_low();
-    general_fault.set_low()?;
 
-    let mut extra1 = PinDriver::output(peripherals.gpio6.downgrade())?;
+    let extra1 = Output::new(peripherals.gpio6, Level::Low, OutputConfig::default());
-    extra1.set_low()?;
+    let extra2 = Output::new(peripherals.gpio15, Level::Low, OutputConfig::default());
 
-    let mut extra2 = PinDriver::output(peripherals.gpio15.downgrade())?;
+    let one_wire_pin = Flex::new(peripherals.gpio18);
-    extra2.set_low()?;
+    let tank_power_pin = Output::new(peripherals.gpio11, Level::Low, OutputConfig::default());
-
+    let flow_sensor_pin = Input::new(
-    let one_wire_pin = peripherals.gpio18.downgrade();
+        peripherals.gpio4,
-    let tank_power_pin = peripherals.gpio11.downgrade();
+        InputConfig::default().with_pull(Pull::Up),
-    let flow_sensor_pin = peripherals.gpio4.downgrade();
+    );
 
     let tank_sensor = TankSensor::create(
         one_wire_pin,
@@ -162,32 +174,33 @@ pub(crate) fn create_v4(
         peripherals.pcnt1,
     )?;
 
-    let mut sensor_expander = Pca9535Immediate::new(MutexDevice::new(&I2C_DRIVER), 34);
+    let sensor_expander_device = I2cDevice::new(I2C_DRIVER.get().await);
-    let sensor = match  sensor_expander.pin_into_output(GPIOBank::Bank0, 0)  {
+    let mut sensor_expander = Pca9535Immediate::new(sensor_expander_device, 34);
+    let sensor = match sensor_expander.pin_into_output(GPIOBank::Bank0, 0) {
         Ok(_) => {
-            println!("SensorExpander answered");
+            log::info!("SensorExpander answered");
             //pulse counter version
-            let mut signal_counter = PcntDriver::new(
+            // let mut signal_counter = PcntDriver::new(
-                peripherals.pcnt0,
+            //     peripherals.pcnt0,
-                Some(peripherals.gpio22),
+            //     Some(peripherals.gpio22),
-                Option::<AnyInputPin>::None,
+            //     Option::<AnyInputPin>::None,
-                Option::<AnyInputPin>::None,
+            //     Option::<AnyInputPin>::None,
-                Option::<AnyInputPin>::None,
+            //     Option::<AnyInputPin>::None,
-            )?;
+            // )?;
-
+            //
-            signal_counter.channel_config(
+            // signal_counter.channel_config(
-                PcntChannel::Channel0,
+            //     PcntChannel::Channel0,
-                PinIndex::Pin0,
+            //     PinIndex::Pin0,
-                PinIndex::Pin1,
+            //     PinIndex::Pin1,
-                &PcntChannelConfig {
+            //     &PcntChannelConfig {
-                    lctrl_mode: PcntControlMode::Keep,
+            //         lctrl_mode: PcntControlMode::Keep,
-                    hctrl_mode: PcntControlMode::Keep,
+            //         hctrl_mode: PcntControlMode::Keep,
-                    pos_mode: PcntCountMode::Increment,
+            //         pos_mode: PcntCountMode::Increment,
-                    neg_mode: PcntCountMode::Hold,
+            //         neg_mode: PcntCountMode::Hold,
-                    counter_h_lim: i16::MAX,
+            //         counter_h_lim: i16::MAX,
-                    counter_l_lim: 0,
+            //         counter_l_lim: 0,
-                },
+            //     },
-            )?;
+            // )?;
 
             for pin in 0..8 {
                 let _ = sensor_expander.pin_into_output(GPIOBank::Bank0, pin);
@@ -197,45 +210,38 @@ pub(crate) fn create_v4(
             }
 
             SensorImpl::PulseCounter {
-                signal_counter,
+                //     signal_counter,
                 sensor_expander,
             }
         }
         Err(_) => {
-            println!("Can bus mode ");
+            log::info!("Can bus mode ");
-            let timing = can::config::Timing::B25K;
+            let twai_config = twai::TwaiConfiguration::new(
-            let config = can::config::Config::new().timing(timing);
+                peripherals.twai,
-            let mut can = can::CanDriver::new(peripherals.can, peripherals.gpio0, peripherals.gpio2, &config).unwrap();
+                peripherals.gpio0,
+                peripherals.gpio2,
+                TWAI_BAUDRATE,
+                TwaiMode::Normal,
+            );
 
+            let mut twai = twai_config.start();
+            let frame = EspTwaiFrame::new(StandardId::ZERO, &[1, 2, 3]).unwrap();
 
-            let frame = StandardId::new(0x042).unwrap();
+            twai.transmit(&frame).unwrap();
-            let tx_frame = Frame::new(frame, &[0, 1, 2, 3, 4, 5, 6, 7]).unwrap();
-            can.transmit(&tx_frame, 1000).unwrap();
 
-            if let Ok(rx_frame) = can.receive(1000) {
+            //            let frame = twai.receive().unwrap();
-                println!("rx {:}:", rx_frame);
+            println!("Received a frame: {frame:?}");
-            }
             //can bus version
-            SensorImpl::CanBus {
+            SensorImpl::CanBus { twai }
-                can
-            }
         }
     };
 
+    let solar_is_day = Input::new(peripherals.gpio7, InputConfig::default());
+    let light = Output::new(peripherals.gpio10, Level::Low, Default::default());
+    let charge_indicator = Output::new(peripherals.gpio3, Level::Low, Default::default());
 
-
+    let pump_device = I2cDevice::new(I2C_DRIVER.get().await);
-
+    let mut pump_expander = Pca9535Immediate::new(pump_device, 32);
-    let mut solar_is_day = PinDriver::input(peripherals.gpio7.downgrade())?;
-    solar_is_day.set_pull(Pull::Floating)?;
-
-    let mut light = PinDriver::input_output(peripherals.gpio10.downgrade())?;
-    light.set_pull(Pull::Floating)?;
-
-    let mut charge_indicator = PinDriver::input_output(peripherals.gpio3.downgrade())?;
-    charge_indicator.set_pull(Pull::Floating)?;
-    charge_indicator.set_low()?;
-
-    let mut pump_expander = Pca9535Immediate::new(MutexDevice::new(&I2C_DRIVER), 32);
     for pin in 0..8 {
         let _ = pump_expander.pin_into_output(GPIOBank::Bank0, pin);
         let _ = pump_expander.pin_into_output(GPIOBank::Bank1, pin);
@@ -243,15 +249,37 @@ pub(crate) fn create_v4(
         let _ = pump_expander.pin_set_low(GPIOBank::Bank1, pin);
     }
 
+    let mppt_current = I2cDevice::new(I2C_DRIVER.get().await);
+    let mppt_ina = match SyncIna219::new(mppt_current, Address::from_pins(Pin::Vcc, Pin::Gnd)) {
+        Ok(mut ina) => {
+            // Prefer higher averaging for more stable readings
+            let _ = ina.set_configuration(Configuration {
+                reset: Default::default(),
+                bus_voltage_range: Default::default(),
+                shunt_voltage_range: Default::default(),
+                bus_resolution: Default::default(),
+                shunt_resolution: Resolution::Avg128,
+                operating_mode: Default::default(),
+            });
+            Some(ina)
+        }
+        Err(err) => {
+            log::info!("Error creating mppt ina: {:?}", err);
+            None
+        }
+    };
 
-
+    let pump_current_dev = I2cDevice::new(I2C_DRIVER.get().await);
-    let mppt_ina = SyncIna219::new(
+    let pump_ina = match SyncIna219::new(pump_current_dev, Address::from_pins(Pin::Gnd, Pin::Sda)) {
-        MutexDevice::new(&I2C_DRIVER),
+        Ok(ina) => Some(ina),
-        Address::from_pins(Pin::Vcc, Pin::Gnd),
+        Err(err) => {
-    );
+            log::info!("Error creating pump ina: {:?}", err);
+            None
+        }
+    };
 
     let charger = match mppt_ina {
-        Ok(mut mppt_ina) => {
+        Some(mut mppt_ina) => {
             mppt_ina.set_configuration(Configuration {
                 reset: Default::default(),
                 bus_voltage_range: Default::default(),
@@ -267,18 +295,7 @@ pub(crate) fn create_v4(
                 charge_indicator,
             }
         }
-        Err(_) => Charger::ErrorInit {},
+        None => Charger::ErrorInit {},
-    };
-
-    let pump_ina = match SyncIna219::new(
-        MutexDevice::new(&I2C_DRIVER),
-        Address::from_pins(Pin::Gnd, Pin::Sda),
-    ) {
-        Ok(pump_ina) => Some(pump_ina),
-        Err(err) => {
-            println!("Error creating pump ina: {:?}", err);
-            None
-        }
     };
 
     let v = V4 {
@@ -288,10 +305,11 @@ pub(crate) fn create_v4(
         tank_sensor,
         light,
         general_fault,
-        pump_ina,
+        //pump_ina,
         pump_expander,
         config,
         battery_monitor,
+        pump_ina,
         charger,
         extra1,
         extra2,
@@ -300,9 +318,10 @@ pub(crate) fn create_v4(
     Ok(Box::new(v))
 }
 
+#[async_trait]
 impl<'a> BoardInteraction<'a> for V4<'a> {
-    fn get_tank_sensor(&mut self) -> Option<&mut TankSensor<'a>> {
+    fn get_tank_sensor(&mut self) -> Result<&mut TankSensor<'a>, FatError> {
-        Some(&mut self.tank_sensor)
+        Ok(&mut self.tank_sensor)
     }
 
     fn get_esp(&mut self) -> &mut Esp<'a> {
@@ -321,126 +340,130 @@ impl<'a> BoardInteraction<'a> for V4<'a> {
         &mut self.rtc_module
     }
 
-    fn set_charge_indicator(&mut self, charging: bool) -> anyhow::Result<()> {
+    fn set_charge_indicator(&mut self, charging: bool) -> Result<(), FatError> {
         self.charger.set_charge_indicator(charging)
     }
 
-    fn deep_sleep(&mut self, duration_in_ms: u64) -> ! {
+    async fn deep_sleep(&mut self, duration_in_ms: u64) -> ! {
-        self.awake.set_low().unwrap();
+        self.awake.set_low();
-        self.charger.power_save();
+        //self.charger.power_save();
-        deep_sleep(duration_in_ms);
+        self.esp.deep_sleep(duration_in_ms).await;
     }
 
     fn is_day(&self) -> bool {
         self.charger.is_day()
     }
 
-    fn light(&mut self, enable: bool) -> anyhow::Result<()> {
+    async fn light(&mut self, enable: bool) -> Result<(), FatError> {
-        unsafe { gpio_hold_dis(self.light.pin()) };
+        // unsafe { gpio_hold_dis(self.light.pin()) };
-        self.light.set_state(enable.into())?;
+         self.light.set_level(enable.into());
-        unsafe { gpio_hold_en(self.light.pin()) };
+        // unsafe { gpio_hold_en(self.light.pin()) };
-        anyhow::Ok(())
+         Ok(())
     }
 
-    fn pump(&mut self, plant: usize, enable: bool) -> anyhow::Result<()> {
+    async fn pump(&mut self, plant: usize, enable: bool) -> FatResult<()> {
         if enable {
             self.pump_expander
-                .pin_set_high(GPIOBank::Bank0, plant.try_into()?)?;
+                .pin_set_high(GPIOBank::Bank0, plant as u8)?;
         } else {
             self.pump_expander
-                .pin_set_low(GPIOBank::Bank0, plant.try_into()?)?;
+                .pin_set_low(GPIOBank::Bank0, plant as u8)?;
         }
-        anyhow::Ok(())
+        Ok(())
     }
 
-    fn pump_current(&mut self, _plant: usize) -> anyhow::Result<Current> {
+    async fn pump_current(&mut self, _plant: usize) -> Result<Current, FatError> {
-        //sensore is shared for all pumps, ignore plant id
+        // sensor is shared for all pumps, ignore plant id
         match self.pump_ina.as_mut() {
             None => {
                 bail!("pump current sensor not available");
             }
             Some(pump_ina) => {
-                let v = pump_ina.shunt_voltage().map(|v| {
+                let v = pump_ina
-                    let shunt_voltage = Voltage::from_microvolts(v.shunt_voltage_uv().abs() as f64);
+                    .shunt_voltage()
-                    let shut_value = Resistance::from_ohms(0.05_f64);
+                    .map_err(|e| FatError::String {
-                    let current = shunt_voltage.as_volts() / shut_value.as_ohms();
+                        error: alloc::format!("{:?}", e),
-                    Current::from_amperes(current)
+                    })
-                })?;
+                    .map(|v| {
+                        let shunt_voltage =
+                            Voltage::from_microvolts(v.shunt_voltage_uv().abs() as f64);
+                        let shut_value = Resistance::from_ohms(0.05_f64);
+                        let current = shunt_voltage.as_volts() / shut_value.as_ohms();
+                        Current::from_amperes(current)
+                    })?;
                 Ok(v)
             }
         }
     }
 
-    fn fault(&mut self, plant: usize, enable: bool) -> anyhow::Result<()> {
+    async fn fault(&mut self, plant: usize, enable: bool) -> FatResult<()> {
         if enable {
             self.pump_expander
-                .pin_set_high(GPIOBank::Bank1, plant.try_into()?)?
+                .pin_set_high(GPIOBank::Bank1, plant as u8)?;
         } else {
             self.pump_expander
-                .pin_set_low(GPIOBank::Bank1, plant.try_into()?)?
+                .pin_set_low(GPIOBank::Bank1, plant as u8)?;
         }
-        anyhow::Ok(())
+        Ok(())
     }
 
-    fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> anyhow::Result<f32> {
+    async fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> Result<f32, FatError> {
-        self.sensor.measure_moisture_hz(plant, sensor)
+        self.sensor.measure_moisture_hz(plant, sensor).await
     }
 
-    fn general_fault(&mut self, enable: bool) {
+    async fn general_fault(&mut self, enable: bool) {
-        unsafe { gpio_hold_dis(self.general_fault.pin()) };
+        //FIXME unsafe { gpio_hold_dis(self.general_fault.pin()) };
-        self.general_fault.set_state(enable.into()).unwrap();
+        self.general_fault.set_level(enable.into());
-        unsafe { gpio_hold_en(self.general_fault.pin()) };
+        //FIXME unsafe { gpio_hold_en(self.general_fault.pin()) };
     }
 
-    fn test(&mut self) -> anyhow::Result<()> {
+    async fn test(&mut self) -> Result<(), FatError> {
-        self.general_fault(true);
+         self.general_fault(true).await;
-        self.esp.delay.delay_ms(100);
+        Timer::after_millis(100).await;
-        self.general_fault(false);
+         self.general_fault(false).await;
-        self.esp.delay.delay_ms(500);
+        Timer::after_millis(500).await;
-        self.light(true)?;
+         self.light(true).await?;
-        self.esp.delay.delay_ms(500);
+        Timer::after_millis(500).await;
-        self.light(false)?;
+        self.light(false).await?;
-        self.esp.delay.delay_ms(500);
+        Timer::after_millis(500).await;
         for i in 0..PLANT_COUNT {
-            self.fault(i, true)?;
+            self.fault(i, true).await?;
-            self.esp.delay.delay_ms(500);
+            Timer::after_millis(500).await;
-            self.fault(i, false)?;
+            self.fault(i, false).await?;
-            self.esp.delay.delay_ms(500);
+            Timer::after_millis(500).await;
         }
-        for i in 0..PLANT_COUNT {
+         for i in 0..PLANT_COUNT {
-            self.pump(i, true)?;
+             self.pump(i, true).await?;
-            self.esp.delay.delay_ms(100);
+             Timer::after_millis(100).await;
-            self.pump(i, false)?;
+             self.pump(i, false).await?;
-            self.esp.delay.delay_ms(100);
+             Timer::after_millis(100).await;
-        }
+         }
-        for plant in 0..PLANT_COUNT {
+         for plant in 0..PLANT_COUNT {
-            let a = self.measure_moisture_hz(plant, Sensor::A);
+             let a = self.measure_moisture_hz(plant, Sensor::A).await;
-            let b = self.measure_moisture_hz(plant, Sensor::B);
+             let b = self.measure_moisture_hz(plant, Sensor::B).await;
-            let aa = match a {
+             let aa = match a {
-                OkStd(a) => a as u32,
+                 Ok(a) => a as u32,
-                Err(_) => u32::MAX,
+                 Err(_) => u32::MAX,
-            };
+             };
-            let bb = match b {
+             let bb = match b {
-                OkStd(b) => b as u32,
+                 Ok(b) => b as u32,
-                Err(_) => u32::MAX,
+                 Err(_) => u32::MAX,
-            };
+             };
-            log(LogMessage::TestSensor, aa, bb, &plant.to_string(), "");
+             LOG_ACCESS.lock().await.log(LogMessage::TestSensor, aa, bb, &plant.to_string(), "").await;
-        }
+         }
-        self.esp.delay.delay_ms(10);
+        Timer::after_millis(10).await;
-        anyhow::Ok(())
+        Ok(())
     }
 
-    fn set_config(&mut self, config: PlantControllerConfig) -> anyhow::Result<()> {
+    fn set_config(&mut self, config: PlantControllerConfig) {
         self.config = config;
-        self.esp.save_config(&self.config)?;
-        anyhow::Ok(())
     }
 
-    fn get_mptt_voltage(&mut self) -> anyhow::Result<Voltage> {
+    async fn get_mptt_voltage(&mut self) -> Result<Voltage, FatError> {
         self.charger.get_mptt_voltage()
     }
 
-    fn get_mptt_current(&mut self) -> anyhow::Result<Current> {
+    async fn get_mptt_current(&mut self) -> Result<Current, FatError> {
-        self.charger.get_mptt_current()
+        self.charger.get_mppt_current()
     }
 }

rust/src/hal/v4_sensor.rs

@@ -1,16 +1,23 @@
-use embedded_hal_bus::i2c::MutexDevice;
+use crate::hal::Box;
-use esp_idf_hal::can::CanDriver;
-use esp_idf_hal::delay::Delay;
-use esp_idf_hal::i2c::I2cDriver;
-use esp_idf_hal::pcnt::PcntDriver;
-use pca9535::{GPIOBank, Pca9535Immediate, StandardExpanderInterface};
 use crate::hal::Sensor;
-use crate::log::{log, LogMessage};
+use crate::log::{LogMessage, LOG_ACCESS};
+use crate::fat_error::{FatError, FatResult};
+use alloc::format;
+use alloc::string::ToString;
+use async_trait::async_trait;
+use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
+use embassy_time::Timer;
+use esp_hal::i2c::master::I2c;
+use esp_hal::twai::Twai;
+use esp_hal::Blocking;
+use pca9535::{GPIOBank, Pca9535Immediate, StandardExpanderInterface};
 
 const REPEAT_MOIST_MEASURE: usize = 10;
 
+#[async_trait]
 pub trait SensorInteraction {
-    fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> anyhow::Result<f32>;
+    async fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> FatResult<f32>;
 }
 
 const MS0: u8 = 1_u8;
@@ -20,24 +27,30 @@ const MS3: u8 = 4_u8;
 const MS4: u8 = 2_u8;
 const SENSOR_ON: u8 = 5_u8;
 
-pub enum SensorImpl<'a> {
+pub enum SensorImpl {
-    PulseCounter{
+    PulseCounter {
-        signal_counter: PcntDriver<'a>,
+        //signal_counter: PcntDriver<'a>,
-        sensor_expander: Pca9535Immediate<MutexDevice<'a, I2cDriver<'a>>>,
+        sensor_expander:
+            Pca9535Immediate<I2cDevice<'static, CriticalSectionRawMutex, I2c<'static, Blocking>>>,
+    },
+    CanBus {
+        twai: Twai<'static, Blocking>,
     },
-    CanBus{
-        can: CanDriver<'a>
-    }
 }
 
-impl SensorInteraction for SensorImpl<'_> {
+#[async_trait]
-    fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> anyhow::Result<f32> {
+impl SensorInteraction for SensorImpl {
+    async fn measure_moisture_hz(&mut self, plant: usize, sensor: Sensor) -> FatResult<f32> {
         match self {
-            SensorImpl::PulseCounter { signal_counter, sensor_expander, .. } => {
+            SensorImpl::PulseCounter {
+                //signal_counter,
+                sensor_expander,
+                ..
+            } => {
                 let mut results = [0_f32; REPEAT_MOIST_MEASURE];
                 for repeat in 0..REPEAT_MOIST_MEASURE {
-                    signal_counter.counter_pause()?;
+                    //signal_counter.counter_pause()?;
-                    signal_counter.counter_clear()?;
+                    //signal_counter.counter_clear()?;
 
                     //Disable all
                     sensor_expander.pin_set_high(GPIOBank::Bank0, MS4)?;
@@ -70,45 +83,46 @@ impl SensorInteraction for SensorImpl<'_> {
                     }
 
                     sensor_expander.pin_set_low(GPIOBank::Bank0, MS4)?;
-                    sensor_expander
+                    sensor_expander.pin_set_high(GPIOBank::Bank0, SENSOR_ON)?;
-                        .pin_set_high(GPIOBank::Bank0, SENSOR_ON)?;
 
-                    let delay = Delay::new_default();
                     let measurement = 100; // TODO what is this scaling factor? what is its purpose?
                     let factor = 1000f32 / measurement as f32;
 
                     //give some time to stabilize
-                    delay.delay_ms(10);
+                    Timer::after_millis(10).await;
-                    signal_counter.counter_resume()?;
+                    //signal_counter.counter_resume()?;
-                    delay.delay_ms(measurement);
+                    Timer::after_millis(measurement).await;
-                    signal_counter.counter_pause()?;
+                    //signal_counter.counter_pause()?;
                     sensor_expander.pin_set_high(GPIOBank::Bank0, MS4)?;
-                    sensor_expander
+                    sensor_expander.pin_set_low(GPIOBank::Bank0, SENSOR_ON)?;
-                        .pin_set_low(GPIOBank::Bank0, SENSOR_ON)?;
                     sensor_expander.pin_set_low(GPIOBank::Bank0, MS0)?;
                     sensor_expander.pin_set_low(GPIOBank::Bank0, MS1)?;
                     sensor_expander.pin_set_low(GPIOBank::Bank0, MS2)?;
                     sensor_expander.pin_set_low(GPIOBank::Bank0, MS3)?;
-                    delay.delay_ms(10);
+                    Timer::after_millis(10).await;
-                    let unscaled = signal_counter.get_counter_value()? as i32;
+                    let unscaled = 1337; //signal_counter.get_counter_value()? as i32;
                     let hz = unscaled as f32 * factor;
-                    log(
+                    LOG_ACCESS
-                        LogMessage::RawMeasure,
+                        .lock()
-                        unscaled as u32,
+                        .await
-                        hz as u32,
+                        .log(
-                        &plant.to_string(),
+                            LogMessage::RawMeasure,
-                        &format!("{sensor:?}"),
+                            unscaled as u32,
-                    );
+                            hz as u32,
+                            &plant.to_string(),
+                            &format!("{sensor:?}"),
+                        )
+                        .await;
                     results[repeat] = hz;
                 }
                 results.sort_by(|a, b| a.partial_cmp(b).unwrap()); // floats don't seem to implement total_ord
 
                 let mid = results.len() / 2;
                 let median = results[mid];
-                anyhow::Ok(median)
+                Ok(median)
             }
-            SensorImpl::CanBus { .. } => {
+            SensorImpl::CanBus { twai } => {
-                todo!()
+                Err(FatError::String {error: "Not yet implemented".to_string()})
             }
         }
     }

rust/src/hal/water.rs

@@ -1,171 +1,171 @@
-use crate::hal::TANK_MULTI_SAMPLE;
+use crate::bail;
-use anyhow::{anyhow, bail};
+use crate::hal::{ADC1, TANK_MULTI_SAMPLE};
-use ds18b20::Ds18b20;
+use crate::fat_error::FatError;
-use esp_idf_hal::adc::oneshot::config::AdcChannelConfig;
+use embassy_time::Timer;
-use esp_idf_hal::adc::oneshot::{AdcChannelDriver, AdcDriver};
+use esp_hal::analog::adc::{Adc, AdcConfig, AdcPin, Attenuation};
-use esp_idf_hal::adc::{attenuation, Resolution, ADC1};
+use esp_hal::delay::Delay;
-use esp_idf_hal::delay::Delay;
+use esp_hal::gpio::{Flex, Input, Output, OutputConfig, Pull};
-use esp_idf_hal::gpio::{AnyIOPin, AnyInputPin, Gpio5, InputOutput, PinDriver, Pull};
+use esp_hal::pcnt::unit::Unit;
-use esp_idf_hal::pcnt::{
+use esp_hal::peripherals::GPIO5;
-    PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex, PCNT1,
+use esp_hal::Blocking;
-};
+use esp_println::println;
-use esp_idf_sys::EspError;
+use littlefs2::object_safe::DynStorage;
-use one_wire_bus::OneWire;
+use onewire::{ds18b20, Device, DeviceSearch, OneWire, DS18B20};
 
 pub struct TankSensor<'a> {
-    one_wire_bus: OneWire<PinDriver<'a, AnyIOPin, InputOutput>>,
+    one_wire_bus: OneWire<Flex<'a>>,
-    tank_channel: AdcChannelDriver<'a, Gpio5, AdcDriver<'a, ADC1>>,
+    tank_channel: Adc<'a, ADC1<'a>, Blocking>,
-    tank_power: PinDriver<'a, AnyIOPin, InputOutput>,
+    tank_power: Output<'a>,
-    flow_counter: PcntDriver<'a>,
+    tank_pin: AdcPin<GPIO5<'a>, ADC1<'a>>,
-    delay: Delay,
+    // flow_counter: PcntDriver<'a>,
+    // delay: Delay,
 }
 
 impl<'a> TankSensor<'a> {
     pub(crate) fn create(
-        one_wire_pin: AnyIOPin,
+        mut one_wire_pin: Flex<'a>,
-        adc1: ADC1,
+        adc1: ADC1<'a>,
-        gpio5: Gpio5,
+        gpio5: GPIO5<'a>,
-        tank_power_pin: AnyIOPin,
+        tank_power: Output<'a>,
-        flow_sensor_pin: AnyIOPin,
+        flow_sensor: Input,
-        pcnt1: PCNT1,
+        pcnt1: Unit<'a, 1>,
-    ) -> anyhow::Result<TankSensor<'a>> {
+    ) -> Result<TankSensor<'a>, FatError> {
-        let mut one_wire_pin =
+        one_wire_pin.apply_output_config(&OutputConfig::default().with_pull(Pull::None));
-            PinDriver::input_output_od(one_wire_pin).expect("Failed to configure pin");
-        one_wire_pin
-            .set_pull(Pull::Floating)
-            .expect("Failed to set pull");
 
-        let adc_config = AdcChannelConfig {
+        let mut adc1_config = AdcConfig::new();
-            attenuation: attenuation::DB_11,
+        let tank_pin = adc1_config.enable_pin(gpio5, Attenuation::_11dB);
-            resolution: Resolution::Resolution12Bit,
+        let mut tank_channel = Adc::new(adc1, adc1_config);
-            calibration: esp_idf_hal::adc::oneshot::config::Calibration::Curve,
-        };
-        let tank_driver = AdcDriver::new(adc1).expect("Failed to configure ADC");
-        let tank_channel = AdcChannelDriver::new(tank_driver, gpio5, &adc_config)
-            .expect("Failed to configure ADC channel");
 
-        let mut tank_power =
+        let one_wire_bus = OneWire::new(one_wire_pin, false);
-            PinDriver::input_output(tank_power_pin).expect("Failed to configure pin");
-        tank_power
-            .set_pull(Pull::Floating)
-            .expect("Failed to set pull");
-
-        let one_wire_bus =
-            OneWire::new(one_wire_pin).expect("OneWire bus did not pull up after release");
-
-        let mut flow_counter = PcntDriver::new(
-            pcnt1,
-            Some(flow_sensor_pin),
-            Option::<AnyInputPin>::None,
-            Option::<AnyInputPin>::None,
-            Option::<AnyInputPin>::None,
-        )?;
-
-        flow_counter.channel_config(
-            PcntChannel::Channel1,
-            PinIndex::Pin0,
-            PinIndex::Pin1,
-            &PcntChannelConfig {
-                lctrl_mode: PcntControlMode::Keep,
-                hctrl_mode: PcntControlMode::Keep,
-                pos_mode: PcntCountMode::Increment,
-                neg_mode: PcntCountMode::Hold,
-                counter_h_lim: i16::MAX,
-                counter_l_lim: 0,
-            },
-        )?;
 
+        //
+        // let mut flow_counter = PcntDriver::new(
+        //     pcnt1,
+        //     Some(flow_sensor_pin),
+        //     Option::<AnyInputPin>::None,
+        //     Option::<AnyInputPin>::None,
+        //     Option::<AnyInputPin>::None,
+        // )?;
+        //
+        // flow_counter.channel_config(
+        //     PcntChannel::Channel1,
+        //     PinIndex::Pin0,
+        //     PinIndex::Pin1,
+        //     &PcntChannelConfig {
+        //         lctrl_mode: PcntControlMode::Keep,
+        //         hctrl_mode: PcntControlMode::Keep,
+        //         pos_mode: PcntCountMode::Increment,
+        //         neg_mode: PcntCountMode::Hold,
+        //         counter_h_lim: i16::MAX,
+        //         counter_l_lim: 0,
+        //     },
+        // )?;
+        //
         Ok(TankSensor {
             one_wire_bus,
             tank_channel,
             tank_power,
-            flow_counter,
+            tank_pin, //     flow_counter,
-            delay: Default::default(),
+                      //     delay: Default::default(),
         })
     }
 
     pub fn reset_flow_meter(&mut self) {
-        self.flow_counter.counter_pause().unwrap();
+        // self.flow_counter.counter_pause().unwrap();
-        self.flow_counter.counter_clear().unwrap();
+        // self.flow_counter.counter_clear().unwrap();
     }
 
     pub fn start_flow_meter(&mut self) {
-        self.flow_counter.counter_resume().unwrap();
+        //self.flow_counter.counter_resume().unwrap();
     }
 
     pub fn get_flow_meter_value(&mut self) -> i16 {
-        self.flow_counter.get_counter_value().unwrap()
+        //self.flow_counter.get_counter_value().unwrap()
+        5_i16
     }
 
     pub fn stop_flow_meter(&mut self) -> i16 {
-        self.flow_counter.counter_pause().unwrap();
+        //self.flow_counter.counter_pause().unwrap();
         self.get_flow_meter_value()
     }
 
-    pub fn water_temperature_c(&mut self) -> anyhow::Result<f32> {
+    pub async fn water_temperature_c(&mut self) -> Result<f32, FatError> {
         //multisample should be moved to water_temperature_c
         let mut attempt = 1;
-        let water_temp: Result<f32, anyhow::Error> = loop {
+        let mut delay = Delay::new();
-            let temp = self.single_temperature_c();
+        self.one_wire_bus.reset(&mut delay)?;
-            match &temp {
+        let mut search = DeviceSearch::new();
-                Ok(res) => {
+        let mut water_temp_sensor: Option<Device> = None;
-                    println!("Water temp is {}", res);
+        while let Some(device) = self.one_wire_bus.search_next(&mut search, &mut delay)? {
-                    break temp;
+            if device.address[0] == ds18b20::FAMILY_CODE {
-                }
+                water_temp_sensor = Some(device);
-                Err(err) => {
+                break;
-                    println!("Could not get water temp {} attempt {}", err, attempt)
-                }
             }
-            if attempt == 5 {
+        }
-                break temp;
+        match water_temp_sensor {
+            Some(device) => {
+                println!("Found one wire device: {:?}", device);
+                let mut water_temp_sensor = DS18B20::new(device)?;
+
+                let water_temp: Result<f32, FatError> = loop {
+                    let temp = self
+                        .single_temperature_c(&mut water_temp_sensor, &mut delay)
+                        .await;
+                    match &temp {
+                        Ok(res) => {
+                            println!("Water temp is {}", res);
+                            break temp;
+                        }
+                        Err(err) => {
+                            println!("Could not get water temp {} attempt {}", err, attempt)
+                        }
+                    }
+                    if attempt == 5 {
+                        break temp;
+                    }
+                    attempt += 1;
+                };
+                water_temp
             }
-            attempt += 1;
+            None => {
-        };
+                bail!("Not found any one wire Ds18b20");
-        water_temp
+            }
+        }
     }
 
-    fn single_temperature_c(&mut self) -> anyhow::Result<f32> {
+    async fn single_temperature_c(
-        self.one_wire_bus
+        &mut self,
-            .reset(&mut self.delay)
+        sensor: &mut DS18B20,
-            .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
+        delay: &mut Delay,
-        let first = self.one_wire_bus.devices(false, &mut self.delay).next();
+    ) -> Result<f32, FatError> {
-        if first.is_none() {
+        let resolution = sensor.measure_temperature(&mut self.one_wire_bus, delay)?;
-            bail!("Not found any one wire  Ds18b20");
+        Timer::after_millis(resolution.time_ms() as u64).await;
-        }
+        let temperature = sensor.read_temperature(&mut self.one_wire_bus, delay)? as f32;
-        let device_address = first
+        if temperature == 85_f32 {
-            .unwrap()
-            .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
-
-        let water_temp_sensor = Ds18b20::new::<EspError>(device_address)
-            .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
-
-        water_temp_sensor
-            .start_temp_measurement(&mut self.one_wire_bus, &mut self.delay)
-            .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
-        ds18b20::Resolution::Bits12.delay_for_measurement_time(&mut self.delay);
-        let sensor_data = water_temp_sensor
-            .read_data(&mut self.one_wire_bus, &mut self.delay)
-            .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
-        if sensor_data.temperature == 85_f32 {
             bail!("Ds18b20 dummy temperature returned");
         }
-        anyhow::Ok(sensor_data.temperature / 10_f32)
+        Ok(temperature / 10_f32)
     }
 
-    pub fn tank_sensor_voltage(&mut self) -> anyhow::Result<f32> {
+    pub async fn tank_sensor_voltage(&mut self) -> Result<f32, FatError> {
-        self.tank_power.set_high()?;
+        self.tank_power.set_high();
         //let stabilize
-        self.delay.delay_ms(100);
+        Timer::after_millis(100).await;
 
         let mut store = [0_u16; TANK_MULTI_SAMPLE];
         for multisample in 0..TANK_MULTI_SAMPLE {
-            let value = self.tank_channel.read()?;
+            let mut asy = (&mut self.tank_channel);
-            store[multisample] = value;
+
+            let value = asy.read_oneshot(&mut self.tank_pin);
+            //force yield
+            Timer::after_millis(10).await;
+            store[multisample] = value.unwrap();
         }
-        self.tank_power.set_low()?;
+        self.tank_power.set_low();
 
         store.sort();
-        let median_mv = store[6] as f32 / 1000_f32;
+        //TODO probably wrong? check!
-        anyhow::Ok(median_mv)
+        let median_mv = store[6] as f32 * 3300_f32 / 4096_f32;
+        Ok(median_mv)
     }
 }

rust/src/lib.rs

@@ -1,4 +0,0 @@
-#![allow(dead_code)]
-extern crate embedded_hal as hal;
-
-pub mod sipo;

rust/src/log/mod.rs

@@ -1,42 +1,142 @@
+use crate::hal::TIME_ACCESS;
+use crate::vec;
+use alloc::string::ToString;
+use alloc::vec::Vec;
+use bytemuck::{AnyBitPattern, Pod, Zeroable};
+use deranged::RangedU8;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
+use embassy_sync::mutex::Mutex;
+use esp_hal::Persistable;
+use log::info;
 use serde::Serialize;
-use std::{collections::HashMap, sync::Mutex};
-use strum::EnumIter;
 use strum_macros::IntoStaticStr;
-
-use esp_idf_svc::systime::EspSystemTime;
-use once_cell::sync::Lazy;
-use ringbuffer::{ConstGenericRingBuffer, RingBuffer};
-use text_template::Template;
 use unit_enum::UnitEnum;
 
+const LOG_ARRAY_SIZE: u8 = 220;
+const MAX_LOG_ARRAY_INDEX: u8 = LOG_ARRAY_SIZE - 1;
+#[esp_hal::ram(rtc_fast, persistent)]
+static mut LOG_ARRAY: LogArray = LogArray {
+    buffer: [LogEntryInner {
+        timestamp: 0,
+        message_id: 0,
+        a: 0,
+        b: 0,
+        txt_short: [0; TXT_SHORT_LENGTH],
+        txt_long: [0; TXT_LONG_LENGTH],
+    }; LOG_ARRAY_SIZE as usize],
+    head: 0,
+};
+pub static LOG_ACCESS: Mutex<CriticalSectionRawMutex, &'static mut LogArray> =
+    unsafe { Mutex::new(&mut *&raw mut LOG_ARRAY) };
+
 const TXT_SHORT_LENGTH: usize = 8;
 const TXT_LONG_LENGTH: usize = 32;
 
-const BUFFER_SIZE: usize = 220;
+#[derive(Debug, Clone, Copy, AnyBitPattern)]
+#[repr(C)]
+pub struct LogArray {
+    buffer: [LogEntryInner; LOG_ARRAY_SIZE as usize],
+    head: u8,
+}
 
-#[link_section = ".rtc.data"]
+unsafe impl Persistable for LogArray {}
-static mut BUFFER: ConstGenericRingBuffer<LogEntry, BUFFER_SIZE> =
+unsafe impl Zeroable for LogEntryInner {}
-    ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE>::new();
-#[allow(static_mut_refs)]
-static BUFFER_ACCESS: Lazy<Mutex<&mut ConstGenericRingBuffer<LogEntry, BUFFER_SIZE>>> =
-    Lazy::new(|| unsafe { Mutex::new(&mut BUFFER) });
 
-#[derive(Serialize, Debug, Clone)]
+unsafe impl Pod for LogEntryInner {}
+
+#[derive(Debug, Clone, Copy)]
+struct LogEntryInner {
+    pub timestamp: u64,
+    pub message_id: u16,
+    pub a: u32,
+    pub b: u32,
+    pub txt_short: [u8; TXT_SHORT_LENGTH],
+    pub txt_long: [u8; TXT_LONG_LENGTH],
+}
+
+#[derive(Serialize)]
 pub struct LogEntry {
     pub timestamp: u64,
     pub message_id: u16,
     pub a: u32,
     pub b: u32,
-    pub txt_short: heapless::String<TXT_SHORT_LENGTH>,
+    pub txt_short: alloc::string::String,
-    pub txt_long: heapless::String<TXT_LONG_LENGTH>,
+    pub txt_long: alloc::string::String,
 }
 
-pub fn init() {
+impl From<LogEntryInner> for LogEntry {
-    unsafe {
+    fn from(value: LogEntryInner) -> Self {
-        BUFFER = ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE>::new();
+        LogEntry {
-    };
+            timestamp: value.timestamp,
-    let mut access = BUFFER_ACCESS.lock().unwrap();
+            message_id: value.message_id,
-    access.drain().for_each(|_| {});
+            a: value.a,
+            b: value.b,
+            txt_short: alloc::string::String::from_utf8_lossy_owned(value.txt_short.to_vec()),
+            txt_long: alloc::string::String::from_utf8_lossy_owned(value.txt_long.to_vec()),
+        }
+    }
+}
+
+impl LogArray {
+    pub fn get(&mut self) -> Vec<LogEntry> {
+        let head: RangedU8<0, MAX_LOG_ARRAY_INDEX> =
+            RangedU8::new(self.head).unwrap_or(RangedU8::new(0).unwrap());
+
+        let mut rv: Vec<LogEntry> = Vec::new();
+        let mut index = head.wrapping_sub(1);
+        for _ in 0..self.buffer.len() {
+            let entry = self.buffer[index.get() as usize];
+            if (entry.message_id as usize) != LogMessage::Empty.ordinal() {
+                rv.push(entry.into());
+            }
+            index = index.wrapping_sub(1);
+        }
+        rv
+    }
+
+    pub async fn log(
+        &mut self,
+        message_key: LogMessage,
+        number_a: u32,
+        number_b: u32,
+        txt_short: &str,
+        txt_long: &str,
+    ) {
+        let mut head: RangedU8<0, MAX_LOG_ARRAY_INDEX> =
+            RangedU8::new(self.head).unwrap_or(RangedU8::new(0).unwrap());
+
+        let mut txt_short_stack: heapless::String<TXT_SHORT_LENGTH> = heapless::String::new();
+        let mut txt_long_stack: heapless::String<TXT_LONG_LENGTH> = heapless::String::new();
+
+        limit_length(txt_short, &mut txt_short_stack);
+        limit_length(txt_long, &mut txt_long_stack);
+
+        let time = TIME_ACCESS.get().await.current_time_us() / 1000;
+
+        let ordinal = message_key.ordinal() as u16;
+        let template: &str = message_key.into();
+        let mut template_string = template.to_string();
+        template_string = template_string.replace("${number_a}", number_a.to_string().as_str());
+        template_string = template_string.replace("${number_b}", number_b.to_string().as_str());
+        template_string = template_string.replace("${txt_long}", txt_long);
+        template_string = template_string.replace("${txt_short}", txt_short);
+
+        info!("{}", template_string);
+
+        let to_modify = &mut self.buffer[head.get() as usize];
+        to_modify.timestamp = time;
+        to_modify.message_id = ordinal;
+        to_modify.a = number_a;
+        to_modify.b = number_b;
+        to_modify
+            .txt_short
+            .clone_from_slice(&txt_short_stack.as_bytes());
+        to_modify
+            .txt_long
+            .clone_from_slice(&txt_long_stack.as_bytes());
+        head = head.wrapping_add(1);
+        self.head = head.get();
+    }
 }
 
 fn limit_length<const LIMIT: usize>(input: &str, target: &mut heapless::String<LIMIT>) {
@@ -55,79 +155,15 @@ fn limit_length<const LIMIT: usize>(input: &str, target: &mut heapless::String<L
             }
         }
     }
-}
+    while target.len() < LIMIT {
-
+        target.push(' ').unwrap();
-pub fn get_log() -> Vec<LogEntry> {
-    let buffer = BUFFER_ACCESS.lock().unwrap();
-    let mut read_copy = Vec::new();
-    for entry in buffer.iter() {
-        let copy = entry.clone();
-        read_copy.push(copy);
-    }
-    drop(buffer);
-    read_copy
-}
-
-pub fn log(message_key: LogMessage, number_a: u32, number_b: u32, txt_short: &str, txt_long: &str) {
-    let mut txt_short_stack: heapless::String<TXT_SHORT_LENGTH> = heapless::String::new();
-    let mut txt_long_stack: heapless::String<TXT_LONG_LENGTH> = heapless::String::new();
-
-    limit_length(txt_short, &mut txt_short_stack);
-    limit_length(txt_long, &mut txt_long_stack);
-
-    let time = EspSystemTime {}.now().as_millis() as u64;
-
-    let ordinal = message_key.ordinal() as u16;
-    let template_string: &str = message_key.into();
-
-    let mut values: HashMap<&str, &str> = HashMap::new();
-    let number_a_str = number_a.to_string();
-    let number_b_str = number_b.to_string();
-
-    values.insert("number_a", &number_a_str);
-    values.insert("number_b", &number_b_str);
-    values.insert("txt_short", txt_short);
-    values.insert("txt_long", txt_long);
-
-    let template = Template::from(template_string);
-    let serial_entry = template.fill_in(&values);
-
-    println!("{serial_entry}");
-    //TODO push to mqtt?
-
-    let entry = LogEntry {
-        timestamp: time,
-        message_id: ordinal,
-        a: number_a,
-        b: number_b,
-        txt_short: txt_short_stack,
-        txt_long: txt_long_stack,
-    };
-
-    let mut buffer = BUFFER_ACCESS.lock().unwrap();
-    buffer.push(entry);
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn within_limit() {
-        let test = "12345678";
-
-        let mut txt_short_stack: heapless::String<TXT_SHORT_LENGTH> = heapless::String::new();
-        let mut txt_long_stack: heapless::String<TXT_LONG_LENGTH> = heapless::String::new();
-        limit_length(test, &mut txt_short_stack);
-        limit_length(test, &mut txt_long_stack);
-
-        assert_eq!(txt_short_stack.as_str(), test);
-        assert_eq!(txt_long_stack.as_str(), test);
     }
 }
 
-#[derive(IntoStaticStr, EnumIter, Serialize, PartialEq, Eq, PartialOrd, Ord, Clone, UnitEnum)]
+#[derive(IntoStaticStr, Serialize, PartialEq, Eq, PartialOrd, Ord, Clone, UnitEnum)]
 pub enum LogMessage {
+    #[strum(serialize = "")]
+    Empty,
     #[strum(
         serialize = "Reset due to ${txt_long} requires rtc clear ${number_a} and force config mode ${number_b}"
     )]

rust/src/plant_state.rs

@@ -3,6 +3,7 @@ use crate::{
     hal::{Sensor, HAL},
     in_time_range,
 };
+use alloc::string::{String, ToString};
 use chrono::{DateTime, TimeDelta, Utc};
 use chrono_tz::Tz;
 use serde::{Deserialize, Serialize};
@@ -115,9 +116,9 @@ fn map_range_moisture(
 }
 
 impl PlantState {
-    pub fn read_hardware_state(plant_id: usize, board: &mut HAL) -> Self {
+    pub async fn read_hardware_state(plant_id: usize, board: &mut HAL<'_>) -> Self {
         let sensor_a = if board.board_hal.get_config().plants[plant_id].sensor_a {
-            match board.board_hal.measure_moisture_hz(plant_id, Sensor::A) {
+            match board.board_hal.measure_moisture_hz(plant_id, Sensor::A).await {
                 Ok(raw) => match map_range_moisture(
                     raw,
                     board.board_hal.get_config().plants[plant_id].moisture_sensor_min_frequency,
@@ -138,7 +139,7 @@ impl PlantState {
         };
 
         let sensor_b = if board.board_hal.get_config().plants[plant_id].sensor_b {
-            match board.board_hal.measure_moisture_hz(plant_id, Sensor::B) {
+            match board.board_hal.measure_moisture_hz(plant_id, Sensor::B).await {
                 Ok(raw) => match map_range_moisture(
                     raw,
                     board.board_hal.get_config().plants[plant_id].moisture_sensor_min_frequency,
@@ -238,7 +239,7 @@ impl PlantState {
             }
             PlantWateringMode::MinMoisture => {
                 let (moisture_percent, _) = self.plant_moisture();
-                if let Some(moisture_percent) = moisture_percent {
+                if let Some(_moisture_percent) = moisture_percent {
                     if self.pump_in_timeout(plant_conf, current_time) {
                         false
                     } else if !in_time_range(
@@ -247,10 +248,10 @@ impl PlantState {
                         plant_conf.pump_hour_end,
                     ) {
                         false
-                    } else if (true) {
+                    } else if true {
                         //if not cooldown min and below max
                         true
-                    } else if (true) {
+                    } else if true {
                         //if below min disable cooldown min
                         true
                     } else {
@@ -263,50 +264,50 @@ impl PlantState {
             PlantWateringMode::TimerOnly => !self.pump_in_timeout(plant_conf, current_time),
         }
     }
-
+    //
-    pub fn to_mqtt_info(
+    // pub fn to_mqtt_info(
-        &self,
+    //     &self,
-        plant_conf: &PlantConfig,
+    //     plant_conf: &PlantConfig,
-        current_time: &DateTime<Tz>,
+    //     current_time: &DateTime<Tz>,
-    ) -> PlantInfo<'_> {
+    // ) -> PlantInfo<'_> {
-        PlantInfo {
+    //     PlantInfo {
-            sensor_a: &self.sensor_a,
+    //         sensor_a: &self.sensor_a,
-            sensor_b: &self.sensor_b,
+    //         sensor_b: &self.sensor_b,
-            mode: plant_conf.mode,
+    //         mode: plant_conf.mode,
-            do_water: self.needs_to_be_watered(plant_conf, current_time),
+    //         do_water: self.needs_to_be_watered(plant_conf, current_time),
-            dry: if let Some(moisture_percent) = self.plant_moisture().0 {
+    //         dry: if let Some(moisture_percent) = self.plant_moisture().0 {
-                moisture_percent < plant_conf.target_moisture
+    //             moisture_percent < plant_conf.target_moisture
-            } else {
+    //         } else {
-                false
+    //             false
-            },
+    //         },
-            cooldown: self.pump_in_timeout(plant_conf, current_time),
+    //         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,
+    //             current_time,
-                plant_conf.pump_hour_start,
+    //             plant_conf.pump_hour_start,
-                plant_conf.pump_hour_end,
+    //             plant_conf.pump_hour_end,
-            ),
+    //         ),
-            consecutive_pump_count: self.pump.consecutive_pump_count,
+    //         consecutive_pump_count: self.pump.consecutive_pump_count,
-            pump_error: self.pump.is_err(plant_conf),
+    //         pump_error: self.pump.is_err(plant_conf),
-            last_pump: self
+    //         last_pump: self
-                .pump
+    //             .pump
-                .previous_pump
+    //             .previous_pump
-                .map(|t| t.with_timezone(&current_time.timezone())),
+    //             .map(|t| t.with_timezone(&current_time.timezone())),
-            next_pump: if matches!(
+    //         next_pump: if matches!(
-                plant_conf.mode,
+    //             plant_conf.mode,
-                PlantWateringMode::TimerOnly
+    //             PlantWateringMode::TimerOnly
-                    | PlantWateringMode::TargetMoisture
+    //                 | PlantWateringMode::TargetMoisture
-                    | PlantWateringMode::MinMoisture
+    //                 | PlantWateringMode::MinMoisture
-            ) {
+    //         ) {
-                self.pump.previous_pump.and_then(|last_pump| {
+    //             self.pump.previous_pump.and_then(|last_pump| {
-                    last_pump
+    //                 last_pump
-                        .checked_add_signed(TimeDelta::minutes(plant_conf.pump_cooldown_min.into()))
+    //                     .checked_add_signed(TimeDelta::minutes(plant_conf.pump_cooldown_min.into()))
-                        .map(|t| t.with_timezone(&current_time.timezone()))
+    //                     .map(|t| t.with_timezone(&current_time.timezone()))
-                })
+    //             })
-            } else {
+    //         } else {
-                None
+    //             None
-            },
+    //         },
-        }
+    //     }
-    }
+    // }
 }
 
 #[derive(Debug, PartialEq, Serialize)]
@@ -329,8 +330,8 @@ pub struct PlantInfo<'a> {
     /// how often has the pump been watered without reaching target moisture
     consecutive_pump_count: u32,
     pump_error: Option<PumpError>,
-    /// last time when the pump was active
+    // /// last time when the pump was active
-    last_pump: Option<DateTime<Tz>>,
+    // last_pump: Option<DateTime<Tz>>,
-    /// next time when pump should activate
+    // /// next time when pump should activate
-    next_pump: Option<DateTime<Tz>>,
+    // next_pump: Option<DateTime<Tz>>,
 }

rust/src/sipo.rs

@@ -1,10 +1,11 @@
 //! Serial-in parallel-out shift register
 
 use core::cell::RefCell;
+use core::convert::Infallible;
+use core::iter::Iterator;
 use core::mem::{self, MaybeUninit};
-use std::convert::Infallible;
+use core::result::{Result, Result::Ok};
-
+use embedded_hal::digital::OutputPin;
-use hal::digital::OutputPin;
 
 trait ShiftRegisterInternal {
     fn update(&self, index: usize, command: bool) -> Result<(), ()>;

rust/src/tank.rs

@@ -1,5 +1,9 @@
-use crate::{config::TankConfig, hal::HAL};
+use crate::alloc::string::{String, ToString};
-use anyhow::Context;
+use crate::config::TankConfig;
+use crate::hal::HAL;
+use crate::fat_error::FatResult;
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
+use embassy_sync::mutex::MutexGuard;
 use serde::Serialize;
 
 const OPEN_TANK_VOLTAGE: f32 = 3.0;
@@ -113,7 +117,7 @@ impl TankState {
         }
     }
 
-    pub fn as_mqtt_info(&self, config: &TankConfig, water_temp: &anyhow::Result<f32>) -> TankInfo {
+    pub fn as_mqtt_info(&self, config: &TankConfig, water_temp: &FatResult<f32>) -> TankInfo {
         let mut tank_err: Option<TankError> = None;
         let left_ml = match self.left_ml(config) {
             Err(err) => {
@@ -150,15 +154,16 @@ impl TankState {
     }
 }
 
-pub fn determine_tank_state(board: &mut std::sync::MutexGuard<'_, HAL<'_>>) -> TankState {
+pub async fn determine_tank_state(
+    board: &mut MutexGuard<'static, CriticalSectionRawMutex, HAL<'static>>,
+) -> TankState {
     if board.board_hal.get_config().tank.tank_sensor_enabled {
         match board
             .board_hal
             .get_tank_sensor()
-            .context("no sensor")
+            .and_then(|f| core::prelude::v1::Ok(f.tank_sensor_voltage()))
-            .and_then(|f| f.tank_sensor_voltage())
         {
-            Ok(raw_sensor_value_mv) => TankState::Present(raw_sensor_value_mv),
+            Ok(raw_sensor_value_mv) => TankState::Present(raw_sensor_value_mv.await.unwrap()),
             Err(err) => TankState::Error(TankError::BoardError(err.to_string())),
         }
     } else {
@@ -170,20 +175,20 @@ pub fn determine_tank_state(board: &mut std::sync::MutexGuard<'_, HAL<'_>>) -> T
 /// Information structure send to mqtt for monitoring purposes
 pub struct TankInfo {
     /// there is enough water in the tank
-    enough_water: bool,
+    pub(crate) enough_water: bool,
     /// warning that water needs to be refilled soon
-    warn_level: bool,
+    pub(crate) warn_level: bool,
     /// estimation how many ml are still in the tank
-    left_ml: Option<f32>,
+    pub(crate) left_ml: Option<f32>,
     /// if there is an issue with the water level sensor
-    sensor_error: Option<TankError>,
+    pub(crate) sensor_error: Option<TankError>,
     /// raw water sensor value
-    raw: Option<f32>,
+    pub(crate) raw: Option<f32>,
     /// percent value
-    percent: Option<f32>,
+    pub(crate) percent: Option<f32>,
     /// water in the tank might be frozen
-    water_frozen: bool,
+    pub(crate) water_frozen: bool,
     /// water temperature
-    water_temp: Option<f32>,
+    pub(crate) water_temp: Option<f32>,
-    temp_sensor_error: Option<String>,
+    pub(crate) temp_sensor_error: Option<String>,
 }

rust/src/webserver/.gitignore

@@ -0,0 +1,2 @@
+index.html.gz
+bundle.js.gz

rust/src_webpack/.gitignore

@@ -0,0 +1,2 @@
+bundle.js
+index.html

rust/src_webpack/package.json

@@ -1,5 +1,6 @@
 {
   "devDependencies": {
+    "compression-webpack-plugin": "^11.1.0",
     "html-webpack-harddisk-plugin": "^2.0.0",
     "html-webpack-plugin": "^5.6.3",
     "raw-loader": "^4.0.2",

rust/src_webpack/src/api.ts

@@ -29,6 +29,8 @@ export interface NetworkConfig {
     password: string,
     mqtt_url: string,
     base_topic: string,
+    mqtt_user: string | null,
+    mqtt_password: string | null,
     max_wait: number
 }
 

rust/src_webpack/src/main.ts

@@ -69,45 +69,44 @@ export class Controller {
             });
     }
 
-    getBackupInfo(): Promise<void> {
+    async getBackupInfo(): Promise<void> {
-        return fetch(PUBLIC_URL + "/backup_info")
+        try {
-            .then(response => response.json())
+            const response = await fetch(PUBLIC_URL + "/backup_info");
-            .then(json => json as BackupHeader)
+            const json = await response.json();
-            .then(header => {
+            const header = json as BackupHeader;
-                controller.submitView.setBackupInfo(header)
+            controller.submitView.setBackupInfo(header);
-            })
+        } catch (error) {
-            .catch(error => {
+            console.log(error);
-                console.log(error);
+        }
-            });
     }
 
-    populateTimezones(): Promise<void> {
+    async populateTimezones(): Promise<void> {
-        return fetch(PUBLIC_URL + '/timezones')
+        try {
-            .then(response => response.json())
+            const response = await fetch(PUBLIC_URL + '/timezones');
-            .then(json => json as string[])
+            const json = await response.json();
-            .then(timezones => {
+            const timezones = json as string[];
-                controller.timeView.timezones(timezones)
+            controller.timeView.timezones(timezones);
-            })
+        } catch (error) {
-            .catch(error => console.error('Error fetching timezones:', error));
+            return console.error('Error fetching timezones:', error);
+        }
     }
 
-    updateFileList(): Promise<void> {
+    async updateFileList(): Promise<void> {
-        return fetch(PUBLIC_URL + "/files")
+        try {
-            .then(response => response.json())
+            const response = await fetch(PUBLIC_URL + "/files");
-            .then(json => json as FileList)
+            const json = await response.json();
-            .then(filelist => {
+            const filelist = json as FileList;
-                controller.fileview.setFileList(filelist, PUBLIC_URL)
+            controller.fileview.setFileList(filelist, PUBLIC_URL);
-            })
+        } catch (error) {
-            .catch(error => {
+            console.log(error);
-                console.log(error);
+        }
-            });
     }
 
     uploadFile(file: File, name: string) {
-        var current = 0;
+        let current = 0;
-        var max = 100;
+        let max = 100;
         controller.progressview.addProgress("file_upload", (current / max) * 100, "Uploading File " + name + "(" + current + "/" + max + ")")
-        var ajax = new XMLHttpRequest();
+        const ajax = new XMLHttpRequest();
         ajax.upload.addEventListener("progress", event => {
             current = event.loaded / 1000;
             max = event.total / 1000;
@@ -133,7 +132,7 @@ export class Controller {
 
     deleteFile(name: string) {
         controller.progressview.addIndeterminate("file_delete", "Deleting " + name);
-        var ajax = new XMLHttpRequest();
+        const ajax = new XMLHttpRequest();
         ajax.open("DELETE", PUBLIC_URL + "/file?filename=" + name);
         ajax.send();
         ajax.addEventListener("error", () => {
@@ -153,50 +152,47 @@ export class Controller {
         controller.updateFileList()
     }
 
-    updateRTCData(): Promise<void> {
+    async updateRTCData(): Promise<void> {
-        return fetch(PUBLIC_URL + "/time")
+        try {
-            .then(response => response.json())
+            const response = await fetch(PUBLIC_URL + "/time");
-            .then(json => json as GetTime)
+            const json = await response.json();
-            .then(time => {
+            const time = json as GetTime;
-                controller.timeView.update(time.native, time.rtc)
+            controller.timeView.update(time.native, time.rtc);
-            })
+        } catch (error) {
-            .catch(error => {
+            controller.timeView.update("n/a", "n/a");
-                controller.timeView.update("n/a", "n/a")
+            console.log(error);
-                console.log(error);
+        }
-            });
     }
 
-    updateBatteryData(): Promise<void> {
+    async updateBatteryData(): Promise<void> {
-        return fetch(PUBLIC_URL + "/battery")
+        try {
-            .then(response => response.json())
+            const response = await fetch(PUBLIC_URL + "/battery");
-            .then(json => json as BatteryState)
+            const json = await response.json();
-            .then(battery => {
+            const battery = json as BatteryState;
-                controller.batteryView.update(battery)
+            controller.batteryView.update(battery);
-            })
+        } catch (error) {
-            .catch(error => {
+            controller.batteryView.update(null);
-                controller.batteryView.update(null)
+            console.log(error);
-                console.log(error);
+        }
-            })
     }
 
-    updateSolarData(): Promise<void> {
+    async updateSolarData(): Promise<void> {
-        return fetch(PUBLIC_URL + "/solar")
+        try {
-            .then(response => response.json())
+            const response = await fetch(PUBLIC_URL + "/solar");
-            .then(json => json as SolarState)
+            const json = await response.json();
-            .then(solar => {
+            const solar = json as SolarState;
-                controller.solarView.update(solar)
+            controller.solarView.update(solar);
-            })
+        } catch (error) {
-            .catch(error => {
+            controller.solarView.update(null);
-                controller.solarView.update(null)
+            console.log(error);
-                console.log(error);
+        }
-            })
     }
 
     uploadNewFirmware(file: File) {
-        var current = 0;
+        let current = 0;
-        var max = 100;
+        let max = 100;
         controller.progressview.addProgress("ota_upload", (current / max) * 100, "Uploading firmeware (" + current + "/" + max + ")")
-        var ajax = new XMLHttpRequest();
+        const ajax = new XMLHttpRequest();
         ajax.upload.addEventListener("progress", event => {
             current = event.loaded / 1000;
             max = event.total / 1000;
@@ -218,15 +214,13 @@ export class Controller {
         ajax.send(file);
     }
 
-    version(): Promise<void> {
+    async version(): Promise<void> {
         controller.progressview.addIndeterminate("version", "Getting buildVersion")
-        return fetch(PUBLIC_URL + "/version")
+        const response = await fetch(PUBLIC_URL + "/version");
-            .then(response => response.json())
+        const json = await response.json();
-            .then(json => json as VersionInfo)
+        const versionInfo = json as VersionInfo;
-            .then(versionInfo => {
+        controller.progressview.removeProgress("version");
-                controller.progressview.removeProgress("version")
+        controller.firmWareView.setVersion(versionInfo);
-                controller.firmWareView.setVersion(versionInfo);
-            })
     }
 
     getBackupConfig() {
@@ -243,7 +237,7 @@ export class Controller {
         controller.progressview.addIndeterminate("get_config", "Downloading Config")
         const response = await fetch(PUBLIC_URL + "/get_config");
         const loaded = await response.json();
-        var currentConfig = loaded as PlantControllerConfig;
+        const currentConfig = loaded as PlantControllerConfig;
         controller.setInitialConfig(currentConfig);
         controller.setConfig(currentConfig);
         //sync json view initially
@@ -261,19 +255,20 @@ export class Controller {
             method: "POST",
             body: json,
         })
-            .then(response => response.text())
+          .then(response => response.text())
-            .then(text => statusCallback(text))
+          .then(text => statusCallback(text))
-        controller.progressview.removeProgress("set_config")
+          .then( _ => {
-        //load from remote to be clean
+            controller.progressview.removeProgress("set_config");
-        controller.downloadConfig()
+            setTimeout(() => { controller.downloadConfig() }, 250)
+          })
     }
 
-    backupConfig(json: string): Promise<string> {
+    async backupConfig(json: string): Promise<string> {
-        return fetch(PUBLIC_URL + "/backup_config", {
+        const response = await fetch(PUBLIC_URL + "/backup_config", {
             method: "POST",
             body: json,
-        })
+        });
-            .then(response => response.text());
+        return await response.text();
     }
 
     syncRTCFromBrowser() {
@@ -310,9 +305,9 @@ export class Controller {
     }
 
     testNightLamp(active: boolean) {
-        var body: NightLampCommand = {
+        const body: NightLampCommand = {
             active: active
-        }
+        };
         var pretty = JSON.stringify(body, undefined, 1);
         fetch(PUBLIC_URL + "/lamptest", {
             method: "POST",

rust/src_webpack/src/network.html

@@ -72,8 +72,20 @@
                 </div>
                 <input class="mqttvalue" type="text" id="base_topic" placeholder="plants/one">        
             </div>
+            <div class="flexcontainer">
+                <div class="mqttkey">
+                    MQTT User
+                </div>
+                <input class="mqttvalue" type="text" id="mqtt_user" placeholder="">
+            </div>
+            <div class="flexcontainer">
+                <div class="mqttkey">
+                    MQTT Password
+                </div>
+                <input class="mqttvalue" type="text" id="mqtt_password" placeholder="">
+            </div>
         </div>
     </div>
     
 
-</div>
+</div>

rust/src_webpack/src/network.ts

@@ -16,6 +16,8 @@ export class NetworkConfigView {
     private readonly mqtt_url: HTMLInputElement;
     private readonly base_topic: HTMLInputElement;
     private readonly max_wait: HTMLInputElement;
+    private readonly mqtt_user: HTMLInputElement;
+    private readonly mqtt_password: HTMLInputElement;
     private readonly ssidlist: HTMLElement;
     
     constructor(controller: Controller, publicIp: string) {
@@ -37,6 +39,10 @@ export class NetworkConfigView {
       this.mqtt_url.onchange = controller.configChanged
       this.base_topic = document.getElementById("base_topic") as HTMLInputElement;
       this.base_topic.onchange = controller.configChanged
+      this.mqtt_user = document.getElementById("mqtt_user") as HTMLInputElement;
+      this.mqtt_user.onchange = controller.configChanged
+      this.mqtt_password = document.getElementById("mqtt_password") as HTMLInputElement;
+      this.mqtt_password.onchange = controller.configChanged
 
       this.ssidlist = document.getElementById("ssidlist") as HTMLElement
 
@@ -52,6 +58,8 @@ export class NetworkConfigView {
       this.password.value = network.password;
       this.mqtt_url.value = network.mqtt_url;
       this.base_topic.value = network.base_topic;
+      this.mqtt_user.value = network.mqtt_user ?? "";
+      this.mqtt_password.value = network.mqtt_password ?? "";
       this.max_wait.value = network.max_wait.toString();
     }
     
@@ -62,7 +70,9 @@ export class NetworkConfigView {
         ssid: this.ssid.value ?? null,
         password: this.password.value ?? null,
         mqtt_url: this.mqtt_url.value ?? null,
+        mqtt_user: this.mqtt_user.value ? this.mqtt_user.value : null,
+        mqtt_password: this.mqtt_password.value ? this.mqtt_password.value : null,
         base_topic: this.base_topic.value ?? null
       }
     }
-  }
+  }

rust/src_webpack/webpack.config.js

@@ -3,54 +3,60 @@ const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin');
 const CopyPlugin = require("copy-webpack-plugin");
+const CompressionPlugin = require("compression-webpack-plugin");
 
 const isDevServer = process.env.WEBPACK_SERVE;
 console.log("Dev server is " + isDevServer);
 var host;
-if (isDevServer){
+if (isDevServer) {
-  //ensure no trailing /
+    //ensure no trailing /
-  host = 'http://10.23.44.186';
+    host = 'http://10.23.44.186';
 } else {
-  host = '';
+    host = '';
 }
 
 module.exports = {
-  mode: "development",
+    mode: "development",
-  entry: ['./src/main.ts'],
+    entry: ['./src/main.ts'],
-  devtool: 'inline-source-map',
+    devtool: 'inline-source-map',
-  plugins: [
+    plugins: [
-    new webpack.DefinePlugin({
+        new webpack.DefinePlugin({
-      PUBLIC_URL: JSON.stringify(host),
+            PUBLIC_URL: JSON.stringify(host),
-    }),
+        }),
-    new webpack.EnvironmentPlugin({
+        new webpack.EnvironmentPlugin({
-      redirect: 'true'
+            redirect: 'true'
-    }),
+        }),
-    new HtmlWebpackPlugin({
+        new HtmlWebpackPlugin({
-      alwaysWriteToDisk: true,
+            alwaysWriteToDisk: true,
-      title: "PlantCtrl",
+            title: "PlantCtrl",
-    }),
+        }),
-    new HtmlWebpackHarddiskPlugin(),
+        new HtmlWebpackHarddiskPlugin(),
-  ],
+        new CompressionPlugin({
-  module: {
+            algorithm: "gzip",
-    rules: [
+            test: /\.js$|\.css$|\.html$/,
-      {
+            threshold: 0,
-      test: /\.html$/,
+            minRatio: 0.8
-      type: 'asset/source',
+        })
-      },
+    ],
-      {
+    module: {
-        test: /\.tsx?$/,
+        rules: [
-        use: 'ts-loader',
+            {
-        exclude: /node_modules/,
+                test: /\.html$/,
-      }
+                type: 'asset/source',
-    ]
+            },
-  },
+            {
-  resolve: {
+                test: /\.tsx?$/,
-    extensions: ['.tsx', '.ts', '.js', '.html'],
+                use: 'ts-loader',
-  },
+                exclude: /node_modules/,
-  output: {
+            }
-    filename: 'bundle.js',
+        ]
-    path: path.resolve(__dirname, '.'),
+    },
-  },
+    resolve: {
-  devServer: {
+        extensions: ['.tsx', '.ts', '.js', '.html'],
-  }
+    },
+    output: {
+        filename: 'bundle.js',
+        path: path.resolve(__dirname, '.'),
+    },
+    devServer: {}
 };