Compare commits
No commits in common. "3067b356c541247145daab9f4861658a0659c700" and "1539b624bd957d7020a051b77c6534cac2553899" have entirely different histories.
3067b356c5
...
1539b624bd
|
@ -364,16 +364,6 @@ impl Channels {
|
||||||
(duty * max, max)
|
(duty * max, max)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get actual current passing through TEC
|
|
||||||
pub fn get_tec_i(&mut self, channel: usize) -> ElectricCurrent {
|
|
||||||
(self.read_itec(channel) - self.read_vref(channel)) / ElectricalResistance::new::<ohm>(0.4)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get actual voltage across TEC
|
|
||||||
pub fn get_tec_v(&mut self, channel: usize) -> ElectricPotential {
|
|
||||||
(self.read_tec_u_meas(channel) - ElectricPotential::new::<volt>(1.5)) * 4.0
|
|
||||||
}
|
|
||||||
|
|
||||||
fn set_pwm(&mut self, channel: usize, pin: PwmPin, duty: f64) -> f64 {
|
fn set_pwm(&mut self, channel: usize, pin: PwmPin, duty: f64) -> f64 {
|
||||||
fn set<P: hal::PwmPin<Duty=u16>>(pin: &mut P, duty: f64) -> f64 {
|
fn set<P: hal::PwmPin<Duty=u16>>(pin: &mut P, duty: f64) -> f64 {
|
||||||
let max = pin.get_max_duty();
|
let max = pin.get_max_duty();
|
||||||
|
@ -427,7 +417,7 @@ impl Channels {
|
||||||
let vref = self.channel_state(channel).vref;
|
let vref = self.channel_state(channel).vref;
|
||||||
let (i_set, _) = self.get_i(channel);
|
let (i_set, _) = self.get_i(channel);
|
||||||
let i_tec = self.read_itec(channel);
|
let i_tec = self.read_itec(channel);
|
||||||
let tec_i = self.get_tec_i(channel);
|
let tec_i = (i_tec - vref) / ElectricalResistance::new::<ohm>(0.4);
|
||||||
let (dac_value, _) = self.get_dac(channel);
|
let (dac_value, _) = self.get_dac(channel);
|
||||||
let state = self.channel_state(channel);
|
let state = self.channel_state(channel);
|
||||||
let pid_output = state.pid.last_output.map(|last_output|
|
let pid_output = state.pid.last_output.map(|last_output|
|
||||||
|
@ -448,7 +438,7 @@ impl Channels {
|
||||||
dac_feedback: self.read_dac_feedback(channel),
|
dac_feedback: self.read_dac_feedback(channel),
|
||||||
i_tec,
|
i_tec,
|
||||||
tec_i,
|
tec_i,
|
||||||
tec_u_meas: self.get_tec_v(channel),
|
tec_u_meas: self.read_tec_u_meas(channel),
|
||||||
pid_output,
|
pid_output,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue