Merge branch 'develop' into housekeeping and clippy and spellcheck

rust/src/hal/v4_hal.rs

@@ -1,6 +1,6 @@
 use crate::config::PlantControllerConfig;
 use crate::hal::battery::BatteryInteraction;
-use crate::hal::esp::ESP;
+use crate::hal::esp::Esp;
 use crate::hal::{
     deep_sleep, BackupHeader, BoardInteraction, FreePeripherals, Sensor, I2C_DRIVER, PLANT_COUNT,
     REPEAT_MOIST_MEASURE, TANK_MULTI_SAMPLE, X25,
@@ -22,15 +22,15 @@ use esp_idf_hal::i2c::I2cDriver;
 use esp_idf_hal::pcnt::{
     PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex,
 };
-use esp_idf_sys::{gpio_hold_dis, gpio_hold_en, vTaskDelay, EspError};
+use esp_idf_sys::{gpio_hold_dis, gpio_hold_en, EspError};
 use ina219::address::{Address, Pin};
-use ina219::calibration::{Calibration, UnCalibrated};
+use ina219::calibration::UnCalibrated;
+use ina219::configuration::{Configuration, OperatingMode};
 use ina219::SyncIna219;
 use measurements::{Current, Resistance, Voltage};
 use one_wire_bus::OneWire;
 use pca9535::{GPIOBank, Pca9535Immediate, StandardExpanderInterface};
 use std::result::Result::Ok as OkStd;
-use ina219::configuration::{Configuration, OperatingMode};
 
 const MS0: u8 = 1_u8;
 const MS1: u8 = 0_u8;
@@ -47,23 +47,27 @@ pub enum Charger<'a> {
     },
 }
 
-impl<'a> Charger<'a> {
-    pub(crate) fn powersave(&mut self) {
-        match self { Charger::SolarMpptV1 { mppt_ina, .. } => {
-            let _ = mppt_ina.set_configuration(Configuration {
-                reset: Default::default(),
-                bus_voltage_range: Default::default(),
-                shunt_voltage_range: Default::default(),
-                bus_resolution: Default::default(),
-                shunt_resolution: Default::default(),
-                operating_mode: OperatingMode::PowerDown,
-            }).map_err(|e| {
-                println!(
-                    "Error setting ina mppt configuration during deepsleep preparation{:?}",
+impl Charger<'_> {
+    pub(crate) fn power_save(&mut self) {
+        match self {
+            Charger::SolarMpptV1 { mppt_ina, .. } => {
+                let _ = mppt_ina
+                    .set_configuration(Configuration {
+                        reset: Default::default(),
+                        bus_voltage_range: Default::default(),
+                        shunt_voltage_range: Default::default(),
+                        bus_resolution: Default::default(),
+                        shunt_resolution: Default::default(),
+                        operating_mode: OperatingMode::PowerDown,
+                    })
+                    .map_err(|e| {
+                        println!(
+                    "Error setting ina mppt configuration during deep sleep preparation{:?}",
                     e
                 );
-            });
-        } }
+                    });
+            }
+        }
     }
     fn set_charge_indicator(&mut self, charging: bool) -> anyhow::Result<()> {
         match self {
@@ -105,7 +109,7 @@ impl<'a> Charger<'a> {
 }
 
 pub struct V4<'a> {
-    esp: ESP<'a>,
+    esp: Esp<'a>,
     charger: Charger<'a>,
     battery_monitor: Box<dyn BatteryInteraction + Send>,
     config: PlantControllerConfig,
@@ -130,10 +134,10 @@ pub struct V4<'a> {
 
 pub(crate) fn create_v4(
     peripherals: FreePeripherals,
-    esp: ESP<'static>,
+    esp: Esp<'static>,
     config: PlantControllerConfig,
     battery_monitor: Box<dyn BatteryInteraction + Send>,
-) -> anyhow::Result<Box<dyn BoardInteraction + Send + '_>> {
+) -> anyhow::Result<Box<dyn BoardInteraction<'static> + Send + 'static>> {
     let mut awake = PinDriver::output(peripherals.gpio15.downgrade())?;
     awake.set_high()?;
 
@@ -244,7 +248,7 @@ pub(crate) fn create_v4(
         Address::from_pins(Pin::Vcc, Pin::Gnd),
     )?;
 
-    mppt_ina.set_configuration(Configuration{
+    mppt_ina.set_configuration(Configuration {
         reset: Default::default(),
         bus_voltage_range: Default::default(),
         shunt_voltage_range: Default::default(),
@@ -252,7 +256,7 @@ pub(crate) fn create_v4(
         shunt_resolution: ina219::configuration::Resolution::Avg128,
         operating_mode: Default::default(),
     })?;
-    //TODO this is probably laready done untill we are ready first time?, maybee add startup time comparison on access?
+    //TODO this is probably already done until we are ready first time?, maybe add startup time comparison on access?
     esp.delay.delay_ms(
         mppt_ina
             .configuration()?
@@ -288,7 +292,7 @@ pub(crate) fn create_v4(
 }
 
 impl<'a> BoardInteraction<'a> for V4<'a> {
-    fn get_esp(&mut self) -> &mut ESP<'a> {
+    fn get_esp(&mut self) -> &mut Esp<'a> {
         &mut self.esp
     }
 
@@ -306,7 +310,7 @@ impl<'a> BoardInteraction<'a> for V4<'a> {
 
     fn deep_sleep(&mut self, duration_in_ms: u64) -> ! {
         self.awake.set_low().unwrap();
-        self.charger.powersave();
+        self.charger.power_save();
         deep_sleep(duration_in_ms);
     }