forked from M-Labs/thermostat
Compare commits
6 Commits
aac5172397
...
9c4b514485
Author | SHA1 | Date |
---|---|---|
Egor Savkin | 9c4b514485 | |
Egor Savkin | 89380b1716 | |
atse | d7b65831a8 | |
atse | d9fc7a9e27 | |
atse | 76547be90a | |
atse | 8b975e656e |
|
@ -142,6 +142,7 @@ formatted as line-delimited JSON.
|
|||
| `fcurve <a> <b> <c>` | Set fan controller curve coefficients (see *Fan control* section) |
|
||||
| `fcurve default` | Set fan controller curve coefficients to defaults (see *Fan control* section) |
|
||||
| `hwrev` | Show hardware revision, and settings related to it |
|
||||
| `swap` | Swap TEC polarities for all channels (For use with Zotino) |
|
||||
|
||||
|
||||
## USB
|
||||
|
|
|
@ -30,15 +30,15 @@ class Series:
|
|||
series = {
|
||||
# 'adc': Series(),
|
||||
# 'sens': Series(lambda x: x * 0.0001),
|
||||
'temperature': Series(),
|
||||
# 'i_set': Series(),
|
||||
'pid_output': Series(),
|
||||
# 'temperature': Series(),
|
||||
'i_set': Series(),
|
||||
# 'pid_output': Series(),
|
||||
# 'vref': Series(),
|
||||
# 'dac_value': Series(),
|
||||
# 'dac_feedback': Series(),
|
||||
# 'i_tec': Series(),
|
||||
'i_tec': Series(),
|
||||
'tec_i': Series(),
|
||||
'tec_u_meas': Series(),
|
||||
# 'tec_u_meas': Series(),
|
||||
# 'interval': Series(),
|
||||
}
|
||||
series_lock = Lock()
|
||||
|
|
|
@ -840,8 +840,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
|
|||
self.params[channel].child("Output Config", "Control Method").setValue("Temperature PID" if settings["pid_engaged"] else "Constant Current")
|
||||
self.channel_graphs[channel].set_t_line(visible=settings['pid_engaged'])
|
||||
self.params[channel].child("Output Config", "Control Method", "Set Current").setValue(settings["i_set"] * 1000)
|
||||
if settings['temperature'] is not None and settings['tec_i'] is not None:
|
||||
if settings['temperature'] is not None:
|
||||
self.params[channel].child("Temperature").setValue(settings['temperature'])
|
||||
if settings['tec_i'] is not None:
|
||||
self.params[channel].child("Current through TEC").setValue(settings['tec_i'] * 1000)
|
||||
|
||||
@pyqtSlot(list)
|
||||
|
|
|
@ -2,11 +2,13 @@ use smoltcp::time::{Duration, Instant};
|
|||
use uom::si::{
|
||||
f64::{
|
||||
ElectricPotential,
|
||||
ElectricCurrent,
|
||||
ElectricalResistance,
|
||||
ThermodynamicTemperature,
|
||||
Time,
|
||||
},
|
||||
electric_potential::volt,
|
||||
electric_current::ampere,
|
||||
electrical_resistance::ohm,
|
||||
thermodynamic_temperature::degree_celsius,
|
||||
time::millisecond,
|
||||
|
@ -29,9 +31,11 @@ pub struct ChannelState {
|
|||
/// i_set 0A center point
|
||||
pub center: CenterPoint,
|
||||
pub dac_value: ElectricPotential,
|
||||
pub i_set: ElectricCurrent,
|
||||
pub pid_engaged: bool,
|
||||
pub pid: pid::Controller,
|
||||
pub sh: sh::Parameters,
|
||||
pub swap_tec_polarity: bool,
|
||||
}
|
||||
|
||||
impl ChannelState {
|
||||
|
@ -44,9 +48,11 @@ impl ChannelState {
|
|||
adc_interval: Duration::from_millis(100),
|
||||
center: CenterPoint::Vref,
|
||||
dac_value: ElectricPotential::new::<volt>(0.0),
|
||||
i_set: ElectricCurrent::new::<ampere>(0.0),
|
||||
pid_engaged: false,
|
||||
pid: pid::Controller::new(pid::Parameters::default()),
|
||||
sh: sh::Parameters::default(),
|
||||
swap_tec_polarity: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -118,11 +118,15 @@ impl<'a> Channels<'a> {
|
|||
1 => self.channel1.vref_meas,
|
||||
_ => unreachable!(),
|
||||
};
|
||||
// let center_point = self.get_center(channel);
|
||||
// let i_set = self.channel_state(channel).i_set;
|
||||
let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
|
||||
let voltage = self.get_dac(channel);
|
||||
let i_tec = (voltage - center_point) / (10.0 * r_sense);
|
||||
i_tec
|
||||
if self.channel_state(channel).swap_tec_polarity {
|
||||
-i_tec
|
||||
} else {
|
||||
i_tec
|
||||
}
|
||||
}
|
||||
|
||||
/// i_set DAC
|
||||
|
@ -143,11 +147,17 @@ impl<'a> Channels<'a> {
|
|||
1 => self.channel1.vref_meas,
|
||||
_ => unreachable!(),
|
||||
};
|
||||
let i_set = if self.channel_state(channel).swap_tec_polarity {
|
||||
-i_tec
|
||||
} else {
|
||||
i_tec
|
||||
};
|
||||
let center_point = vref_meas;
|
||||
let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
|
||||
let voltage = i_tec * 10.0 * r_sense + center_point;
|
||||
let voltage = i_set * 10.0 * r_sense + center_point;
|
||||
let voltage = self.set_dac(channel, voltage);
|
||||
let i_tec = (voltage - center_point) / (10.0 * r_sense);
|
||||
self.channel_state(channel).i_set = i_set;
|
||||
i_tec
|
||||
}
|
||||
|
||||
|
@ -378,7 +388,12 @@ impl<'a> Channels<'a> {
|
|||
|
||||
// Get 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)
|
||||
let tec_i = (self.read_itec(channel) - self.read_vref(channel)) / ElectricalResistance::new::<ohm>(0.4);
|
||||
if self.channel_state(channel).swap_tec_polarity {
|
||||
-tec_i
|
||||
} else {
|
||||
tec_i
|
||||
}
|
||||
}
|
||||
|
||||
// Get voltage across TEC
|
||||
|
@ -450,6 +465,7 @@ impl<'a> Channels<'a> {
|
|||
temperature: state.get_temperature()
|
||||
.map(|temperature| temperature.get::<degree_celsius>()),
|
||||
pid_engaged: state.pid_engaged,
|
||||
current_swapped: state.swap_tec_polarity,
|
||||
i_set,
|
||||
dac_value,
|
||||
dac_feedback: self.read_dac_feedback(channel),
|
||||
|
@ -547,6 +563,7 @@ pub struct Report {
|
|||
sens: Option<ElectricalResistance>,
|
||||
temperature: Option<f64>,
|
||||
pid_engaged: bool,
|
||||
current_swapped: bool,
|
||||
i_set: ElectricCurrent,
|
||||
dac_value: ElectricPotential,
|
||||
dac_feedback: ElectricPotential,
|
||||
|
|
|
@ -207,11 +207,11 @@ impl Handler {
|
|||
}
|
||||
|
||||
fn set_center_point(socket: &mut TcpSocket, channels: &mut Channels, channel: usize, center: CenterPoint) -> Result<Handler, Error> {
|
||||
let i_tec = channels.get_i(channel);
|
||||
let i_set = channels.get_i(channel);
|
||||
let state = channels.channel_state(channel);
|
||||
state.center = center;
|
||||
if !state.pid_engaged {
|
||||
channels.set_i(channel, i_tec);
|
||||
channels.set_i(channel, i_set);
|
||||
}
|
||||
send_line(socket, b"{}");
|
||||
Ok(Handler::Handled)
|
||||
|
@ -412,6 +412,14 @@ impl Handler {
|
|||
}
|
||||
}
|
||||
|
||||
fn swap_tec_polarity (socket: &mut TcpSocket, channels: &mut Channels) -> Result<Handler, Error> {
|
||||
for c in 0..CHANNELS {
|
||||
channels.channel_state(c).swap_tec_polarity = !channels.channel_state(c).swap_tec_polarity;
|
||||
}
|
||||
send_line(socket, b"{}");
|
||||
Ok(Handler::Handled)
|
||||
}
|
||||
|
||||
pub fn handle_command(command: Command, socket: &mut TcpSocket, channels: &mut Channels, session: &Session, store: &mut FlashStore, ipv4_config: &mut Ipv4Config, fan_ctrl: &mut FanCtrl, hwrev: HWRev) -> Result<Self, Error> {
|
||||
match command {
|
||||
Command::Quit => Ok(Handler::CloseSocket),
|
||||
|
@ -441,6 +449,7 @@ impl Handler {
|
|||
Command::FanCurve { k_a, k_b, k_c } => Handler::fan_curve(socket, fan_ctrl, k_a, k_b, k_c),
|
||||
Command::FanCurveDefaults => Handler::fan_defaults(socket, fan_ctrl),
|
||||
Command::ShowHWRev => Handler::show_hwrev(socket, hwrev),
|
||||
Command::SwapTECPolarity => Handler::swap_tec_polarity(socket, channels),
|
||||
}
|
||||
}
|
||||
}
|
|
@ -191,6 +191,7 @@ pub enum Command {
|
|||
},
|
||||
FanCurveDefaults,
|
||||
ShowHWRev,
|
||||
SwapTECPolarity,
|
||||
}
|
||||
|
||||
fn end(input: &[u8]) -> IResult<&[u8], ()> {
|
||||
|
@ -600,6 +601,7 @@ fn command(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
|
|||
fan,
|
||||
fan_curve,
|
||||
value(Ok(Command::ShowHWRev), tag("hwrev")),
|
||||
value(Ok(Command::SwapTECPolarity), tag("swap")),
|
||||
))(input)
|
||||
}
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@ pub struct ChannelConfig {
|
|||
pwm: PwmLimits,
|
||||
/// uses variant `PostFilter::Invalid` instead of `None` to save space
|
||||
adc_postfilter: PostFilter,
|
||||
swap_tec_polarity: bool,
|
||||
}
|
||||
|
||||
impl ChannelConfig {
|
||||
|
@ -41,6 +42,7 @@ impl ChannelConfig {
|
|||
sh: state.sh.clone(),
|
||||
pwm,
|
||||
adc_postfilter,
|
||||
swap_tec_polarity: state.swap_tec_polarity,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -51,6 +53,7 @@ impl ChannelConfig {
|
|||
state.pid.target = self.pid_target.into();
|
||||
state.pid_engaged = self.pid_engaged;
|
||||
state.sh = self.sh.clone();
|
||||
state.swap_tec_polarity = self.swap_tec_polarity;
|
||||
|
||||
self.pwm.apply(channels, channel);
|
||||
|
||||
|
|
Loading…
Reference in New Issue