linuswck
/
thermostat
forked from M-Labs/thermostat
1
0
Fork 0
Code Pull Requests 1 Activity

Calculate current_abs_max_tec_i from all channels 

Instead of picking channels 0 and 1. Helps to generalise for more than 2
channels.
This commit is contained in:
atse 2023-08-25 12:24:50 +08:00 committed by sb10q
parent 5000cae1b1
commit 136c7a0b52
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/channels.rs
View File

@ -1,4 +1,4 @@
use core::{cmp::max_by, marker::PhantomData}; use core::marker::PhantomData;
use heapless::{consts::U2, Vec}; use heapless::{consts::U2, Vec};
use num_traits::Zero; use num_traits::Zero;
use serde::{Serialize, Serializer}; use serde::{Serialize, Serializer};
@ -561,9 +561,10 @@ impl Channels {
} }
pub fn current_abs_max_tec_i(&mut self) -> ElectricCurrent { pub fn current_abs_max_tec_i(&mut self) -> ElectricCurrent {
max_by(self.get_tec_i(0).abs(), (0..CHANNELS)
self.get_tec_i(1).abs(), .map(|channel| self.get_tec_i(channel).abs())
|a, b| a.partial_cmp(b).unwrap_or(core::cmp::Ordering::Equal)) .max_by(|a, b| a.partial_cmp(b).unwrap_or(core::cmp::Ordering::Equal))
.unwrap()
} }
} }