From 6db375d6b8ecbcebe67b0bbdf7607b0191c27c40 Mon Sep 17 00:00:00 2001 From: linuswck Date: Thu, 23 Jan 2025 11:51:03 +0800 Subject: [PATCH] Fix incorrect Adc filter settings name --- pykirdy/driver/kirdy.py | 2 +- src/thermostat/ad7172/mod.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pykirdy/driver/kirdy.py b/pykirdy/driver/kirdy.py index b815c9b..fe4ff25 100644 --- a/pykirdy/driver/kirdy.py +++ b/pykirdy/driver/kirdy.py @@ -80,7 +80,7 @@ class CmdList: class FilterConfig: class Sinc5Sinc1With50hz60HzRejection(StrEnum): f27sps = "F27SPS" - f21sps = "F21SPS" + f25sps = "F25SPS" f20sps = "F20SPS" f16sps = "F16SPS" _odr_type = "sinc5sinc1postfilter" diff --git a/src/thermostat/ad7172/mod.rs b/src/thermostat/ad7172/mod.rs index c7f00cc..35c092e 100644 --- a/src/thermostat/ad7172/mod.rs +++ b/src/thermostat/ad7172/mod.rs @@ -148,10 +148,10 @@ impl fmt::Display for RefSource { #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] #[repr(u8)] pub enum PostFilter { - /// 27 SPS, 47 dB rejection, 36.7 ms settling + /// 27.27 SPS, 47 dB rejection, 36.7 ms settling F27SPS = 0b010, - /// 21.25 SPS, 62 dB rejection, 40 ms settling - F21SPS = 0b011, + /// 25 SPS, 62 dB rejection, 40 ms settling + F25SPS = 0b011, /// 20 SPS, 86 dB rejection, 50 ms settling F20SPS = 0b101, /// 16.67 SPS, 92 dB rejection, 60 ms settling @@ -162,7 +162,7 @@ pub enum PostFilter { impl PostFilter { pub const VALID_VALUES: &'static [Self] = &[ PostFilter::F27SPS, - PostFilter::F21SPS, + PostFilter::F25SPS, PostFilter::F20SPS, PostFilter::F16SPS, ]; @@ -182,8 +182,8 @@ impl PostFilter { /// Samples per Second pub fn output_rate(&self) -> Option { match self { - PostFilter::F27SPS => Some(27.0), - PostFilter::F21SPS => Some(21.25), + PostFilter::F27SPS => Some(27.27), + PostFilter::F25SPS => Some(25.0), PostFilter::F20SPS => Some(20.0), PostFilter::F16SPS => Some(16.67), PostFilter::Invalid => None, @@ -195,7 +195,7 @@ impl From for PostFilter { fn from(x: u8) -> Self { match x { 0b010 => PostFilter::F27SPS, - 0b011 => PostFilter::F21SPS, + 0b011 => PostFilter::F25SPS, 0b101 => PostFilter::F20SPS, 0b110 => PostFilter::F16SPS, _ => PostFilter::Invalid,