Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions thermal-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ thermal-service-interface.workspace = true
embedded-fans-async = "0.2.0"
embedded-sensors-hal-async = "0.3.0"

[dev-dependencies]
critical-section = { workspace = true, features = ["std"] }
embassy-sync = { workspace = true, features = ["std"] }
embassy-time = { workspace = true, features = ["std", "generic-queue-8"] }
tokio = { workspace = true, features = ["rt", "macros", "time"] }

[features]
default = []
defmt = [
Expand Down
3 changes: 2 additions & 1 deletion thermal-service/src/sensor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ impl<'hw, T: sensor::Driver, E: NonBlockingSender<sensor::Event>, const SAMPLE_B
}

async fn temperature_immediate(&self) -> Result<DegreesCelsius, sensor::Error> {
with_retry!(self.inner, self.inner.driver.lock().await.temperature())
let temperature = with_retry!(self.inner, self.inner.driver.lock().await.temperature())?;
Ok(temperature + self.inner.config.lock().await.offset)
}

async fn set_threshold(&self, threshold: sensor::Threshold, value: DegreesCelsius) {
Expand Down
45 changes: 45 additions & 0 deletions thermal-service/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,48 @@ impl<const N: usize> SampleBuf<u16, N> {
sum.checked_div(self.deque.len() as u32).unwrap_or(0) as u16
}
}

#[cfg(test)]
mod tests {
use super::SampleBuf;

#[test]
fn empty_float_buffer_returns_default_values() {
let samples = SampleBuf::<f32, 3>::create();

assert_eq!(samples.recent(), 0.0);
assert_eq!(samples.average(), 0.0);
}

#[test]
fn float_buffer_reports_recent_and_average_samples() {
let mut samples = SampleBuf::<f32, 3>::create();
samples.push(2.0);
samples.push(4.0);
samples.push(6.0);

assert_eq!(samples.recent(), 6.0);
assert_eq!(samples.average(), 4.0);
}

#[test]
fn full_buffer_evicts_oldest_sample() {
let mut samples = SampleBuf::<u16, 3>::create();
samples.push(2);
samples.push(4);
samples.push(6);
samples.push(8);

assert_eq!(samples.recent(), 8);
assert_eq!(samples.average(), 6);
}

#[test]
fn integer_average_uses_wider_accumulator() {
let mut samples = SampleBuf::<u16, 2>::create();
samples.push(u16::MAX);
samples.push(u16::MAX);

assert_eq!(samples.average(), u16::MAX);
}
}
Loading
Loading