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

tec_u_meas: subtract vref offset

Browse Source
This commit is contained in:
Astro 2020-09-17 01:20:31 +02:00
parent 1157b73f7f
commit 94e0525002
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@ -187,7 +187,7 @@ fn main() -> ! {
vref.into_format_args(volt, Abbreviation), dac_feedback.into_format_args(volt, Abbreviation), vref.into_format_args(volt, Abbreviation), dac_feedback.into_format_args(volt, Abbreviation),
itec.into_format_args(volt, Abbreviation), tec_i.into_format_args(ampere, Abbreviation), itec.into_format_args(volt, Abbreviation), tec_i.into_format_args(ampere, Abbreviation),
tec_u_meas.into_format_args(volt, Abbreviation), tec_u_meas.into_format_args(volt, Abbreviation),
(tec_u_meas / tec_i).into_format_args(ohm, Abbreviation), ((tec_u_meas - vref) / tec_i).into_format_args(ohm, Abbreviation),
); );
} else { } else {
let _ = writeln!(socket, "channel {}: no adc input", channel); let _ = writeln!(socket, "channel {}: no adc input", channel);
@ -269,7 +269,7 @@ fn main() -> ! {
match (state.get_adc(), state.get_sens(), state.get_temperature()) { match (state.get_adc(), state.get_sens(), state.get_temperature()) {
(Some(adc), Some(sens), Some(temp)) => { (Some(adc), Some(sens), Some(temp)) => {
let _ = writeln!( let _ = writeln!(
socket, "- adc={:.6} r={:.0} temp{}={:.3}K", socket, "- adc={:.6} r={:.0} temp{}={:.3}",
adc.into_format_args(volt, Abbreviation), adc.into_format_args(volt, Abbreviation),
sens.into_format_args(ohm, Abbreviation), sens.into_format_args(ohm, Abbreviation),
channel, channel,