doc: 更新 README 已完成的特性。

Reviewed-on: Ivan/ups-esp32c3-rust#6

README.md

@@ -9,7 +9,7 @@
 - [x] 以 NTP 方式校准时间；
 - [x] 以 MQTT 方式上报状态；
 - [x] 提供 UPS 电源输出的控制信号；
-- [ ] 提供 UPS 内置电池充电电路电源输入的控制信号；
+- [x] 提供 UPS 内置电池充电电路电源输入的控制信号；
 
 ## GPIO 定义
 

src/charge_controller.rs

@@ -1,4 +1,7 @@
-use std::sync::{Arc, Mutex, MutexGuard};
+use std::{
+    sync::{Arc, Mutex, MutexGuard},
+    time::Duration,
+};
 
 use embedded_hal::digital::v2::{OutputPin, PinState};
 use embedded_svc::event_bus::{EventBus, Postbox};
@@ -8,10 +11,13 @@ use esp_idf_svc::eventloop::{
     EspSubscription, EspTypedEventDeserializer, EspTypedEventSerializer, EspTypedEventSource, User,
 };
 use esp_idf_sys::c_types;
-use log::{warn};
+use log::warn;
 use serde_json::json;
 
-use crate::voltage_detection::{VoltageDetectionWorker, VOLTAGE_EVENTLOOP};
+use crate::{
+    time::Time,
+    voltage_detection::{VoltageDetectionWorker, VOLTAGE_EVENTLOOP},
+};
 
 pub static mut CHARGE_STATE_EVENT_LOOP: Option<
     EspEventLoop<esp_idf_svc::eventloop::User<Background>>,
@@ -27,6 +33,7 @@ pub enum ChargeStatus {
 pub struct ChargeControllerState {
     pub status: ChargeStatus,
     pub pin_state: PinState,
+    pub charge_deadline_at: Duration,
 }
 
 impl ChargeControllerState {
@@ -34,6 +41,7 @@ impl ChargeControllerState {
         Self {
             status: ChargeStatus::Charging,
             pin_state: PinState::Low,
+            charge_deadline_at: Duration::ZERO,
         }
     }
 
@@ -46,7 +54,13 @@ impl ChargeControllerState {
             PinState::Low => "Low",
             PinState::High => "High",
         };
-        json!({ "status": status, "pin_state": pin_state}).to_string()
+        let now = Time::new().get_time();
+        let charging_count_down = if now > self.charge_deadline_at {
+            -1i64
+        } else {
+            (self.charge_deadline_at - now).as_secs() as i64
+        };
+        json!({ "status": status, "pin_state": pin_state, "charging_count_down": charging_count_down}).to_string()
     }
 }
 
