M-Labs/ionpak-thermostat
7
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

main: report pwm_width

Browse Source
This commit is contained in:
Astro 2019-10-03 01:35:52 +02:00
parent cc5c21e088
commit c2aa0e2989
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/src/main.rs
View File

@ -115,7 +115,7 @@ pub const CHANNELS: usize = 2;
#[derive(Clone)] #[derive(Clone)]
struct ControlState { struct ControlState {
/// Report data (time, data, temperature) /// Report data (time, data, temperature)
report: Option<(u64, i32, f32)>, report: Option<(u64, i32, f32, Option<u16>)>,
pid_enabled: bool, pid_enabled: bool,
pid: pid::Controller, pid: pid::Controller,
sh: sh::Parameters, sh: sh::Parameters,
@ -262,16 +262,19 @@ fn main() -> ! {
let voltage = VCC * (data as f32) / (0x7FFFFF as f32); let voltage = VCC * (data as f32) / (0x7FFFFF as f32);
let temperature = state.sh.get_temperature(voltage); let temperature = state.sh.get_temperature(voltage);
if state.pid_enabled { let pwm_width = if state.pid_enabled {
let width = state.pid.update(temperature) as u16; let width = state.pid.update(temperature) as u16;
match channel { match channel {
0 => tec0.set(TecPin::ISet, width, PWM_PID_WIDTH), 0 => tec0.set(TecPin::ISet, width, PWM_PID_WIDTH),
1 => tec1.set(TecPin::ISet, width, PWM_PID_WIDTH), 1 => tec1.set(TecPin::ISet, width, PWM_PID_WIDTH),
_ => unreachable!(), _ => unreachable!(),
} }
} Some(width)
} else {
None
};
state.report = Some((now, data, temperature)); state.report = Some((now, data, temperature, pwm_width));
for (session, _) in sessions_handles.iter_mut() { for (session, _) in sessions_handles.iter_mut() {
session.set_report_pending(channel.into()); session.set_report_pending(channel.into());
} }
@ -304,11 +307,18 @@ fn main() -> ! {
} }
Command::Show(ShowCommand::Input) => { Command::Show(ShowCommand::Input) => {
for (channel, state) in states.iter().enumerate() { for (channel, state) in states.iter().enumerate() {
state.report.map(|(time, data, temp)| { state.report.map(|(time, data, temp, pwm_width)| {
let _ = writeln!( let _ = write!(
socket, "t={} temp{}={} raw{}=0x{:06X}", socket, "t={} temp{}={} raw{}=0x{:06X}",
time, channel, temp, channel, data time, channel, temp, channel, data
); );
pwm_width.map(|width| {
let _ = write!(
socket, " pwm{}=0x{:04X}",
channel, width
);
});
let _ = writeln!(socket, "");
}); });
} }
} }
@ -481,11 +491,18 @@ fn main() -> ! {
} }
if socket.may_send() { if socket.may_send() {
if let Some(channel) = session.is_report_pending() { if let Some(channel) = session.is_report_pending() {
states[channel].report.map(|(time, data, temp)| { states[channel].report.map(|(time, data, temp, pwm_width)| {
let _ = writeln!( let _ = write!(
socket, "t={} temp{}={} raw{}=0x{:06X}", socket, "t={} temp{}={} raw{}=0x{:06X}",
time, channel, temp, channel, data time, channel, temp, channel, data
); );
pwm_width.map(|width| {
let _ = write!(
socket, " pwm{}=0x{:04X}",
channel, width
);
});
let _ = writeln!(socket, "");
}); });
session.mark_report_sent(channel); session.mark_report_sent(channel);
} }