rust mutex issue

2024-10-23 18:17:18 +02:00
parent 171bd19458
commit 7957cf4003
8 changed files with 261 additions and 376 deletions
--- a/rust/.cargo/config.toml
+++ b/rust/.cargo/config.toml
@@ -4,14 +4,13 @@ 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 for espflash v2.x.x
-
+#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 = "cargo runner"


-#runner = "espflash flash --monitor --partition-table partitions.csv -b no-reset" # Select this runner for espflash v2.x.x
-# runner = "espflash flash --monitor --baud 921600 --partition-table partitions.csv -b no-reset" # Select this runner for espflash v2.x.x
-# runner = espflash erase-parts otadata
+#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

--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -37,7 +37,6 @@ partition_table = "partitions.csv"

 [features]
 default = ["std", "embassy", "esp-idf-svc/native"]
-
 pio = ["esp-idf-svc/pio"]
 std = ["alloc", "esp-idf-svc/binstart", "esp-idf-svc/std"]
 alloc = ["esp-idf-svc/alloc"]
@@ -46,38 +45,49 @@ experimental = ["esp-idf-svc/experimental"]
 embassy = ["esp-idf-svc/embassy-sync", "esp-idf-svc/critical-section", "esp-idf-svc/embassy-time-driver"]

 [dependencies]
-log = { version = "0.4", default-features = false }
-serde = { version = "1.0.192",  features = ["derive"] }
-average = { version = "0.14.1" , features = ["std"] }
-#esp32 = "0.28.0"
-bit_field = "0.10.2"
+#ESP stuff
+embedded-svc = { version = "0.28.0", features = ["experimental"] }
+esp-idf-hal = "0.44.1"
+esp-idf-sys = { version = "0.35.0", features = ["binstart", "native"] }
+esp-idf-svc = { version = "0.49.1", default-features = false }
+embedded-hal = "1.0.0"
+heapless = { version = "0.8", features = ["serde"] }
+embedded-hal-bus = { version = "0.2.0", features = ["std"] }
+
+#Hardware additional driver
 ds18b20 = "0.1.1"
-embedded-svc = { version = "0.27.0", features = ["experimental"] }
-esp-idf-hal = "0.43.0"
-esp-idf-sys = { version = "0.34.0", features = ["binstart", "native"] }
-esp-idf-svc = { version = "0.48.0", default-features = false }
-esp_idf_build = "0.1.3"
+bq34z100 = { version = "0.3.0", features = ["flashstream"] }
+one-wire-bus = "0.1.1"
+ds323x = "0.5.1"
+
+#pure code dependencies
+log = { version = "0.4", default-features = false }
+once_cell = "1.19.0"
+anyhow = { version = "1.0.75", features = ["std", "backtrace"] }
+average = { version = "0.14.1" , features = ["std"] }
+bit_field = "0.10.2"
+strum = { version = "0.26.1", features = ["derive"] }
+measurements = "0.11.0"
+schemars = "0.8.16"
+
+#json
+serde = { version = "1.0.192",  features = ["derive"] }
+serde_json = "1.0.108"
+
+#timezone
 chrono = { version = "0.4.23", default-features = false , features = ["iana-time-zone" , "alloc"] }
 chrono-tz = {version="0.8.0", default-features = false , features = [ "filter-by-regex" ]}
