adjust sampling

lulf · Aug 27, 2023 · baefd4f · baefd4f
1 parent 98a2502
commit baefd4f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock
diff --git a/firmware/app/Cargo.toml b/firmware/app/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "watchful"
-version = "0.2.1"
+version = "0.2.2"
 license = "MIT OR Apache-2.0"
 build = "build.rs"
 

diff --git a/firmware/app/src/main.rs b/firmware/app/src/main.rs
@@ -171,7 +171,8 @@ async fn main(s: Spawner) {
     bat_config.resistor = saadc::Resistor::BYPASS;
     bat_config.reference = saadc::Reference::INTERNAL;
     bat_config.time = saadc::Time::_40US;
-    let adc_config = saadc::Config::default();
+    let mut adc_config = saadc::Config::default();
+    adc_config.resolution = saadc::Resolution::_10BIT;
     let saadc = saadc::Saadc::new(p.SAADC, Irqs, adc_config, [bat_config]);
     let mut battery = Battery::new(saadc, Input::new(p.P0_12.degrade(), Pull::Up));
 
@@ -430,8 +431,8 @@ impl<'a> Battery<'a> {
     pub async fn measure(&mut self) -> u32 {
         let mut buf = [0i16; 1];
         self.adc.sample(&mut buf).await;
-        //let voltage = buf[0] as u32 * (8 * 600) / 1024;
-        let voltage = buf[0] as u32 * 2000 / 1241;
+        let voltage = buf[0] as u32 * (8 * 600) / 1024;
+        //let voltage = buf[0] as u32 * 2000 / 1241;
         approximate_charge(voltage)
     }