move all mqtt publishing functions to mqtt module

- fix: use tagged enum serialization for TankError
- fix: rename TankInfo fields for consistent naming (volume_ml, pct, water_temp_c)
- renamed some fields for better clarity on contained value

.gitignore

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

rust/all.sh

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

rust/build.rs

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

rust/build_website.sh

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

rust/erase_ota.sh

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

rust/flash.sh

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

rust/image_build.sh

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