remove anyhow

rust/src/hal/battery.rs

@@ -1,27 +1,20 @@
-use crate::hal::Box;
+use crate::FatError::{FatError, FatResult};
 use alloc::string::String;
 use async_trait::async_trait;
-use core::error::Error;
 use serde::Serialize;
 
 #[async_trait]
 pub trait BatteryInteraction {
-    async fn state_charge_percent(&mut self) -> Result<f32, BatteryError>;
-    async fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>;
-    async fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>;
-    async fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>;
-    async fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError>;
-    async fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError>;
-    async fn cycle_count(&mut self) -> Result<u16, BatteryError>;
-    async fn state_health_percent(&mut self) -> Result<u16, BatteryError>;
-    async fn bat_temperature(&mut self) -> Result<u16, BatteryError>;
-    async fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError>;
-}
-
-impl From<BatteryError> for anyhow::Error {
-    fn from(err: BatteryError) -> Self {
-        anyhow::anyhow!(err)
-    }
+    async fn state_charge_percent(&mut self) -> FatResult<f32>;
+    async fn remaining_milli_ampere_hour(&mut self) -> FatResult<u16>;
+    async fn max_milli_ampere_hour(&mut self) -> FatResult<u16>;
+    async fn design_milli_ampere_hour(&mut self) -> FatResult<u16>;
+    async fn voltage_milli_volt(&mut self) -> FatResult<u16>;
+    async fn average_current_milli_ampere(&mut self) -> FatResult<i16>;
+    async fn cycle_count(&mut self) -> FatResult<u16>;
+    async fn state_health_percent(&mut self) -> FatResult<u16>;
+    async fn bat_temperature(&mut self) -> FatResult<u16>;
+    async fn get_battery_state(&mut self) -> FatResult<BatteryState>;
 }
 
 #[derive(Debug, Serialize)]
@@ -60,43 +53,43 @@ pub enum BatteryState {
 pub struct NoBatteryMonitor {}
 #[async_trait]
 impl BatteryInteraction for NoBatteryMonitor {
-    async fn state_charge_percent(&mut self) -> Result<f32, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn state_charge_percent(&mut self) -> FatResult<f32> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn remaining_milli_ampere_hour(&mut self) -> FatResult<u16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn max_milli_ampere_hour(&mut self) -> FatResult<u16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn design_milli_ampere_hour(&mut self) -> FatResult<u16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn voltage_milli_volt(&mut self) -> FatResult<u16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn average_current_milli_ampere(&mut self) -> FatResult<i16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn cycle_count(&mut self) -> Result<u16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn cycle_count(&mut self) -> FatResult<u16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn state_health_percent(&mut self) -> Result<u16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn state_health_percent(&mut self) -> FatResult<u16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn bat_temperature(&mut self) -> Result<u16, BatteryError> {
-        Err(BatteryError::NoBatteryMonitor)
+    async fn bat_temperature(&mut self) -> FatResult<u16> {
+        Err(FatError::NoBatteryMonitor)
     }
 
-    async fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError> {
+    async fn get_battery_state(&mut self) -> FatResult<BatteryState> {
         Ok(BatteryState::Unknown)
     }
 }