enable deepsleep and gpio1 + timer wake

rust/src/hal/mod.rs

@@ -13,7 +13,6 @@ 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;
 use esp_hal::peripherals::GPIO11;
 use esp_hal::peripherals::GPIO12;
@@ -106,7 +105,7 @@ use littlefs2::fs::{Allocation, Filesystem as lfs2Filesystem};
 use littlefs2::object_safe::DynStorage;
 use log::{info, warn};
 
-pub static TIME_ACCESS: OnceLock<Rtc> = OnceLock::new();
+pub static TIME_ACCESS: OnceLock<Mutex<CriticalSectionRawMutex, Rtc>> = OnceLock::new();
 
 //Only support for 8 right now!
 pub const PLANT_COUNT: usize = 8;
@@ -175,7 +174,6 @@ pub trait BoardInteraction<'a> {
 #[allow(dead_code)]
 pub struct FreePeripherals<'a> {
     pub gpio0: GPIO0<'a>,
-    pub gpio1: GPIO1<'a>,
     pub gpio2: GPIO2<'a>,
     pub gpio3: GPIO3<'a>,
     pub gpio4: GPIO4<'a>,
@@ -232,7 +230,7 @@ impl PlantHal {
         esp_alloc::heap_allocator!(#[link_section = ".dram2_uninit"] size: 64000);
 
         let rtc: Rtc = Rtc::new(peripherals.LPWR);
-        TIME_ACCESS.init(rtc).map_err(|_| FatError::String {
+        TIME_ACCESS.init(Mutex::new(rtc)).map_err(|_| FatError::String {
             error: "Init error rct".to_string(),
         })?;
 
@@ -243,6 +241,9 @@ impl PlantHal {
             InputConfig::default().with_pull(Pull::None),
         );
 
+        // Reserve GPIO1 for deep sleep wake (configured just before entering sleep)
+        let wake_gpio1 = peripherals.GPIO1;
+
         let rng = Rng::new(peripherals.RNG);
         let timg0 = TimerGroup::new(peripherals.TIMG0);
         let esp_wifi_ctrl = &*mk_static!(
@@ -267,7 +268,6 @@ impl PlantHal {
             //     pcnt0: peripherals.pcnt0,
             //     pcnt1: peripherals.pcnt1,
             gpio0: peripherals.GPIO0,
-            gpio1: peripherals.GPIO1,
             gpio2: peripherals.GPIO2,
             gpio3: peripherals.GPIO3,
             gpio4: peripherals.GPIO4,
@@ -390,6 +390,7 @@ impl PlantHal {
             interface_sta : Some(sta),
             interface_ap : Some(ap),
             boot_button,
+            wake_gpio1,
             mqtt_client: None,
             ota,
             ota_next,
@@ -402,25 +403,25 @@ impl PlantHal {
             None => "unknown",
             Some(reason) => match reason {
                 SocResetReason::ChipPowerOn => "power on",
-                SocResetReason::CoreSw => "software reset",
-                SocResetReason::CoreDeepSleep => "deep sleep",
                 SocResetReason::CoreSDIO => "sdio reset",
                 SocResetReason::CoreMwdt0 => "Watchdog Main",
                 SocResetReason::CoreMwdt1 => "Watchdog 1",
                 SocResetReason::CoreRtcWdt => "Watchdog RTC",
                 SocResetReason::Cpu0Mwdt0 => "Watchdog MCpu0",
                 SocResetReason::Cpu0Sw => "software reset cpu0",
+                SocResetReason::SysRtcWdt => "Watchdog Sys rtc",
+                SocResetReason::Cpu0Mwdt1 => "cpu0 mwdt1",
+                SocResetReason::SysSuperWdt => "Watchdog Super",
                 SocResetReason::Cpu0RtcWdt => {
                     init_rtc_store = true;
                     "Watchdog RTC cpu0"
                 }
+                SocResetReason::CoreSw => "software reset",
+                SocResetReason::CoreDeepSleep => "deep sleep",
                 SocResetReason::SysBrownOut => "sys brown out",
-                SocResetReason::SysRtcWdt => "Watchdog Sys rtc",
-                SocResetReason::Cpu0Mwdt1 => "cpu0 mwdt1",
-                SocResetReason::SysSuperWdt => "Watchdog Super",
                 SocResetReason::CoreEfuseCrc => "core efuse crc",
                 SocResetReason::CoreUsbUart => {
-                    to_config_mode = true;
+                    //TODO still required? or via button ignore? to_config_mode = true;
                     "core usb uart"
                 }
                 SocResetReason::CoreUsbJtag => "core usb jtag",
@@ -577,14 +578,15 @@ impl PlantHal {
 }
 
 pub async fn esp_time() -> DateTime<Utc> {
-    DateTime::from_timestamp_micros(TIME_ACCESS.get().await.current_time_us() as i64).unwrap()
+    let guard = TIME_ACCESS.get().await.lock().await;
+    DateTime::from_timestamp_micros(guard.current_time_us() as i64).unwrap()
 }
 
 pub async fn esp_set_time(time: DateTime<FixedOffset>) {
-    TIME_ACCESS
-        .get()
-        .await
-        .set_current_time_us(time.timestamp_micros() as u64);
+    {
+        let mut guard = TIME_ACCESS.get().await.lock().await;
+        guard.set_current_time_us(time.timestamp_micros() as u64);
+    }
     BOARD_ACCESS
         .get()
         .await