mqtt via mcutie

rust/src/hal/mod.rs

@@ -4,6 +4,7 @@ mod initial_hal;
 mod little_fs2storage_adapter;
 pub(crate) mod rtc;
 mod v3_hal;
+mod v3_shift_register;
 mod v4_hal;
 mod v4_sensor;
 mod water;
@@ -68,11 +69,8 @@ use eeprom24x::page_size::B32;
 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;
-//use battery::BQ34Z100G1;
-//use bq34z100::Bq34z100g1Driver;
 use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
+use embassy_sync::blocking_mutex::CriticalSectionMutex;
 use esp_bootloader_esp_idf::partitions::{
     AppPartitionSubType, DataPartitionSubType, FlashRegion, PartitionEntry,
 };
@@ -218,12 +216,8 @@ macro_rules! mk_static {
     }};
 }
 
-const GW_IP_ADDR_ENV: Option<&'static str> = option_env!("GATEWAY_IP");
-
 impl PlantHal {
-    pub async fn create(
-        spawner: Spawner,
-    ) -> Result<Mutex<CriticalSectionRawMutex, HAL<'static>>, FatError> {
+    pub async fn create() -> Result<Mutex<CriticalSectionRawMutex, HAL<'static>>, FatError> {
         let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
         let peripherals: Peripherals = esp_hal::init(config);
 
@@ -394,7 +388,6 @@ impl PlantHal {
             interface_ap: Some(ap),
             boot_button,
             wake_gpio1,
-            mqtt_client: None,
             ota,
             ota_next,
         };
@@ -548,9 +541,6 @@ impl PlantHal {
                         v4_hal::create_v4(free_pins, esp, config, battery_interaction, rtc_module)
                             .await?
                     }
-                    _ => {
-                        bail!("Unknown board version");
-                    }
                 };
 
                 HAL { board_hal }