-embedded-hal = "1.0.0"
-one-wire-bus = "0.1.1"
-anyhow = { version = "1.0.75", features = ["std", "backtrace"] }
-schemars = "0.8.16"
-heapless = { version = "0.8", features = ["serde"] }
-serde_json = "1.0.108"
-strum = { version = "0.26.1", features = ["derive"] }
-once_cell = "1.19.0"
-measurements = "0.11.0"
-bq34z100 = { version = "0.3.0"          , features = ["flashstream"] }
+

 [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-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" }
+ds323x = { git = "https://github.com/empirephoenix/ds323x-rs.git" }
+bq34z100 = { path = "../../bq34z100_rust" }

 [build-dependencies]
-embuild = "0.31.3"
+embuild = "0.32.0"
 vergen = { version = "8.2.6", features = ["build", "git", "gitcl"] }
--- a/rust/src/plant_hal.rs
+++ b/rust/src/plant_hal.rs
@@ -1,10 +1,12 @@
 use bq34z100::{Bq34Z100Error, Bq34z100g1, Bq34z100g1Driver};

 use chrono_tz::Europe::Berlin;
+use ds323x::Ds323x;
+use embedded_hal_bus::i2c::MutexDevice;
 use embedded_svc::wifi::{
    AccessPointConfiguration, AccessPointInfo, AuthMethod, ClientConfiguration, Configuration,
 };
-use esp_idf_hal::adc::attenuation;
+use esp_idf_hal::adc::{attenuation, Resolution};
 use esp_idf_hal::adc::oneshot::config::AdcChannelConfig;
 use esp_idf_hal::adc::oneshot::{AdcChannelDriver, AdcDriver};
 use esp_idf_hal::i2c::{APBTickType, I2cConfig, I2cDriver, I2cError};
@@ -24,6 +26,7 @@ use anyhow::anyhow;
 use anyhow::{bail, Ok, Result};
 use std::ffi::CString;
 use std::fs::File;
+use std::ops::Deref;
 use std::path::Path;

 use chrono::{DateTime, Utc};
@@ -219,7 +222,8 @@ pub struct PlantCtrlBoard<'a> {
    pub wifi_driver: EspWifi<'a>,
    one_wire_bus: OneWire<PinDriver<'a, Gpio18, esp_idf_hal::gpio::InputOutput>>,
    mqtt_client: Option<EspMqttClient<'a>>,
-    battery_driver: Option<Bq34z100g1Driver<I2cDriver<'a>, Delay>>,
+    battery_driver: Option<Bq34z100g1Driver<MutexDevice<'a, I2cDriver<'a>>, Delay>>,
+    rtc: Option<Ds323x<ds323x::interface::I2cInterface<MutexDevice<'a, I2cDriver<'a>>>, ds323x::ic::DS3231>>
 }

 impl PlantCtrlBoardInteraction for PlantCtrlBoard<'_> {
