diff --git a/rust/.cargo/config.toml b/rust/.cargo/config.toml index c78df86..4eb265e 100644 --- a/rust/.cargo/config.toml +++ b/rust/.cargo/config.toml @@ -5,7 +5,7 @@ target = "riscv32imac-esp-espidf" [target.riscv32imac-esp-espidf] linker = "ldproxy" #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 --baud 921600 --partition-table partitions.csv" # Select this runner for espflash v2.x.x +runner = "espflash flash --monitor --baud 921600 --flash-size 16mb --partition-table partitions.csv" #runner = "cargo runner" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index ee8e1ba..88bddf6 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Empire Phoenix"] edition = "2021" resolver = "2" -rust-version = "1.71" +#rust-version = "1.71" [profile.dev] # Explicitly disable LTO which the Xtensa codegen backend has issues @@ -91,5 +91,6 @@ ds323x = { git = "https://github.com/empirephoenix/ds323x-rs.git" } #bq34z100 = { path = "../../bq34z100_rust" } [build-dependencies] +cc = "=1.1.30" embuild = "0.32.0" vergen = { version = "8.2.6", features = ["build", "git", "gitcl"] } diff --git a/rust/partitions.csv b/rust/partitions.csv index 56d5cd7..3fdfc83 100644 --- a/rust/partitions.csv +++ b/rust/partitions.csv @@ -1,6 +1,6 @@ nvs, data, nvs, , 16k, otadata, data, ota, , 8k, phy_init, data, phy, , 4k, -ota_0, app, ota_0, , 1792K, -ota_1, app, ota_1, , 1792K, -storage, data, spiffs, , 400K, \ No newline at end of file +ota_0, app, ota_0, , 6M, +ota_1, app, ota_1, , 6M, +storage, data, spiffs, , 3800k, \ No newline at end of file diff --git a/rust/src_webpack/src/main.html b/rust/src_webpack/src/main.html index 4fef870..0b6f260 100644 --- a/rust/src_webpack/src/main.html +++ b/rust/src_webpack/src/main.html @@ -85,11 +85,47 @@ } .plantcontainer { - min-width: 200px; - border-style: solid; - border-width: 1px; - padding: 8px; + flex-grow: 1; + min-width: 100%; + border-style: solid; + border-width: 1px; + padding: 8px; + } + @media (min-width: 350px) { + .plantcontainer { + flex-grow: 1; + min-width: 40%; + border-style: solid; + border-width: 1px; + padding: 8px; + } } + @media (min-width: 900px) { + .plantcontainer { + flex-grow: 1; + min-width: 20%; + border-style: solid; + border-width: 1px; + padding: 8px; + } + } + @media (min-width: 1800px) { + .plantcontainer { + flex-grow: 1; + min-width: 200px; + border-style: solid; + border-width: 1px; + padding: 8px; + } + } + + + + .plantlist { + display: flex; + flex-wrap: wrap; + } + .subtitle { flex-grow: 1; text-align: center; @@ -140,18 +176,32 @@ width: 100%; } - .lightpre{ + .lightcheckbox{ + margin: 0px; min-width: 20px } - .lightkeypre{ - min-width: 100px; - } .lightkey{ - min-width: 120px; + min-width: 200px; } - .lightpost{ + .lightvalue{ flex-grow: 1; } + .lightnumberbox{ + min-width: 75px; + } + + .tankcheckbox { + min-width: 20px; + margin: 0px; + } + .tankkey{ + min-width: 250px; + } + .tankvalue{ + flex-grow: 1; + margin: 0px; + } + @@ -183,11 +233,7 @@

config

Plants:

-
- - - - +
diff --git a/rust/src_webpack/src/nightlightview.html b/rust/src_webpack/src/nightlightview.html index 482bd0e..613e85b 100644 --- a/rust/src_webpack/src/nightlightview.html +++ b/rust/src_webpack/src/nightlightview.html @@ -1,17 +1,19 @@
Light:
- -
Enable Nightlight
+
Enable Nightlight
+
-
Start
- -
Stop
- +
+
+
Start
+
- - Light only when dark +
Stop
+
\ No newline at end of file diff --git a/rust/src_webpack/src/plant.html b/rust/src_webpack/src/plant.html index b261bec..4108a46 100644 --- a/rust/src_webpack/src/plant.html +++ b/rust/src_webpack/src/plant.html @@ -56,7 +56,7 @@
-
Max Consecutive Pump Count:
+
Warn Pump Count:
diff --git a/rust/src_webpack/src/tankview.html b/rust/src_webpack/src/tankview.html index fa86185..50bccb6 100644 --- a/rust/src_webpack/src/tankview.html +++ b/rust/src_webpack/src/tankview.html @@ -1,29 +1,29 @@ -
-
Tank:
+
+
Tank:
-
- -
Enable Tank Sensor
+
+ Enable Tank Sensor +
-
- -
Ignore Sensor Error
+
+
Ignore Sensor Error
+
-
- -
Tank Size mL
+
+
Useable ml full% to empty%
+
-
- -
Tank Warn Percent (mapped in relation to empty and full)
+
+
Warn below %
+
-
- -
Tank Empty Percent (% max move)
+
+
Empty at %
+
-
- -
Tank Full Percent (% max move)
+
+
Full at %
+
\ No newline at end of file