M-Labs
/
thermostat
9
0
Fork 5
Code Issues 10 Pull Requests 7 Releases Wiki Activity

channels: add pid_output to Report

This commit is contained in:
Astro 2020-09-30 18:00:16 +02:00
parent 97490e5e1b
commit 6951489545
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/channels.rs
View File

@ -417,6 +417,9 @@ impl Channels {
let i_tec = self.read_itec(channel); let i_tec = self.read_itec(channel);
let tec_i = (i_tec - vref) / ElectricalResistance::new::<ohm>(0.4); let tec_i = (i_tec - vref) / ElectricalResistance::new::<ohm>(0.4);
let state = self.channel_state(channel); let state = self.channel_state(channel);
let pid_output = state.pid.last_output.map(|last_output|
ElectricCurrent::new::<ampere>(last_output)
);
Report { Report {
channel, channel,
time: state.adc_time.total_millis(), time: state.adc_time.total_millis(),
@ -431,6 +434,7 @@ impl Channels {
i_tec, i_tec,
tec_i, tec_i,
tec_u_meas: self.read_tec_u_meas(channel), tec_u_meas: self.read_tec_u_meas(channel),
pid_output,
} }
} }
} }
@ -449,9 +453,10 @@ pub struct Report {
i_tec: ElectricPotential, i_tec: ElectricPotential,
tec_i: ElectricCurrent, tec_i: ElectricCurrent,
tec_u_meas: ElectricPotential, tec_u_meas: ElectricPotential,
pid_output: Option<ElectricCurrent>,
} }
type JsonBuffer = heapless::Vec<u8, heapless::consts::U320>; type JsonBuffer = heapless::Vec<u8, heapless::consts::U360>;
impl Report { impl Report {
pub fn to_json(&self) -> Result<JsonBuffer, serde_json_core::ser::Error> { pub fn to_json(&self) -> Result<JsonBuffer, serde_json_core::ser::Error> {