diff --git a/Cargo.lock b/Cargo.lock index 12a9447..ab39aa3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "allocator-api2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78200ac3468a57d333cd0ea5dd398e25111194dcacd49208afca95c629a6311d" + [[package]] name = "anyhow" version = "1.0.98" @@ -31,18 +37,18 @@ dependencies = [ [[package]] name = "bitfield" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7e6caee68becd795bfd65f1a026e4d00d8f0c2bc9be5eb568e1015f9ce3c34" +checksum = "db1bcd90f88eabbf0cadbfb87a45bceeaebcd3b4bc9e43da379cd2ef0162590d" dependencies = [ "bitfield-macros", ] [[package]] name = "bitfield-macros" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331afbb18ce7b644c0b428726d369c5dd37ca0b815d72a459fcc2896c3c8ad32" +checksum = "3787a07661997bfc05dd3431e379c0188573f78857080cf682e1393ab8e4d64c" dependencies = [ "proc-macro2", "quote", @@ -79,21 +85,22 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" -dependencies = [ - "num-traits", -] - [[package]] name = "critical-section" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "darling" version = "0.20.11" @@ -140,6 +147,15 @@ dependencies = [ "syn", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "crypto-common", +] + [[package]] name = "document-features" version = "0.2.11" @@ -156,7 +172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fea5ef5bed4d3468dfd44f5c9fa4cda8f54c86d4fb4ae683eacf9d39e2ea12" dependencies = [ "embassy-futures", - "embassy-sync", + "embassy-sync 0.6.2", "embassy-time", "embedded-hal 0.2.7", "embedded-hal 1.0.0", @@ -203,7 +219,7 @@ checksum = "940c4b9fe5c1375b09a0c6722c0100d6b2ed46a717a34f632f26e8d7327c4383" dependencies = [ "document-features", "embassy-net-driver", - "embassy-sync", + "embassy-sync 0.6.2", "embassy-time", "embedded-io-async", "embedded-nal-async", @@ -232,6 +248,20 @@ dependencies = [ "heapless", ] +[[package]] +name = "embassy-sync" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cef1a8a1ea892f9b656de0295532ac5d8067e9830d49ec75076291fd6066b136" +dependencies = [ + "cfg-if", + "critical-section", + "embedded-io-async", + "futures-sink", + "futures-util", + "heapless", +] + [[package]] name = "embassy-time" version = "0.4.0" @@ -280,7 +310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08e753b23799329780c7ac434264026d0422044d6649ed70a73441b14a6436d7" dependencies = [ "critical-section", - "embassy-sync", + "embassy-sync 0.6.2", "embassy-usb-driver", ] @@ -443,10 +473,11 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "esp-alloc" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78132d362cbf62ce22a1466eb9e98424f6b2d1e476e7a3cb46ca9063c5833f7" +checksum = "7e95f1de57ce5a6600368f3d3c931b0dfe00501661e96f5ab83bc5cdee031784" dependencies = [ + "allocator-api2", "cfg-if", "critical-section", "document-features", @@ -456,20 +487,24 @@ dependencies = [ [[package]] name = "esp-backtrace" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cd70abe47945c9116972781b5c05277ad855a5f5569fe2afd3e2e61a103cc0" +checksum = "7c304bbe17df32db8bc0027a9da989aa3efebbd4e7a79d58850deb29e2af577f" dependencies = [ + "cfg-if", "esp-build", + "esp-config", + "esp-metadata", "esp-println", + "heapless", "semihosting", ] [[package]] name = "esp-build" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aa1c8f9954c9506699cf1ca10a2adcc226ff10b6ae3cb9e875cf2c6a0b9a372" +checksum = "837020ff95fbf4c15c206541dda7994f1bbe6e1505e36a6a5ecb51fdb61656d7" dependencies = [ "quote", "syn", @@ -478,31 +513,33 @@ dependencies = [ [[package]] name = "esp-config" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158dba334d3a2acd8d93873c0ae723ca1037cc78eefe5d6b4c5919b0ca28e38e" +checksum = "2c8c4c95d8d6243ddb39efe1fcf2524c9becd0f86bb3e24048ed30b4f553609f" dependencies = [ "document-features", + "serde", + "serde_json", ] [[package]] name = "esp-hal" -version = "1.0.0-beta.0" +version = "1.0.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9efaa9c1324ca20a22086aba2ce47a9bdc5bd65969af8b0cd5e879603b57bef" +checksum = "0d973697621cd3eef9c3f260fa8c1af77d8547cfc92734255d8e8ddf05c7d331" dependencies = [ "basic-toml", "bitfield", "bitflags 2.9.0", "bytemuck", "cfg-if", - "chrono", "critical-section", "delegate", + "digest", "document-features", "embassy-embedded-hal", "embassy-futures", - "embassy-sync", + "embassy-sync 0.6.2", "embassy-usb-driver", "embassy-usb-synopsys-otg", "embedded-can", @@ -520,31 +557,30 @@ dependencies = [ "esp32s3", "fugit", "instability", - "log", "nb 1.1.0", "paste", "portable-atomic", - "rand_core", + "rand_core 0.6.4", + "rand_core 0.9.3", "riscv", "serde", - "strum 0.27.1", + "strum", "ufmt-write", - "usb-device", - "void", "xtensa-lx", "xtensa-lx-rt", ] [[package]] name = "esp-hal-embassy" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27f41110117a9bf2be385b42535c686b301c8ce3b5ea0a07567e200a63a2239" +checksum = "7fd751f4b235764f6e766731e7da09d8f8d443642b829c3e6e469c38320da044" dependencies = [ + "cfg-if", "critical-section", "document-features", "embassy-executor", - "embassy-sync", + "embassy-sync 0.6.2", "embassy-time", "embassy-time-driver", "embassy-time-queue-utils", @@ -553,15 +589,16 @@ dependencies = [ "esp-hal", "esp-hal-procmacros", "esp-metadata", + "log", "portable-atomic", "static_cell", ] [[package]] name = "esp-hal-procmacros" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd340a20a7d546570af58fd9e2aae17466a42572680d8e70d35fc7c475c4ed8" +checksum = "73164008cb2eada2ef85e6b0e459001d851f9b8e65e96e0d594bdfa8cf1b813b" dependencies = [ "darling", "document-features", @@ -576,33 +613,35 @@ dependencies = [ [[package]] name = "esp-metadata" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b4bffc22b7b1222c9467f0cb90eb49dcb63de810ecb3300e4b3bbc4ac2423e" +checksum = "0154d59933c2419ef25a01938517cc6969f47b6af53ebb34c279393aa20d9654" dependencies = [ "anyhow", "basic-toml", "serde", - "strum 0.26.3", + "strum", ] [[package]] name = "esp-println" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960703930f9f3c899ddedd122ea27a09d6a612c22323157e524af5b18876448e" +checksum = "fae8b38d5fdc1d29d823c4737f18edfb0ccf0406985cf893f87c0cfc26a6ab33" dependencies = [ "critical-section", + "document-features", "esp-build", + "esp-metadata", "log", "portable-atomic", ] [[package]] name = "esp-riscv-rt" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec69987b3d7c48b65f8fb829220832a101478d766c518ae836720d040608d5dd" +checksum = "c05c2badd16cbd6307d463090615332b77c17a6766b41ba5fe5bb783310e8af6" dependencies = [ "document-features", "riscv", @@ -624,15 +663,15 @@ dependencies = [ [[package]] name = "esp-wifi" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d7ea0e2c374343a375758861e13cf618db619436bcb386dfe5529ef31e9d5" +checksum = "4f0e7cc4d0ceed4117e0f190abba1f021d986a5b6a54ef2116541e4288b700a9" dependencies = [ + "allocator-api2", "cfg-if", "critical-section", "document-features", "embassy-net-driver", - "embassy-sync", "embedded-io", "embedded-io-async", "enumset", @@ -642,14 +681,11 @@ dependencies = [ "esp-hal", "esp-metadata", "esp-wifi-sys", - "heapless", - "libm", - "log", "num-derive", "num-traits", "portable-atomic", "portable_atomic_enum", - "rand_core", + "rand_core 0.9.3", "serde", "xtensa-lx-rt", ] @@ -661,7 +697,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6b5438361891c431970194a733415006fb3d00b6eb70b3dcb66fd58f04d9b39" dependencies = [ "anyhow", - "log", ] [[package]] @@ -671,7 +706,7 @@ dependencies = [ "embassy-executor", "embassy-futures", "embassy-net", - "embassy-sync", + "embassy-sync 0.7.0", "embassy-time", "embedded-graphics", "embedded-hal 1.0.0", @@ -693,9 +728,9 @@ dependencies = [ [[package]] name = "esp32s3" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6d20f119410092abfbc65e46f9362015a7110023528f0dbe855cab80c38ca8" +checksum = "27a4c6fd31207a297fc29d2b8f4da27facf45f8c83041f7c0f978aa65ab367c9" dependencies = [ "critical-section", "vcell", @@ -761,6 +796,16 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "hash32" version = "0.3.1" @@ -783,8 +828,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ "hash32", - "portable-atomic", - "serde", "stable_deref_trait", ] @@ -835,12 +878,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" -[[package]] -name = "libm" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" - [[package]] name = "linked_list_allocator" version = "0.10.5" @@ -1063,6 +1100,12 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" + [[package]] name = "riscv" version = "0.12.1" @@ -1113,7 +1156,7 @@ dependencies = [ "embedded-io", "embedded-io-async", "heapless", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -1209,35 +1252,13 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros 0.26.4", -] - [[package]] name = "strum" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" dependencies = [ - "strum_macros 0.27.1", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn", + "strum_macros", ] [[package]] @@ -1314,6 +1335,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" +[[package]] +name = "typenum" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + [[package]] name = "ufmt-write" version = "0.1.0" @@ -1342,6 +1369,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "void" version = "1.0.2" @@ -1441,9 +1474,9 @@ dependencies = [ [[package]] name = "xtensa-lx" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51cbb46c78cfd284c9378070ab90bae9d14d38b3766cb853a97c0a137f736d5b" +checksum = "68737a6c8f32ddcd97476acf68ddc6d411697fd94f64a601af16854b74967dff" dependencies = [ "critical-section", "document-features", @@ -1451,9 +1484,9 @@ dependencies = [ [[package]] name = "xtensa-lx-rt" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "689c2ef159d9cd4fc9503603e9999968a84a30db9bde0f0f880d0cceea0190a9" +checksum = "235815f34d1bf9c2f9c07917e2b63efbcab5ca5ce9d8faddb97b7105eed1ade3" dependencies = [ "anyhow", "document-features", @@ -1461,7 +1494,7 @@ dependencies = [ "minijinja", "r0", "serde", - "strum 0.26.3", + "strum", "toml", "xtensa-lx", "xtensa-lx-rt-proc-macros", @@ -1469,9 +1502,9 @@ dependencies = [ [[package]] name = "xtensa-lx-rt-proc-macros" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11277b1e4cbb7ffe44678c668518b249c843c81df249b8f096701757bc50d7ee" +checksum = "6c1ab67b22f0576b953a25c43bdfed0ff84af2e01ced85e95c29e7bac6bf2180" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 51b4f2e..b9e0cbf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,14 +4,14 @@ version = "0.1.0" edition = "2021" [dependencies] -esp-backtrace = { version = "0.15.1", features = [ +esp-backtrace = { version = "0.16.0", features = [ "esp32s3", "exception-handler", "panic-handler", "println", ] } -esp-hal = { version = "1.0.0-beta.0", features = ["esp32s3", "unstable"] } -esp-alloc = { version = "0.7.0" } +esp-hal = { version = "1.0.0-beta.1", features = ["esp32s3", "unstable"] } +esp-alloc = { version = "0.8.0" } embassy-net = { version = "0.7.0", features = [ "tcp", "udp", @@ -21,17 +21,12 @@ embassy-net = { version = "0.7.0", features = [ ] } mipidsi = { version = "0.9.0" } -esp-wifi = { version = "0.13.0", features = [ - "esp32s3", - "serde", - "wifi", - "log", -] } +esp-wifi = { version = "0.14.0", features = ["esp32s3", "serde", "wifi"] } heapless = { version = "0.8.0", default-features = false } -esp-println = { version = "0.13.1", features = ["log", "esp32s3"] } +esp-println = { version = "0.14.0", features = ["esp32s3"] } embassy-executor = { version = "0.7.0", features = ["task-arena-size-163840"] } embassy-time = { version = "0.4.0", features = [] } -esp-hal-embassy = { version = "0.7.0", features = ["esp32s3"] } +esp-hal-embassy = { version = "0.8.0", features = ["esp32s3", "log-04"] } rust-mqtt = { version = "0.3.0", default-features = false, features = [] } embedded-text = "0.7.2" embedded-graphics = { version = "0.8.1", features = [] } @@ -41,7 +36,7 @@ serde_json = { version = "1.0.140", default-features = false, features = [ "alloc", ] } embassy-futures = { version = "0.1.1", features = [] } -embassy-sync = { version = "0.6.2", features = [] } +embassy-sync = { version = "0.7.0", features = [] } static_cell = "2.1.0" nb = { version = "1.1.0", features = [] } diff --git a/src/display.rs b/src/display.rs index 071fc71..2f57f1f 100644 --- a/src/display.rs +++ b/src/display.rs @@ -8,7 +8,11 @@ use embedded_hal::delay::DelayNs; use embedded_text::alignment::HorizontalAlignment; use embedded_text::style::{HeightMode, TextBoxStyleBuilder}; use embedded_text::TextBox; -use esp_hal::gpio::{GpioPin, Level, Output, OutputConfig}; +use esp_hal::gpio::{Level, Output, OutputConfig}; +use esp_hal::peripherals::{ + GPIO38, GPIO39, GPIO40, GPIO41, GPIO42, GPIO45, GPIO46, GPIO47, GPIO48, GPIO5, GPIO6, GPIO7, + GPIO8, GPIO9, +}; use mipidsi::interface::{Generic8BitBus, ParallelError, ParallelInterface}; use mipidsi::models::ST7789; use mipidsi::options::{ColorInversion, Orientation, Rotation}; @@ -48,25 +52,25 @@ pub trait DisplayTrait { fn enable_powersave(&mut self) -> Result<(), Error>; } -pub struct DisplayPeripherals { - pub rst: GpioPin<5>, - pub cs: GpioPin<6>, - pub dc: GpioPin<7>, - pub wr: GpioPin<8>, - pub rd: GpioPin<9>, - pub backlight: GpioPin<38>, - pub d0: GpioPin<39>, - pub d1: GpioPin<40>, - pub d2: GpioPin<41>, - pub d3: GpioPin<42>, - pub d4: GpioPin<45>, - pub d5: GpioPin<46>, - pub d6: GpioPin<47>, - pub d7: GpioPin<48>, +pub struct DisplayPeripherals<'a> { + pub rst: GPIO5<'a>, + pub cs: GPIO6<'a>, + pub dc: GPIO7<'a>, + pub wr: GPIO8<'a>, + pub rd: GPIO9<'a>, + pub backlight: GPIO38<'a>, + pub d0: GPIO39<'a>, + pub d1: GPIO40<'a>, + pub d2: GPIO41<'a>, + pub d3: GPIO42<'a>, + pub d4: GPIO45<'a>, + pub d5: GPIO46<'a>, + pub d6: GPIO47<'a>, + pub d7: GPIO48<'a>, } -impl Display<'_, D> { - pub fn new(p: DisplayPeripherals, mut delay: D) -> Result { +impl<'a, D: DelayNs> Display<'a, D> { + pub fn new(p: DisplayPeripherals<'a>, mut delay: D) -> Result { let backlight = Output::new(p.backlight, Level::Low, OutputConfig::default()); let dc = Output::new(p.dc, Level::Low, OutputConfig::default()); diff --git a/src/relay_task.rs b/src/relay_task.rs index 07fbd0d..1adc5b5 100644 --- a/src/relay_task.rs +++ b/src/relay_task.rs @@ -1,5 +1,8 @@ use embassy_time::{Duration, Timer}; -use esp_hal::gpio::{GpioPin, Level, Output, OutputConfig}; +use esp_hal::{ + gpio::{Level, Output, OutputConfig}, + peripherals::GPIO2, +}; use esp_println::println; use crate::ENABLE_PUMP; @@ -7,7 +10,7 @@ use crate::ENABLE_PUMP; const PUMP_INTERVAL: Duration = Duration::from_secs(10); #[embassy_executor::task] -pub async fn relay_task(pin: GpioPin<2>) { +pub async fn relay_task(pin: GPIO2<'static>) { println!("Created a relay task"); // Configure GPIO pin for relay (using GPIO2) let mut dht_pin = Output::new(pin, Level::Low, OutputConfig::default()); diff --git a/src/sensors_task.rs b/src/sensors_task.rs index 71e9648..0d786bf 100644 --- a/src/sensors_task.rs +++ b/src/sensors_task.rs @@ -5,8 +5,8 @@ use esp_hal::{ Adc, AdcCalCurve, AdcCalLine, AdcCalScheme, AdcChannel, AdcConfig, AdcPin, Attenuation, RegisterAccess, }, - gpio::{DriveMode, GpioPin, Level, Output, OutputConfig, Pull}, - peripherals::{ADC1, ADC2}, + gpio::{DriveMode, Level, Output, OutputConfig, Pull}, + peripherals::{ADC1, ADC2, GPIO1, GPIO11, GPIO12, GPIO16, GPIO21, GPIO4}, Blocking, }; use esp_println::println; @@ -24,21 +24,21 @@ const SENSOR_WARMUP_DELAY_MILLISECONDS: u64 = 50; // in this case we keep 3 samples for averaging - first and last are ignored const SENSOR_SAMPLE_COUNT: usize = 5; -pub struct SensorPeripherals { - pub dht11_digital_pin: GpioPin<1>, - pub battery_pin: GpioPin<4>, - pub moisture_power_pin: GpioPin<16>, - pub moisture_analog_pin: GpioPin<11>, - pub water_level_analog_pin: GpioPin<12>, - pub water_level_power_pin: GpioPin<21>, - pub adc1: ADC1, - pub adc2: ADC2, +pub struct SensorPeripherals<'a> { + pub dht11_digital_pin: GPIO1<'a>, + pub battery_pin: GPIO4<'a>, + pub moisture_power_pin: GPIO16<'a>, + pub moisture_analog_pin: GPIO11<'a>, + pub water_level_analog_pin: GPIO12<'a>, + pub water_level_power_pin: GPIO21<'a>, + pub adc1: ADC1<'a>, + pub adc2: ADC2<'a>, } #[embassy_executor::task] pub async fn sensor_task( sender: Sender<'static, NoopRawMutex, SensorData, 3>, - mut p: SensorPeripherals, + p: SensorPeripherals<'static>, ) { println!("Create"); @@ -50,7 +50,7 @@ pub async fn sensor_task( let mut adc1_config = AdcConfig::new(); let mut battery_pin = adc1_config - .enable_pin_with_cal::, AdcCalLine>(p.battery_pin, Attenuation::_11dB); + .enable_pin_with_cal::, AdcCalLine>(p.battery_pin, Attenuation::_11dB); let mut adc1 = Adc::new(p.adc1, adc1_config); let mut moisture_power_pin = @@ -58,6 +58,18 @@ pub async fn sensor_task( let mut water_level_power_pin = Output::new(p.water_level_power_pin, Level::Low, OutputConfig::default()); + let mut dht11_pin = Output::new( + p.dht11_digital_pin, + Level::High, + OutputConfig::default() + .with_drive_mode(DriveMode::OpenDrain) + .with_pull(Pull::None), + ) + .into_flex(); + dht11_pin.set_input_enable(true); + + let mut dht11_sensor = Dht11::new(dht11_pin, Delay); + loop { // Collect samples for each sensor type let mut air_humidity_samples: Vec = Vec::new(); @@ -76,18 +88,6 @@ pub async fn sensor_task( println!("Reading sensor data {}/{}", (i + 1), SENSOR_SAMPLE_COUNT); { - let mut dht11_pin = Output::new( - &mut p.dht11_digital_pin, - Level::High, - OutputConfig::default() - .with_drive_mode(DriveMode::OpenDrain) - .with_pull(Pull::None), - ) - .into_flex(); - dht11_pin.enable_input(true); - - let mut dht11_sensor = Dht11::new(dht11_pin, Delay); - // DHT11 needs a longer initial delay Timer::after(Duration::from_millis(DHT11_WARMUP_DELAY_MILLISECONDS)).await; if let Ok(result) = dht11_sensor.read() { @@ -209,12 +209,6 @@ pub async fn sensor_task( // Power off the sensors moisture_power_pin.set_low(); water_level_power_pin.set_low(); - // Force the pin into an explicit low-power state after the sensor is dropped - Output::new( - &mut p.dht11_digital_pin, - Level::Low, - OutputConfig::default(), - ); Timer::after(sampling_period).await; } @@ -222,12 +216,12 @@ pub async fn sensor_task( /// Sample an ADC pin and return the value async fn sample_adc( - adc: &mut Adc<'_, ADCI, Blocking>, + adc: &mut Adc<'static, ADCI, Blocking>, pin: &mut AdcPin, ) -> Option where PIN: AdcChannel, - ADCI: RegisterAccess, + ADCI: RegisterAccess + 'static, ADCC: AdcCalScheme, { // Wait for the sensor to warm up diff --git a/src/wifi.rs b/src/wifi.rs index 10a61f0..72c50db 100644 --- a/src/wifi.rs +++ b/src/wifi.rs @@ -23,10 +23,10 @@ static STACK_RESOURCES: StaticCell> = StaticCell::new(); pub static STOP_WIFI_SIGNAL: Signal = Signal::new(); pub async fn connect_to_wifi( - wifi: peripherals::WIFI, - timer: esp_hal::timer::timg::Timer, - radio_clocks: peripherals::RADIO_CLK, - rng: RNG, + wifi: peripherals::WIFI<'static>, + timer: esp_hal::timer::timg::Timer<'static>, + radio_clocks: peripherals::RADIO_CLK<'static>, + rng: RNG<'static>, spawner: Spawner, ) -> Result, WifiError> { let mut rng = Rng::new(rng);