tanksensor and rtc sync

rust/src/hal/mod.rs

@@ -10,6 +10,8 @@ mod water;
 use crate::alloc::string::ToString;
 use crate::hal::rtc::{DS3231Module, RTCModuleInteraction};
 use esp_hal::peripherals::Peripherals;
+use esp_hal::peripherals::ADC1;
+use esp_hal::peripherals::APB_SARADC;
 use esp_hal::peripherals::GPIO0;
 use esp_hal::peripherals::GPIO1;
 use esp_hal::peripherals::GPIO10;
@@ -38,6 +40,7 @@ use esp_hal::peripherals::GPIO5;
 use esp_hal::peripherals::GPIO6;
 use esp_hal::peripherals::GPIO7;
 use esp_hal::peripherals::GPIO8;
+use esp_hal::peripherals::PCNT;
 use esp_hal::peripherals::TWAI0;
 
 use crate::{
@@ -48,6 +51,7 @@ use crate::{
         esp::Esp,
     },
     log::LogMessage,
+    BOARD_ACCESS,
 };
 use alloc::boxed::Box;
 use alloc::format;
@@ -65,10 +69,10 @@ use eeprom24x::unique_serial::No;
 use eeprom24x::{Eeprom24x, SlaveAddr, Storage};
 use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice;
 use embassy_executor::Spawner;
-use embassy_sync::blocking_mutex::{CriticalSectionMutex, NoopMutex};
+use embassy_sync::blocking_mutex::CriticalSectionMutex;
 //use battery::BQ34Z100G1;
 //use bq34z100::Bq34z100g1Driver;
-use embassy_sync::blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex};
+use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
 use esp_bootloader_esp_idf::partitions::{
     AppPartitionSubType, DataPartitionSubType, FlashRegion, PartitionEntry,
 };
@@ -86,15 +90,15 @@ use embassy_sync::once_lock::OnceLock;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_bootloader_esp_idf::ota::Slot;
-use esp_bootloader_esp_idf::partitions::DataPartitionSubType::Fat;
 use esp_hal::delay::Delay;
 use esp_hal::i2c::master::{BusTimeout, Config, I2c};
+use esp_hal::pcnt::unit::Unit;
+use esp_hal::pcnt::Pcnt;
 use esp_hal::rng::Rng;
 use esp_hal::rtc_cntl::{Rtc, SocResetReason};
 use esp_hal::system::reset_reason;
 use esp_hal::time::Rate;
 use esp_hal::timer::timg::TimerGroup;
-use esp_hal::twai::Twai;
 use esp_hal::Blocking;
 use esp_storage::FlashStorage;
 use esp_wifi::{init, EspWifiController};
@@ -201,10 +205,9 @@ pub struct FreePeripherals<'a> {
     pub gpio29: GPIO29<'a>,
     pub gpio30: GPIO30<'a>,
     pub twai: TWAI0<'a>,
-    // pub pcnt0: PCNT0,
-    // pub pcnt1: PCNT1,
-    // pub adc1: ADC1,
-    // pub can: CAN,
+    pub pcnt0: Unit<'a, 0>,
+    pub pcnt1: Unit<'a, 1>,
+    pub adc1: ADC1<'a>,
 }
 
 macro_rules! mk_static {
@@ -255,6 +258,9 @@ impl PlantHal {
 
         //let mut adc1 = Adc::new(peripherals.ADC1, adc1_config);
         //
+
+        let pcnt_module = Pcnt::new(peripherals.PCNT);
+
         let free_pins = FreePeripherals {
             //     can: peripherals.can,
             //     adc1: peripherals.adc1,
@@ -289,6 +295,9 @@ impl PlantHal {
             gpio29: peripherals.GPIO29,
             gpio30: peripherals.GPIO30,
             twai: peripherals.TWAI0,
+            pcnt0: pcnt_module.unit0,
+            pcnt1: pcnt_module.unit1,
+            adc1: peripherals.ADC1,
         };
 
         let tablebuffer = mk_static!(
@@ -381,7 +390,6 @@ impl PlantHal {
             mqtt_client: None,
             ota,
             ota_next,
-            wall_clock_offset: 0,
         };
 
         //init,reset rtc memory depending on cause
@@ -574,4 +582,13 @@ pub async fn esp_set_time(time: DateTime<FixedOffset>) {
         .get()
         .await
         .set_current_time_us(time.timestamp_micros() as u64);
+    BOARD_ACCESS
+        .get()
+        .await
+        .lock()
+        .await
+        .board_hal
+        .get_rtc_module()
+        .set_rtc_time(&time.to_utc())
+        .await;
 }