@@ -1013,7 +1017,7 @@ impl PlantCtrlBoardInteraction for PlantCtrlBoard<'_> {
 }

 fn print_battery(
-    battery_driver: &mut Bq34z100g1Driver<I2cDriver, Delay>,
+    battery_driver: &mut Bq34z100g1Driver<MutexDevice<'_, I2cDriver<'_>>, Delay>,
 ) -> Result<(), Bq34Z100Error<I2cError>> {
    println!("Try communicating with battery");
    let fwversion = battery_driver.fw_version().unwrap_or_else(|e| {
@@ -1084,20 +1088,24 @@ impl CreatePlantHal<'_> for PlantHal {
        let sda = peripherals.pins.gpio20.downgrade();

        let driver = I2cDriver::new(i2c, sda, scl, &config).unwrap();
-
        let i2c_port = driver.port();
        let mut timeout: i32 = 0;
        esp!(unsafe { esp_idf_sys::i2c_get_timeout(i2c_port, &mut timeout) }).unwrap();
        println!("init i2c timeout is {}", timeout);

-        //esp!(unsafe { esp_idf_sys::i2c_set_timeout(i2c_port, 22)}).unwrap();
+        let i2c_mutex = Arc::new(Mutex::new(driver));

-        let mut battery_driver: Bq34z100g1Driver<I2cDriver, Delay> = Bq34z100g1Driver {
-            i2c: driver,
+        let i2c_battery_device = MutexDevice::new(&i2c_mutex);
+        
+        let mut battery_driver: Bq34z100g1Driver<MutexDevice<I2cDriver>, Delay> = Bq34z100g1Driver {
+            i2c: i2c_battery_device,
            delay: Delay::new(0),
            flash_block_data: [0; 32],
        };

+        let i2c_rtc_device = MutexDevice::new(&i2c_mutex);
+        let rtc = Ds323x::new_ds3231(i2c_rtc_device);
+
        let mut clock = PinDriver::input_output(peripherals.pins.gpio15.downgrade())?;
        clock.set_pull(Pull::Floating).unwrap();
        let mut latch = PinDriver::input_output(peripherals.pins.gpio3.downgrade())?;
@@ -1139,6 +1147,8 @@ impl CreatePlantHal<'_> for PlantHal {
            ResetReason::Brownout => true,
            ResetReason::TaskWatchdog => true,
            ResetReason::DeepSleep => false,
+            ResetReason::USBPeripheral => true,
+            ResetReason::JTAG => true,
        };
        if reset_store {
            println!("Clear and reinit RTC store");
@@ -1212,7 +1222,7 @@ impl CreatePlantHal<'_> for PlantHal {

        let adc_config = AdcChannelConfig {
            attenuation: attenuation::DB_11,
-            resolution: esp_idf_hal::adc::config::Resolution::Resolution12Bit,
+            resolution: Resolution::Resolution12Bit,
            calibration: true,
        };
        let tank_driver = AdcDriver::new(peripherals.adc1)?;
@@ -1265,8 +1275,8 @@ impl CreatePlantHal<'_> for PlantHal {
            signal_counter: counter_unit1,
            wifi_driver,
            mqtt_client: None,
-            //battery_driver: None,
            battery_driver: Some(battery_driver),
+            rtc: Some(rtc)
        });

        let _ = rv.lock().is_ok_and(|mut board| {
--- a/rust/src/webserver/0100_2_02-bq34z100.df.fs
+++ b/rust/src/webserver/0100_2_02-bq34z100.df.fs
@@ -1,197 +0,0 @@
-;--------------------------------------------------------
-;Verify Existing Firmware Version
-;--------------------------------------------------------
-W: AA 00 01 00
-C: AA 00 00 01
-W: AA 00 02 00
-C: AA 00 02 02
-;--------------------------------------------------------
-;Unseal device
-;--------------------------------------------------------
-W: AA 00 14 04
-W: AA 00 72 36
-W: AA 00 FF FF
-W: AA 00 FF FF
-X: 1000
-;--------------------------------------------------------
-;Go To ROM Mode
-;--------------------------------------------------------
-W: AA 00 00 0F
-X: 1000
-;--------------------------------------------------------
-;Data Block
-;--------------------------------------------------------
-W: 16 00 03 00 00
-W: 16 64 03 00
-X: 20
-C: 16 66 00
-W: 16 00 02 00 00 00 EA FF 33 FA FA 33 B5 FB 33 95 FE 33 AD FE 33 FF FF 3F FF FF 3F FF FF 3F FF FF 3F FF FF 3F FF FF 3F FF FF 3F FF FF 3F FF FF 3F FF FF 3F FF FF 3F 02 02 3F 58 CB 33 C3 A0 08 1F 00 00 00 00 00 FF AA 0E FB A7 0E FF A6 0E FF A1 0E FF A0 0E FE A3 0E 54 A2 0E DE FF 3A 67 FF 3A E2 FF 33 FF AF 0E
-W: 16 64 3D 38
-X: 2
-C: 16 66 00
-W: 16 00 02 01 00 00 01 4F 03 3F 11 0C D9 FF 30 E0 FF 35 2F 10 0C E0 FF 35 FF FF 23 E3 AF 04 E2 BF 04 D1 FF 36 E2 A0 04 E3 A1 04 00 C7 02 01 C6 02 E5 AF 04 E3 BF 01 E4 AF 04 E2 BF 01 FF AC 0E E1 1C 04 8A FF 31 E2 A0 04 E3 A1 04 02 AB 18 7F 2B 0E FF 1B 0E BF FF 32 FC FA 0E FB AF 0C 02 2B 18 FF 1B 0E 98 FF 36
-W: 16 64 AE 2C
-X: 2
-C: 16 66 00
-W: 16 00 05
-W: 16 64 05 00
-X: 170
-C: 16 66 00
-C: 16 04 0A 91 AF DC
-W: 16 00 0C 00 00 00 83 DE
-W: 16 64 6D 01
-X: 400
-C: 16 66 00
-W: 16 00 0A 00 00 00 7E 22 B7 35 92 38 D0 0B F9 F1 E5 BC 00 00 14 B0 51 F6 C9 F4 14 52 09 21 32 6D 00 00 00 00 D0 7E
-W: 16 64 0B 0D
-X: 2
-C: 16 66 00
-W: 16 00 0A 01 00 00 17 DF 00 00 17 F3 00 00 3A 36 FD 91 00 25 30 01 00 EF 02 11 05 01 00 00 10 01 00 3C 00 50 3C 00
-W: 16 64 40 06
-X: 2
-C: 16 66 00
-W: 16 00 0A 02 00 00 64 3C 00 20 03 E8 00 00 04 10 68 FE D5 FB 95 00 02 00 14 03 E8 01 00 01 F4 00 1E 00 3C 0E 10 00
-W: 16 64 05 08
-X: 2
-C: 16 66 00
-W: 16 00 0A 03 00 00 0A 46 05 32 01 0F 01 F4 00 64 46 50 0A 0D 0C 0C C0 01 90 00 64 19 00 01 00 14 00 01 00 14 03 23
-W: 16 64 E0 04
-X: 2
-C: 16 66 00
-W: 16 00 0A 04 00 00 07 08 25 5A 32 0F 64 60 00 A0 0B B8 00 C8 28 01 F4 00 00 00 00 00 00 00 00 00 00 43 80 04 00 00
-W: 16 64 B0 05
-X: 2
-C: 16 66 00
-W: 16 00 0A 05 00 00 0F 00 2A 04 0A 7D 00 00 01 0A FE 76 E7 54 00 28 03 E8 02 01 2C F0 00 04 18 0D 5B 0D 28 0D 02 0D
-W: 16 64 94 06
-X: 2
-C: 16 66 00
-W: 16 00 0A 06 00 00 0A 0D 06 0D 06 0D 07 0D 06 0D 05 0D 04 0D 04 0D 03 0D 08 0D 04 0C F9 0C ED 0C EC 0C E0 0C DA 0C
-W: 16 64 A5 05
-X: 2
-C: 16 66 00
-W: 16 00 0A 07 00 00 D6 0C D7 0C DA 0C D9 0C D9 0C D8 0C D5 0C D2 0C D2 0C D0 0C C9 0C BE 0C B4 0C A7 0C 9A 0C 8A 0C
-W: 16 64 31 0D
-X: 2
-C: 16 66 00
-W: 16 00 0A 08 00 00 85 0C 7E 0C 2D 0B 64 09 64 FD 9E 03 6B 05 37 00 58 01 FA 01 D6 01 17 01 50 01 94 01 E2 01 CE 02
-W: 16 64 57 09
-X: 2
-C: 16 66 00
-W: 16 00 0A 09 00 00 62 FF 67 01 99 03 7D 05 9C 00 DA 02 CB 03 AD 04 A1 04 72 02 F1 03 A0 03 85 03 E7 04 86 04 EE 02
-W: 16 64 8E 0B
-X: 2
-C: 16 66 00
-W: 16 00 0A 0A 00 00 AB 01 0C FE D1 FE EE FF 28 FF 76 FF 51 00 13 00 88 FE 42 FD 29 05 9B 23 48 FF 7E FF 8B FF 6C FF
-W: 16 64 F0 11
-X: 2
-C: 16 66 00
-W: 16 00 0A 0B 00 00 46 FF 97 FF 8D FF 97 FF 98 FF 84 FF 8C FF AB FF B1 FF B1 FF 92 FF 74 FF 35 FF 0B FF 06 FF 5E FF
-W: 16 64 65 17
-X: 2
-C: 16 66 00
-W: 16 00 0A 0C 00 00 13 FF 17 FF 10 FE C7 FE D8 FF 0C FF 05 FE E3 FF 2E FF 1D FE B7 00 00 01 C2 00 32 FF CE 02 26 64
-W: 16 64 25 11
-X: 2
-C: 16 66 00
-W: 16 00 0A 0D 00 00 7B 1F BE 77 60 7E 00 00 00 00 64 00 19 00 64 28 63 5F 64 62 00 64 00 1E 00 B4 00 64 00 F0 00 FA
-W: 16 64 D9 08
-X: 2
-C: 16 66 00
-W: 16 00 0A 0E 00 00 11 10 10 68 49 FA 18 37 09 18 00 04 00 14 00 00 0A F0 00 0A 05 00 32 01 C2 14 14 00 00 3C 00 4B
-W: 16 64 29 05
-X: 2
-C: 16 66 00
-W: 16 00 0A 0F 00 00 00 28 00 3C 3C 01 90 36 72 04 14 FF FF FF FF 01 23 45 67 89 AB CD EF FE DC BA 98 76 54 32 10 04
-W: 16 64 02 0E
-X: 2
-C: 16 66 00
-W: 16 00 0A 10 00 00 01 75 FE 79 08 1E FF 83 7F FF 00 AF 00 04 0A 64 01 00 3C 00 00 00 00 00 00 00 00 00 00 00 00 00
-W: 16 64 8B 06
-X: 2
-C: 16 66 00
-W: 16 00 0A 11 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-W: 16 64 1B 00
-X: 2
-C: 16 66 00
-W: 16 00 0A 12 00 00 02 26 02 01 F4 02 58 02 02 26 0E 00 00 00 00 00 00 00 00 00 00 00 00 17 00 DC 84 E5 5F 60 1C 0E
-W: 16 64 12 05
-X: 2
-C: 16 66 00
-W: 16 00 0A 13 00 00 10 00 21 00 01 00 01 03 E8 64 17 70 64 00 FE 70 10 68 10 68 10 04 0A 32 1E 00 0A 2D 37 01 01 03
-W: 16 64 C9 05
-X: 2
-C: 16 66 00
-W: 16 00 0A 14 00 00 0B 62 71 33 34 7A 31 30 30 2D 47 31 0B 54 65 78 61 73 20 49 6E 73 74 2E 04 4C 49 46 4F 00 96 00
-W: 16 64 D3 08
-X: 2
-C: 16 66 00
-W: 16 00 0A 15 00 00 AF 00 4B 00 64 0A F0 02 0B 54 10 CC 02 10 68 64 01 03 05 00 00 00 00 00 00 00 00 00 00 00 00 00
-W: 16 64 9B 04
-X: 2
-C: 16 66 00
-W: 16 00 0A 16 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF
-W: 16 64 13 0D
-X: 2
-C: 16 66 00
-W: 16 00 0A 17 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-W: 16 64 01 20
-X: 2
-C: 16 66 00
-W: 16 00 0A 18 00 00 FF 55 00 1A 00 1C 00 23 00 35 00 1E 00 20 00 27 00 22 00 25 00 42 00 3F 00 41 00 76 00 9D 02 0A
-W: 16 64 91 04
-X: 2
-C: 16 66 00
-W: 16 00 0A 19 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-W: 16 64 23 00
-X: 2
-C: 16 66 00
-W: 16 00 0A 1A 00 00 FF FF 00 1A 00 1C 00 23 00 35 00 1E 00 20 00 27 00 22 00 25 00 42 00 3F 00 41 00 76 00 9D 02 0A
-W: 16 64 3D 05
-X: 2
-C: 16 66 00
-W: 16 00 0A 1B 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-W: 16 64 25 00
-X: 2
-C: 16 66 00
-W: 16 00 0A 1C 00 00 11 10 10 68 49 FA 18 37 09 18 00 04 00 14 00 00 0A F0 00 0A 05 00 32 01 C2 14 14 00 00 3C 00 4B
-W: 16 64 37 05
-X: 2
-C: 16 66 00
-W: 16 00 0A 1D 00 00 00 28 00 3C 3C 01 90 36 72 04 14 FF FF FF FF 01 23 45 67 89 AB CD EF FE DC BA 98 76 54 32 10 04
-W: 16 64 10 0E
-X: 2
-C: 16 66 00
-W: 16 00 0A 1E 00 00 FF FF FF FF 00 00 02 6B FF FF FD 93 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-W: 16 64 0B 1C
-X: 2
-C: 16 66 00
-W: 16 00 0A 1F 00 00 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-W: 16 64 09 20
-X: 2
-C: 16 66 00
-W: 16 00 08
-W: 16 64 08 00
-X: 2
-C: 16 66 00
-C: 16 04 F1 4C
-W: 16 00 05
-W: 16 64 05 00
-X: 170
-C: 16 66 00
-C: 16 04 0A 91 AF DC
-W: 16 00 01 00 00 05 54 54 15
-W: 16 64 C3 00
-X: 20
-C: 16 66 00
-W: 16 00 05
-W: 16 64 05 00
-X: 170
-C: 16 66 00
-C: 16 04 5F E5 84 DC
-;--------------------------------------------------------
-;Execute Flash Code
-;--------------------------------------------------------
-W: 16 00 0F
-W: 16 64 0F 00
-X: 4000
--- a/rust/src/webserver/webserver.rs
+++ b/rust/src/webserver/webserver.rs
@@ -9,10 +9,9 @@ use std::{

 use crate::{espota::OtaUpdate, BOARD_ACCESS};
 use core::result::Result::Ok;
-use embedded_svc::http::{Method};
+use embedded_svc::http::Method;
 use esp_idf_hal::delay::Delay;
 use esp_idf_svc::http::server::{Configuration, EspHttpServer};
-use esp_idf_sys::vTaskDelay;
 use heapless::String;
 use serde::{Deserialize, Serialize};