@@ -112,7 +126,14 @@ impl ChargeController {
                             if obj.battery_voltage < 12600 {
                                 state.status = ChargeStatus::Charging;
                             } else {
-                                state.status = ChargeStatus::Charged;
+                                let now = Time::new().get_time();
+                                if state.charge_deadline_at == Duration::ZERO {
+                                    state.charge_deadline_at = now + Duration::from_secs(600);
+                                } else if now > state.charge_deadline_at {
+                                    state.status = ChargeStatus::Charged;
+                                } else {
+                                    state.status = ChargeStatus::Charging;
+                                }
                             }
                         }
                         ChargeStatus::Charged => {

src/dc_out_controller.rs

@@ -1,7 +1,6 @@
 use std::{
-    sync::{
-        Arc, Mutex, MutexGuard,
-    },
+    sync::{Arc, Mutex, MutexGuard},
+    time::Duration,
 };
 
 use embedded_hal::digital::v2::{OutputPin, PinState};
@@ -12,12 +11,16 @@ use esp_idf_svc::eventloop::{
     EspSubscription, EspTypedEventDeserializer, EspTypedEventSerializer, EspTypedEventSource, User,
 };
 use esp_idf_sys::c_types;
-use log::{info, warn, debug};
+use log::warn;
 use serde_json::json;
 
-use crate::voltage_detection::{VoltageDetectionWorker, VOLTAGE_EVENTLOOP};
+use crate::{
+    time::Time,
+    voltage_detection::{VoltageDetectionWorker, VOLTAGE_EVENTLOOP},
+};
 
-const WAITING_OFF_SECONDS: u8 = 60;
+const WAITING_OFF_DURATION: u64 = 60;
+const WAITING_ON_DURATION: u64 = 60;
 
 pub static mut DC_OUT_STATE_EVENT_LOOP: Option<
     EspEventLoop<esp_idf_svc::eventloop::User<Background>>,
@@ -25,11 +28,11 @@ pub static mut DC_OUT_STATE_EVENT_LOOP: Option<
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum DcOutStatus {
-    WaitingOn(u8),
+    WaitingOn(Duration),
     On,
     Off,
     WaitingOff,
-    TurningOff(u8),
+    TurningOff(Duration),
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -54,11 +57,9 @@ impl DcOutControllerState {
             DcOutStatus::WaitingOn(_) => {
                 self.status = DcOutStatus::Off;
             }
-            DcOutStatus::TurningOff(seconds) => {
-                let seconds = seconds - 1;
-                if seconds > 0 {
-                    self.status = DcOutStatus::TurningOff(seconds);
-                } else {
+            DcOutStatus::TurningOff(target) => {
+                let now = Time::new().get_time();
+                if now > target {
                     self.status = DcOutStatus::Off;
                 }
             }
@@ -67,21 +68,21 @@ impl DcOutControllerState {
     }
 
     fn turn_off(&mut self) {
+        let now = Time::new().get_time();
         match self.status {
             DcOutStatus::On => {
-                self.status = DcOutStatus::TurningOff(WAITING_OFF_SECONDS);
+                self.status =
+                    DcOutStatus::TurningOff(now + Duration::from_secs(WAITING_OFF_DURATION));
             }
             DcOutStatus::WaitingOff => {
-                self.status = DcOutStatus::TurningOff(WAITING_OFF_SECONDS);
+                self.status =
+                    DcOutStatus::TurningOff(now + Duration::from_secs(WAITING_OFF_DURATION));
             }
             DcOutStatus::WaitingOn(_) => {
                 self.status = DcOutStatus::Off;
             }
-            DcOutStatus::TurningOff(seconds) => {
-                let seconds = seconds - 1;
-                if seconds > 0 {
-                    self.status = DcOutStatus::TurningOff(seconds);
-                } else {
+            DcOutStatus::TurningOff(target) => {
+                if target < now {
                     self.status = DcOutStatus::Off;
                 }
             }
@@ -90,26 +91,22 @@ impl DcOutControllerState {
     }
 
     fn turn_on(&mut self) {
+        let now = Time::new().get_time();
         match self.status {
             DcOutStatus::WaitingOff => {
                 self.status = DcOutStatus::On;
             }
             DcOutStatus::Off => {
-                self.status = DcOutStatus::WaitingOn(WAITING_OFF_SECONDS);
+                self.status =
+                    DcOutStatus::WaitingOn(now + Duration::from_secs(WAITING_ON_DURATION));
             }
-            DcOutStatus::WaitingOn(seconds) => {
-                let seconds = seconds - 1;
-                if seconds > 0 {
-                    self.status = DcOutStatus::WaitingOn(seconds);
-                } else {
+            DcOutStatus::WaitingOn(target) => {
+                if target <= now {
                     self.status = DcOutStatus::On;
                 }
             }
-            DcOutStatus::TurningOff(seconds) => {
-                let seconds = seconds - 1;
-                if seconds > 0 {
-                    self.status = DcOutStatus::TurningOff(seconds);
-                } else {
+            DcOutStatus::TurningOff(target) => {
+                if target <= now {
                     self.status = DcOutStatus::On;
                 }
             }
@@ -129,11 +126,18 @@ impl DcOutControllerState {
             PinState::Low => "Low",
             PinState::High => "High",
         };
-        let seconds: i16 = match self.status {
-            DcOutStatus::WaitingOn(seconds) => seconds.into(),
-            DcOutStatus::TurningOff(seconds) => seconds.into(),
-            _ => -1,
+        let now = Time::new().get_time();
+        let target = match self.status {
+            DcOutStatus::WaitingOn(target) => target,
+            DcOutStatus::TurningOff(target) => target,
+            _ => Duration::ZERO,
         };
+        let seconds = if now < target {
+            target - now
+        } else {
+            Duration::ZERO
+        }
+        .as_secs();
         json!({ "status": status, "pin_state": pin_state, "seconds": seconds }).to_string()
     }
 }

src/voltage_detection.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use embedded_hal::{adc::Channel, prelude::_embedded_hal_adc_OneShot};
-use embedded_svc::{event_bus::Postbox};
+use embedded_svc::event_bus::Postbox;
 use esp_idf_hal::{
     adc::{
         config::{self},
@@ -13,11 +13,9 @@ use esp_idf_hal::{
     },
     gpio::{Gpio1, Gpio2, Gpio3, Input},
 };
-use esp_idf_svc::{
-    eventloop::{
-        Background, EspBackgroundEventLoop, EspEventFetchData, EspEventLoop, EspEventPostData,
-        EspTypedEventDeserializer, EspTypedEventSerializer, EspTypedEventSource,
-    },
+use esp_idf_svc::eventloop::{
+    Background, EspBackgroundEventLoop, EspEventFetchData, EspEventLoop, EspEventPostData,
+    EspTypedEventDeserializer, EspTypedEventSerializer, EspTypedEventSource,
 };
 use esp_idf_sys::c_types;
 use log::{debug, warn};
@@ -75,6 +73,8 @@ impl VoltageDetection {
                         anyhow::anyhow!("Failed to set GPIO 3 as analog input. {}", err)
                     })?;
 
+                let mut adc = PoweredAdc::new(unsafe { ADC1::new() }, config::Config::new())?;
+
                 let mut worker = worker.lock().map_err(|err| {
                     anyhow::anyhow!("Lock VoltageDetection Worker Failed. {}", err)
                 })?;
@@ -83,7 +83,12 @@ impl VoltageDetection {
 
                 loop {
                     last_runing_at = Time::new().get_time();
-                    match worker.read_once(&mut adapter_pin, &mut battery_pin, &mut output_pin) {
+                    match worker.read_once(
+                        &mut adc,
+                        &mut adapter_pin,
+                        &mut battery_pin,
+                        &mut output_pin,
+                    ) {
                         Ok(_) => debug!(
                             "Adapter: {},\tBattery: {},\t Output: {}",
                             worker.adapter_voltage, worker.battery_voltage, worker.output_voltage
@@ -107,11 +112,11 @@ impl VoltageDetection {
                     }
                     let mut delta = Time::new().get_time() - last_runing_at;
 
-                    if delta >= Duration::from_millis(1000) {
+                    if delta >= Duration::from_millis(5000) {
                         delta = Duration::ZERO
                     }
 
-                    sleep(Duration::from_millis(1000) - delta);
+                    sleep(Duration::from_millis(5000) - delta);
                 }
             };
 
@@ -134,11 +139,12 @@ impl VoltageDetectionWorker {
 
     pub fn read_once(
         &mut self,
+        adc: &mut PoweredAdc<ADC1>,
         adapter_pin: &mut Gpio1<Atten6dB<ADC1>>,
         battery_pin: &mut Gpio2<Atten6dB<ADC1>>,
         output_pin: &mut Gpio3<Atten6dB<ADC1>>,
     ) -> anyhow::Result<()> {
-        match self.read_pin_once(adapter_pin) {
+        match self.read_pin_once(adc, adapter_pin) {
             Ok(voltage) => {
                 self.adapter_voltage = ((voltage as f32) * ADAPTER_OFFSET) as u16;
             }
@@ -147,7 +153,7 @@ impl VoltageDetectionWorker {
             }
         }
 
-        match self.read_pin_once(battery_pin) {
+        match self.read_pin_once(adc, battery_pin) {
             Ok(voltage) => {
                 self.battery_voltage = ((voltage as f32) * BATTERY_OFFSET) as u16;
             }
@@ -155,7 +161,7 @@ impl VoltageDetectionWorker {
                 warn!("Adapter Voltage read failed: {:?}", err);
             }
         }
-        match self.read_pin_once(output_pin) {
+        match self.read_pin_once(adc, output_pin) {
             Ok(voltage) => {
                 self.output_voltage = ((voltage as f32) * OUTPUT_OFFSET) as u16;
             }
@@ -168,16 +174,23 @@ impl VoltageDetectionWorker {
     }
     pub fn read_pin_once<AN: Analog<ADC1>, PIN: Channel<AN, ID = u8>>(
         &mut self,
+        adc: &mut PoweredAdc<ADC1>,
         pin: &mut PIN,
     ) -> anyhow::Result<u16> {
-        let mut adc = PoweredAdc::new(unsafe { ADC1::new() }, config::Config::new())?;
-        let voltage = adc.read(pin);
-        match voltage {
-            Ok(voltage) => anyhow::Ok(voltage),
-            Err(err) => {
-                anyhow::bail!("Adapter Voltage read failed: {:?}", err)
-            }
+        let mut avg_voltage: u16 = 0;
+        for _ in 0..10 {
+            let voltage = adc.read(pin);
+            match voltage {
+                Ok(voltage) => {
+                    avg_voltage += voltage;
+                }
+                Err(err) => {
+                    anyhow::bail!("Adapter Voltage read failed: {:?}", err)
+                }
+            };
+            sleep(Duration::from_millis(100));
         }
+        anyhow::Ok(avg_voltage / 10)
     }
 }