remove anyhow

rust/src/hal/initial_hal.rs

@@ -3,16 +3,17 @@ use crate::hal::rtc::{BackupHeader, RTCModuleInteraction};
 use alloc::vec::Vec;
 //use crate::hal::water::TankSensor;
 use crate::alloc::boxed::Box;
+use crate::hal::water::TankSensor;
 use crate::hal::{BoardInteraction, FreePeripherals, Sensor};
+use crate::FatError::FatError;
 use crate::{
+    bail,
     config::PlantControllerConfig,
     hal::battery::{BatteryInteraction, NoBatteryMonitor},
 };
-use anyhow::{bail, Result};
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
 use esp_hal::gpio::{Level, Output, OutputConfig};
-use log::info;
 use measurements::{Current, Voltage};
 
 pub struct Initial<'a> {
@@ -23,27 +24,27 @@ pub struct Initial<'a> {
     pub rtc: Box<dyn RTCModuleInteraction + Send>,
 }
 
-struct NoRTC {}
+pub(crate) struct NoRTC {}
 
 #[async_trait]
 impl RTCModuleInteraction for NoRTC {
-    async fn get_backup_info(&mut self) -> Result<BackupHeader> {
+    async fn get_backup_info(&mut self) -> Result<BackupHeader, FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn get_backup_config(&mut self) -> Result<Vec<u8>> {
+    async fn get_backup_config(&mut self) -> Result<Vec<u8>, FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn backup_config(&mut self, _bytes: &[u8]) -> Result<()> {
+    async fn backup_config(&mut self, _bytes: &[u8]) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn get_rtc_time(&mut self) -> Result<DateTime<Utc>> {
+    async fn get_rtc_time(&mut self) -> Result<DateTime<Utc>, FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn set_rtc_time(&mut self, _time: &DateTime<Utc>) -> Result<()> {
+    async fn set_rtc_time(&mut self, _time: &DateTime<Utc>) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 }
@@ -52,7 +53,7 @@ pub(crate) fn create_initial_board(
     free_pins: FreePeripherals<'static>,
     config: PlantControllerConfig,
     esp: Esp<'static>,
-) -> Result<Box<dyn BoardInteraction<'static> + Send>> {
+) -> Result<Box<dyn BoardInteraction<'static> + Send>, FatError> {
     log::info!("Start initial");
     let general_fault = Output::new(free_pins.gpio23, Level::Low, OutputConfig::default());
     let v = Initial {
@@ -67,9 +68,9 @@ pub(crate) fn create_initial_board(
 
 #[async_trait]
 impl<'a> BoardInteraction<'a> for Initial<'a> {
-    // fn get_tank_sensor(&mut self) -> Option<&mut TankSensor<'a>> {
-    //     None
-    // }
+    fn get_tank_sensor(&mut self) -> Result<&mut TankSensor<'a>, FatError> {
+        bail!("Please configure board revision")
+    }
 
     fn get_esp(&mut self) -> &mut Esp<'a> {
         &mut self.esp
@@ -87,7 +88,7 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
         &mut self.rtc
     }
 
-    fn set_charge_indicator(&mut self, _charging: bool) -> Result<()> {
+    fn set_charge_indicator(&mut self, _charging: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
@@ -97,23 +98,27 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
     fn is_day(&self) -> bool {
         false
     }
-    fn light(&mut self, _enable: bool) -> Result<()> {
+    fn light(&mut self, _enable: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn pump(&mut self, _plant: usize, _enable: bool) -> Result<()> {
+    async fn pump(&mut self, _plant: usize, _enable: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn pump_current(&mut self, _plant: usize) -> Result<Current> {
+    async fn pump_current(&mut self, _plant: usize) -> Result<Current, FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn fault(&mut self, _plant: usize, _enable: bool) -> Result<()> {
+    async fn fault(&mut self, _plant: usize, _enable: bool) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn measure_moisture_hz(&mut self, _plant: usize, _sensor: Sensor) -> Result<f32> {
+    async fn measure_moisture_hz(
+        &mut self,
+        _plant: usize,
+        _sensor: Sensor,
+    ) -> Result<f32, FatError> {
         bail!("Please configure board revision")
     }
 
@@ -121,7 +126,7 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
         self.general_fault.set_level(enable.into());
     }
 
-    async fn test(&mut self) -> Result<()> {
+    async fn test(&mut self) -> Result<(), FatError> {
         bail!("Please configure board revision")
     }
 
@@ -129,11 +134,11 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
         self.config = config;
     }
 
-    async fn get_mptt_voltage(&mut self) -> Result<Voltage> {
+    async fn get_mptt_voltage(&mut self) -> Result<Voltage, FatError> {
         bail!("Please configure board revision")
     }
 
-    async fn get_mptt_current(&mut self) -> Result<Current> {
+    async fn get_mptt_current(&mut self) -> Result<Current, FatError> {
         bail!("Please configure board revision")
     }
 }