Merge pull request #164 from card-io-ecg/old

Remove hw_v1

Cargo.toml

@@ -165,10 +165,8 @@ esp-wifi = { git = "https://github.com/esp-rs/esp-wifi", rev = "d200a167237f03cf
 [features]
 default = ["defmt"]
 
-battery_adc = []
 battery_max17055 = ["dep:max17055"]
 
-hw_v1 = ["battery_adc", "esp32s3"]
 hw_v2 = ["battery_max17055", "esp32s3"] # skipped v3
 hw_v4 = ["battery_max17055", "esp32s3"]
 hw_v6 = ["battery_max17055"] # skipped v5, v6 has S3 and C6 options

build.rs

@@ -84,14 +84,13 @@ fn main() {
 
     // Ensure that only a single HW version
     let hw_features = [
-        (cfg!(feature = "hw_v1"), HwVersion::V1),
         (cfg!(feature = "hw_v2"), HwVersion::V2),
         (cfg!(feature = "hw_v4"), HwVersion::V4),
         (cfg!(feature = "hw_v6"), HwVersion::V6),
     ];
 
     let Some(hw_version) = get_unique(hw_features) else {
-        panic!("Exactly 1 hardware version must be selected via its Cargo feature (hw_v1, hw_v2, hw_v4, hw_v6)");
+        panic!("Exactly 1 hardware version must be selected via its Cargo feature (hw_v2, hw_v4, hw_v6)");
     };
 
     let build_config = BuildConfig { mcu, hw_version };

src/board/drivers/battery_monitor/mod.rs

@@ -6,19 +6,9 @@ use embassy_sync::mutex::Mutex;
 use embedded_hal::digital::InputPin;
 use gui::screens::{BatteryInfo, ChargingState};
 
-#[cfg(feature = "battery_adc")]
-pub mod battery_adc;
 #[cfg(feature = "battery_max17055")]
 pub mod battery_fg;
 
-#[cfg(feature = "battery_adc")]
-use crate::board::{
-    drivers::battery_monitor::battery_adc::{
-        monitor_task_adc as monitor_task, BatteryAdcData as BatteryData,
-    },
-    BatteryAdc as BatterySensorImpl,
-};
-
 #[cfg(feature = "battery_max17055")]
 use crate::board::{
     drivers::battery_monitor::battery_fg::{
@@ -27,10 +17,10 @@ use crate::board::{
     BatteryFg as BatterySensorImpl,
 };
 
-#[cfg(any(feature = "battery_adc", feature = "battery_max17055"))]
+#[cfg(feature = "battery_max17055")]
 use crate::board::LOW_BATTERY_PERCENTAGE;
 
-#[cfg(any(feature = "battery_adc", feature = "battery_max17055"))]
+#[cfg(feature = "battery_max17055")]
 use embassy_executor::Spawner;
 
 #[derive(Default, Clone, Copy)]
@@ -142,33 +132,6 @@ impl<VBUS: InputPin, CHG: InputPin> BatteryMonitor<VBUS, CHG> {
     }
 }
 
-#[cfg(feature = "battery_adc")]
-impl<VBUS: InputPin, CHG: InputPin> BatteryMonitor<VBUS, CHG> {
-    fn convert_battery_data(&self, data: BatteryData) -> BatteryInfo {
-        use signal_processing::battery::BatteryModel;
-
-        let battery_model = BatteryModel {
-            voltage: (2750, 4200),
-            charge_current: (0, 1000),
-        };
-
-        let charge_current = if self.is_charging() {
-            None
-        } else {
-            Some(data.charge_current)
-        };
-
-        let percentage = battery_model.estimate(data.voltage, charge_current);
-
-        BatteryInfo {
-            voltage: data.voltage,
-            charging_state: self.charging_state(),
-            percentage,
-            is_low: percentage < LOW_BATTERY_PERCENTAGE,
-        }
-    }
-}
-
 #[cfg(feature = "battery_max17055")]
 impl<VBUS: InputPin, CHG: InputPin> BatteryMonitor<VBUS, CHG> {
     pub fn convert_battery_data(&mut self, data: BatteryData) -> BatteryInfo {