refactor display and update_task to use Delay trait, enhance sensor d… (#16)

* refactor display and update_task to use Delay trait, enhance sensor data handling with SoilMoistureRawLevel

* refactor sensor_task to improve battery voltage sample handling and logging

Author: psytraxx

.github/workflows/rust_ci.yml

@@ -32,9 +32,9 @@ jobs:
         uses: esp-rs/[email protected]
         with:
           default: true
-          buildtargets: esp32
+          buildtargets: esp32s3
           ldproxy: false
-          version: "1.84.0"
+          version: "1.85.0"
       - name: Enable caching
         uses: Swatinem/rust-cache@v2
       - name: Run build

Cargo.lock

@@ -10,7 +10,11 @@ esp-backtrace = { version = "0.15.0", features = [
     "panic-handler",
     "defmt",
 ] }
-esp-hal = { version = "1.0.0-beta.0", features = ["esp32s3", "defmt", "unstable"] }
+esp-hal = { version = "1.0.0-beta.0", features = [
+    "esp32s3",
+    "defmt",
+    "unstable",
+] }
 esp-alloc = { version = "0.7.0" }
 embassy-net = { version = "0.6.0", features = [
     "tcp",
@@ -43,7 +47,7 @@ rust-mqtt = { version = "0.3.0", default-features = false, features = [
 embedded-text = "0.7.2"
 embedded-graphics = { version = "0.8.1", features = ["defmt"] }
 embedded-hal = { version = "1.0.0", features = ["defmt-03"] }
-serde = { version = "1.0.215", default-features = false, features = ["derive"] }
+serde = { version = "1.0.219", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.133", default-features = false, features = [
     "alloc",
 ] }

Cargo.toml

@@ -1,6 +1,6 @@
 # ESP32 Plant Watering System
 
-A microcontroller-based system for automated plant watering with ESP32. Monitor soil moisture and control watering pump.
+A microcontroller-based system for automated plant watering with ESP32. Monitor soil moisture and control the watering pump.
 
 Built for [LilyGO T-Display-S3](https://github.com/Xinyuan-LilyGO/T-Display-S3) ESP32-S3 development board
 
@@ -18,7 +18,6 @@ Built for [LilyGO T-Display-S3](https://github.com/Xinyuan-LilyGO/T-Display-S3)
 - DHT11 Digital (Temperature/Humidity) → GPIO1
 - Water Pump Relay → GPIO2
 - Battery Voltage → GPIO4
-- Moisture Digital → GPIO10
 - Moisture Analog → GPIO11
 - Moisture Power → GPIO18
 - Water Level Analog → GPIO12
@@ -29,7 +28,7 @@ Built for [LilyGO T-Display-S3](https://github.com/Xinyuan-LilyGO/T-Display-S3)
 - **Sensor Integration**
 
   - DHT11 temperature/humidity monitoring
-  - Capacitive soil moisture sensing
+  - Capacitive soil moisture sensing (analog)
   - Water level detection
   - Battery voltage monitoring
 
@@ -57,52 +56,44 @@ Built for [LilyGO T-Display-S3](https://github.com/Xinyuan-LilyGO/T-Display-S3)
 
 The project uses several Rust crates to provide functionality:
 
-## Async/Embedded Frameworks
+### Async/Embedded Frameworks
 
-These crates provide support for asynchronous programming models and embedded futures.
-
-- [`embassy`](https://crates.io/crates/embassy)
-- [`embassy-executor`](https://crates.io/crates/embassy-executor)
-- [`embassy-futures`](https://crates.io/crates/embassy-futures)
-- [`embassy-net`](https://crates.io/crates/embassy-net)
-- [`embassy-sync`](https://crates.io/crates/embassy-sync)
-- [`embassy-time`](https://crates.io/crates/embassy-time)
+- [embassy](https://crates.io/crates/embassy)
+- [embassy-executor](https://crates.io/crates/embassy-executor)
+- [embassy-futures](https://crates.io/crates/embassy-futures)
+- [embassy-net](https://crates.io/crates/embassy-net)
+- [embassy-sync](https://crates.io/crates/embassy-sync)
+- [embassy-time](https://crates.io/crates/embassy-time)
 
 ---
 
-## Hardware Abstraction & Embedded I/O
-
-These crates are used to interact with embedded hardware and interfaces.
+### Hardware Abstraction & Embedded I/O
 
-- [`embedded-hal`](https://crates.io/crates/embedded-hal)
-- [`embedded-text`](https://crates.io/crates/embedded-text)
-- [`embedded-graphics`](https://crates.io/crates/embedded-graphics)
+- [embedded-hal](https://crates.io/crates/embedded-hal)
+- [embedded-text](https://crates.io/crates/embedded-text)
+- [embedded-graphics](https://crates.io/crates/embedded-graphics)
 
 ---
 
-## Networking
-
-Crates for network communication and protocols.
+### Networking
 
-- [`rust-mqtt`](https://crates.io/crates/rust-mqtt)
-- [`esp-wifi`](https://crates.io/crates/esp-wifi)
+- [rust-mqtt](https://crates.io/crates/rust-mqtt)
+- [esp-wifi](https://crates.io/crates/esp-wifi)
 
 ---
 
-## ESP32-Specific Crates
-
-Crates related to ESP32 platforms, Wi-Fi support, and memory management.
+### ESP32-Specific Crates
 
-- [`esp-alloc`](https://crates.io/crates/esp-alloc)
-- [`esp-backtrace`](https://crates.io/crates/esp-backtrace)
-- [`esp-hal`](https://crates.io/crates/esp-hal)
-- [`esp-hal-embassy`](https://crates.io/crates/esp-hal-embassy)
+- [esp-alloc](https://crates.io/crates/esp-alloc)
+- [esp-backtrace](https://crates.io/crates/esp-backtrace)
+- [esp-hal](https://crates.io/crates/esp-hal)
+- [esp-hal-embassy](https://crates.io/crates/esp-hal-embassy)
 
 ---
 
-## Display
+### Display
 
-The project uses the built-in 1.9" ST7789 LCD display (170x320) on the T-Display-S3 with the following pins:
+The built-in 1.9" ST7789 LCD display on the T-Display-S3 has the following pin configuration:
 
 - Backlight: GPIO38
 - CS: GPIO6
@@ -112,37 +103,25 @@ The project uses the built-in 1.9" ST7789 LCD display (170x320) on the T-Display
 - RD: GPIO9
 - Data pins: GPIO39-42, GPIO45-48
 
-- [`mipidsi`](https://crates.io/crates/mipidsi)
+- [mipidsi](https://crates.io/crates/mipidsi)
 
 ---
 
-## Sensor Support
+### Serialization
 
-Crates for interfacing with sensors like DHT11.
-
-- [`embedded-dht-rs`](https://github.com/rust-dd/embedded-dht-rs)
+- [serde](https://crates.io/crates/serde)
+- [serde_json](https://crates.io/crates/serde_json)
 
 ---
 
-## Serialization
-
-Crates for data serialization and deserialization.
+### Miscellaneous
 
-- [`serde`](https://crates.io/crates/serde)
-- [`serde_json`](https://crates.io/crates/serde_json)
-
----
-
-## Miscellaneous
-
-Other supporting crates for various use cases.
-
-- [`heapless`](https://crates.io/crates/heapless)
-- [`static_cell`](https://crates.io/crates/static_cell)
-- [`rand_core`](https://crates.io/crates/rand_core)
-- [`defmt`](https://crates.io/crates/defmt)
-- [`defmt-rtt`](https://crates.io/crates/defmt-rtt)
-- and more...
+- [heapless](https://crates.io/crates/heapless)
+- [static_cell](https://crates.io/crates/static_cell)
+- [rand_core](https://crates.io/crates/rand_core)
+- [defmt](https://crates.io/crates/defmt)
+- [defmt-rtt](https://crates.io/crates/defmt-rtt)
+- ...and others
 
 ---
 
@@ -159,17 +138,14 @@ cd esp32-homecontrol-no-std-rs
 
 ### 2. Install Rust and the necessary tools
 
-https://docs.esp-rs.org/book/introduction.html
+See the [ESP-RS book](https://docs.esp-rs.org/book/introduction.html).
 
-Install espup
-https://github.com/esp-rs/espup
-and probe-rs
-https://github.com/probe-rs/probe-rs
+Install espup: [espup GitHub](https://github.com/esp-rs/espup)  
+Install probe-rs: [probe-rs GitHub](https://github.com/probe-rs/probe-rs)
 
 ```sh
 espup install
 . $HOME/export-esp.sh
-
 ```
 
 ---
@@ -185,7 +161,7 @@ cp .env.dist .env
 
 ## Usage
 
-To flash the firmware to your ESP32 device, use the following command:
+To flash the firmware to your ESP32 device, run:
 
 ```sh
 cargo run --release
@@ -199,69 +175,49 @@ cargo run --release
 
 - [DHCP Wi-Fi Example with Embassy](https://github.com/esp-rs/esp-hal/blob/main/examples/src/bin/wifi_embassy_dhcp.rs)
 
----
-
 ### MQTT Communication
 
 - [MQTT Example](https://github.com/etiennetremel/esp32-home-sensor/blob/fff5f7ca4055e38ed5c296d0544fa8e61d855388/src/main.rs)
 
----
-
 ### Display Interfaces
 
 - [MIDISPI Example with Display](https://github.com/embassy-rs/embassy/blob/227e073fca97bcbcec42d9705e0a8ef19fc433b5/examples/rp/src/bin/spi_gc9a01.rs#L6)
 - [Display Example via SPI](https://github.com/embassy-rs/embassy/blob/227e073fca97bcbcec42d9705e0a8ef19fc433b5/examples/rp/src/bin/spi_display.rs#L6)
 
----
-
 ### Sensors
 
 - [DHT11 Sensor Integration Example](https://github.com/rust-dd/embedded-dht-rs)
 - [Moisture Sensor Example](https://github.com/nand-nor/plant-minder/blob/4bc70142a9ec11e860b5422deb9d85ad192bab66/pmindp-esp32-thread/src/sensor/probe_circuit.rs#L63)
 
----
-
 ### UI & Graphics
 
 - [Icons and UI Example with Display & Publish](https://github.com/sambenko/esp32s3box-display-and-publish)
 
----
-
 ### Projects and Games
 
 - [Pacman Game Example](https://github.com/georgik/esp32-spooky-maze-game)
 - [Motion Sensors & Body Tracking Example](https://github.com/SlimeVR/SlimeVR-Rust/blob/9eff429f4f01c8b7c607f3c3988de82729c753b3/firmware/src/peripherals/esp32/esp32c3.rs#L38)
 
----
-
 ### Networking
 
 - [Netstack & MQTT Struct Example](https://github.com/mirkomartn/esp32c3-embassy-poc/blob/9ad954dcba19897a973e3453fd83196829eee485/src/netstack.rs)
 - [HTTP Request Example with Embassy](https://github.com/embassy-rs/embassy/blob/86578acaa4d4dbed06ed4fcecec25884f6883e82/examples/rp/src/bin/wifi_webrequest.rs#L136)
 - [NTP Socket Example](https://github.com/vpetrigo/sntpc/blob/2711f17d42b9a681ced02639780fe72cd8042b36/examples/smoltcp-request/src/main.rs)
 
----
-
 ### Miscellaneous Examples
 
 - [Joystick Analog Pin Input Example](https://github.com/WJKPK/rc-car/blob/f1ce37658c7b8b6cbc47c844243ea8b90d1e1483/pilot/src/main.rs)
 - [Battery Monitoring Example](https://github.com/longxiangam/work_timer/blob/788c0bee18ec47adce07e3ba71e884920e6473e1/src/battery.rs)
 
----
-
 ### Tutorials
 
 - [ESP32 Rust HAL Tutorials](https://blog.theembeddedrustacean.com/series/esp32c3-embedded-rust-hal)
 
----
-
 ### Advanced Examples
 
 - [Futures Example](https://github.com/kamo104/esp32-rust-mqtt-esp-now-gateway/blob/main/src/main.rs)
 - [Sleep, Display Layout, Logging, Dashboard, Multiple Tasks](https://github.com/claudiomattera/esp32c3-embassy/blob/master/esp32c3-embassy/src/sleep.rs)
 
----
-
 ### Bitcoin Device, USB, & OTA Updates
 
 - [Fancy Bitcoin Device with GUI Example](https://github.com/frostsnap/frostsnap/blob/0b2d589bcf8a0863e1067595aae8c9376cfb4867/device/src/graphics/animation.rs)