atse/thermostat
1
0
Fork 0
forked from M-Labs/thermostat
Code Issues Pull Requests Activity

Compare commits

base: atse:9061b175a721a10b24a311a8e43ae318f65c9e69
Branches Tags
atse:master
atse:GUI
atse:improve-pyproject-metadata
atse:flake-dev-conveniences
atse:readme-resistive-heater-guide
atse:GUI-ultimate-rebased
atse:dev-gui-rebased
atse:correct-clock
atse:readme-clamped-pwm-units
atse:gui_dev-ctrl_panel
atse:GUI-gui_dev-ctrl_panel
atse:readme-pid-limits-units
atse:GUI-rebased
atse:gui_dev-fix_asyncio
atse:uom-constants
atse:dev
atse:remove-pub
atse:pre-commit_hooks
atse:feature/show-firmware-ver
atse:command_parser_refactor
atse:no-tec_i-reads-pre-3.0
atse:calibration
atse:softspi
M-Labs:master
M-Labs:dev-gui
M-Labs:GUI
M-Labs:softspi
..
compare: atse:c6040899dd0833aebcd8541842b8521ab89c64bf
Branches Tags
atse:GUI
atse:improve-pyproject-metadata
atse:master
atse:flake-dev-conveniences
atse:readme-resistive-heater-guide
atse:GUI-ultimate-rebased
atse:dev-gui-rebased
atse:correct-clock
atse:readme-clamped-pwm-units
atse:gui_dev-ctrl_panel
atse:GUI-gui_dev-ctrl_panel
atse:readme-pid-limits-units
atse:GUI-rebased
atse:gui_dev-fix_asyncio
atse:uom-constants
atse:dev
atse:remove-pub
atse:pre-commit_hooks
atse:feature/show-firmware-ver
atse:command_parser_refactor
atse:no-tec_i-reads-pre-3.0
atse:calibration
atse:softspi
M-Labs:master
M-Labs:dev-gui
M-Labs:GUI
M-Labs:softspi

No commits in common. "9061b175a721a10b24a311a8e43ae318f65c9e69" and "c6040899dd0833aebcd8541842b8521ab89c64bf" have entirely different histories.
9061b175a7 ... c6040899dd

5 changed files with 39 additions and 86 deletions
Show Stats Expand all files Collapse all files

73
README.md
View File

@ -94,43 +94,42 @@ The scope of this setting is per TCP session.
Send commands as simple text string terminated by `\n`. Responses are Send commands as simple text string terminated by `\n`. Responses are
formatted as line-delimited JSON. formatted as line-delimited JSON.
| Syntax | Function | | Syntax | Function |
|-------------------------------------------|-------------------------------------------------------------------------------| |----------------------------------|-------------------------------------------------------------------------------|
| `report` | Show current input | | `report` | Show current input |
| `report mode` | Show current report mode | | `report mode` | Show current report mode |
| `report mode <off/on>` | Set report mode | | `report mode <off/on>` | Set report mode |
| `pwm` | Show current PWM settings | | `pwm` | Show current PWM settings |
| `pwm <0/1> max_i_pos <amp>` | Set maximum positive output current | | `pwm <0/1> max_i_pos <amp>` | Set maximum positive output current |
| `pwm <0/1> max_i_neg <amp>` | Set maximum negative output current | | `pwm <0/1> max_i_neg <amp>` | Set maximum negative output current |
| `pwm <0/1> max_v <volt>` | Set maximum output voltage | | `pwm <0/1> max_v <volt>` | Set maximum output voltage |
| `pwm <0/1> i_set <amp>` | Disengage PID, set fixed output current | | `pwm <0/1> i_set <amp>` | Disengage PID, set fixed output current |
| `pwm <0/1> polarity_swapped <false/true>` | Swap current polarity on channel | | `pwm <0/1> pid` | Let output current to be controlled by the PID |
| `pwm <0/1> pid` | Let output current to be controlled by the PID | | `center <0/1> <volt>` | Set the MAX1968 0A-centerpoint to the specified fixed voltage |
| `center <0/1> <volt>` | Set the MAX1968 0A-centerpoint to the specified fixed voltage | | `center <0/1> vref` | Set the MAX1968 0A-centerpoint to measure from VREF |
| `center <0/1> vref` | Set the MAX1968 0A-centerpoint to measure from VREF | | `pid` | Show PID configuration |
| `pid` | Show PID configuration | | `pid <0/1> target <deg_celsius>` | Set the PID controller target temperature |
| `pid <0/1> target <deg_celsius>` | Set the PID controller target temperature | | `pid <0/1> kp <value>` | Set proportional gain |
| `pid <0/1> kp <value>` | Set proportional gain | | `pid <0/1> ki <value>` | Set integral gain |
| `pid <0/1> ki <value>` | Set integral gain | | `pid <0/1> kd <value>` | Set differential gain |
| `pid <0/1> kd <value>` | Set differential gain | | `pid <0/1> output_min <amp>` | Set mininum output |
| `pid <0/1> output_min <amp>` | Set mininum output | | `pid <0/1> output_max <amp>` | Set maximum output |
| `pid <0/1> output_max <amp>` | Set maximum output | | `s-h` | Show Steinhart-Hart equation parameters |
| `s-h` | Show Steinhart-Hart equation parameters | | `s-h <0/1> <t0/b/r0> <value>` | Set Steinhart-Hart parameter for a channel |
| `s-h <0/1> <t0/b/r0> <value>` | Set Steinhart-Hart parameter for a channel | | `postfilter` | Show postfilter settings |
| `postfilter` | Show postfilter settings | | `postfilter <0/1> off` | Disable postfilter |
| `postfilter <0/1> off` | Disable postfilter | | `postfilter <0/1> rate <rate>` | Set postfilter output data rate |
| `postfilter <0/1> rate <rate>` | Set postfilter output data rate | | `load [0/1]` | Restore configuration for channel all/0/1 from flash |
| `load [0/1]` | Restore configuration for channel all/0/1 from flash | | `save [0/1]` | Save configuration for channel all/0/1 to flash |
| `save [0/1]` | Save configuration for channel all/0/1 to flash | | `reset` | Reset the device |
| `reset` | Reset the device | | `dfu` | Reset device and enters USB device firmware update (DFU) mode |
| `dfu` | Reset device and enters USB device firmware update (DFU) mode | | `ipv4 <X.X.X.X/L> [Y.Y.Y.Y]` | Configure IPv4 address, netmask length, and optional default gateway |
| `ipv4 <X.X.X.X/L> [Y.Y.Y.Y]` | Configure IPv4 address, netmask length, and optional default gateway | | `fan` | Show current fan settings and sensors' measurements |
| `fan` | Show current fan settings and sensors' measurements | | `fan <value>` | Set fan power with values from 1 to 100 |
| `fan <value>` | Set fan power with values from 1 to 100 | | `fan auto` | Enable automatic fan speed control |
| `fan auto` | Enable automatic fan speed control | | `fcurve <a> <b> <c>` | Set fan controller curve coefficients (see *Fan control* section) |
| `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) |
| `fcurve default` | Set fan controller curve coefficients to defaults (see *Fan control* section) | | `hwrev` | Show hardware revision, and settings related to it |
| `hwrev` | Show hardware revision, and settings related to it |
## USB ## USB

2
src/channel_state.rs
View File

@ -35,7 +35,6 @@ pub struct ChannelState {
pub pid_engaged: bool, pub pid_engaged: bool,
pub pid: pid::Controller, pub pid: pid::Controller,
pub sh: sh::Parameters, pub sh: sh::Parameters,
pub polarity_swapped: bool,
} }
impl ChannelState { impl ChannelState {
@ -52,7 +51,6 @@ impl ChannelState {
pid_engaged: false, pid_engaged: false,
pid: pid::Controller::new(pid::Parameters::default()), pid: pid::Controller::new(pid::Parameters::default()),
sh: sh::Parameters::default(), sh: sh::Parameters::default(),
polarity_swapped: false,
} }
} }

16
src/channels.rs
View File

@ -152,11 +152,7 @@ impl Channels {
} }
pub fn set_i(&mut self, channel: usize, i_set: ElectricCurrent) -> ElectricCurrent { pub fn set_i(&mut self, channel: usize, i_set: ElectricCurrent) -> ElectricCurrent {
let mut i_set = i_set.min(MAX_TEC_I).max(-MAX_TEC_I); let i_set = i_set.min(MAX_TEC_I).max(-MAX_TEC_I);
self.channel_state(channel).i_set = i_set;
if self.channel_state(channel).polarity_swapped {
i_set = -i_set;
}
let vref_meas = match channel.into() { let vref_meas = match channel.into() {
0 => self.channel0.vref_meas, 0 => self.channel0.vref_meas,
1 => self.channel1.vref_meas, 1 => self.channel1.vref_meas,
@ -167,6 +163,7 @@ impl Channels {
let voltage = i_set * 10.0 * r_sense + center_point; let voltage = i_set * 10.0 * r_sense + center_point;
let voltage = self.set_dac(channel, voltage); let voltage = self.set_dac(channel, voltage);
let i_set = (voltage - center_point) / (10.0 * r_sense); let i_set = (voltage - center_point) / (10.0 * r_sense);
self.channel_state(channel).i_set = i_set;
i_set i_set
} }
@ -410,12 +407,7 @@ impl Channels {
// Get current passing through TEC // Get current passing through TEC
pub fn get_tec_i(&mut self, channel: usize) -> ElectricCurrent { pub fn get_tec_i(&mut self, channel: usize) -> ElectricCurrent {
let tec_i = (self.adc_read(channel, PinsAdcReadTarget::ITec, 16) - self.adc_read(channel, PinsAdcReadTarget::VREF, 16)) / ElectricalResistance::new::<ohm>(0.4); (self.adc_read(channel, PinsAdcReadTarget::ITec, 16) - self.adc_read(channel, PinsAdcReadTarget::VREF, 16)) / ElectricalResistance::new::<ohm>(0.4)
if self.channel_state(channel).polarity_swapped {
-tec_i
} else {
tec_i
}
} }
// Get voltage across TEC // Get voltage across TEC
@ -487,7 +479,6 @@ impl Channels {
temperature: state.get_temperature() temperature: state.get_temperature()
.map(|temperature| temperature.get::<degree_celsius>()), .map(|temperature| temperature.get::<degree_celsius>()),
pid_engaged: state.pid_engaged, pid_engaged: state.pid_engaged,
current_swapped: state.polarity_swapped,
i_set, i_set,
dac_value, dac_value,
dac_feedback: self.adc_read(channel, PinsAdcReadTarget::DacVfb, 1), dac_feedback: self.adc_read(channel, PinsAdcReadTarget::DacVfb, 1),
@ -586,7 +577,6 @@ pub struct Report {
sens: Option<ElectricalResistance>, sens: Option<ElectricalResistance>,
temperature: Option<f64>, temperature: Option<f64>,
pid_engaged: bool, pid_engaged: bool,
current_swapped: bool,
i_set: ElectricCurrent, i_set: ElectricCurrent,
dac_value: ElectricPotential, dac_value: ElectricPotential,
dac_feedback: ElectricPotential, dac_feedback: ElectricPotential,

10
src/command_handler.rs
View File

@ -181,15 +181,6 @@ impl Handler {
Ok(Handler::Handled) Ok(Handler::Handled)
} }
fn swap_polarity (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, swapped: bool) -> Result<Handler, Error> {
channels.channel_state(channel).polarity_swapped = swapped;
let channel_state = channels.channel_state(channel);
let i_set = channel_state.i_set;
channels.set_i(channel, i_set);
send_line(socket, b"{}");
Ok(Handler::Handled)
}
fn set_pwm (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, pin: PwmPin, value: f64) -> Result<Handler, Error> { fn set_pwm (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, pin: PwmPin, value: f64) -> Result<Handler, Error> {
match pin { match pin {
PwmPin::ISet => { PwmPin::ISet => {
@ -433,7 +424,6 @@ impl Handler {
Command::Show(ShowCommand::PostFilter) => Handler::show_post_filter(socket, channels), Command::Show(ShowCommand::PostFilter) => Handler::show_post_filter(socket, channels),
Command::Show(ShowCommand::Ipv4) => Handler::show_ipv4(socket, ipv4_config), Command::Show(ShowCommand::Ipv4) => Handler::show_ipv4(socket, ipv4_config),
Command::PwmPid { channel } => Handler::engage_pid(socket, channels, channel), Command::PwmPid { channel } => Handler::engage_pid(socket, channels, channel),
Command::PwmPolaritySwapped { channel, swapped } => Handler::swap_polarity(socket, channels, channel, swapped),
Command::Pwm { channel, pin, value } => Handler::set_pwm(socket, channels, channel, pin, value), Command::Pwm { channel, pin, value } => Handler::set_pwm(socket, channels, channel, pin, value),
Command::CenterPoint { channel, center } => Handler::set_center_point(socket, channels, channel, center), Command::CenterPoint { channel, center } => Handler::set_center_point(socket, channels, channel, center),
Command::Pid { channel, parameter, value } => Handler::set_pid(socket, channels, channel, parameter, value), Command::Pid { channel, parameter, value } => Handler::set_pid(socket, channels, channel, parameter, value),

24
src/command_parser.rs
View File

@ -159,10 +159,6 @@ pub enum Command {
PwmPid { PwmPid {
channel: usize, channel: usize,
}, },
PwmPolaritySwapped {
channel: usize,
swapped: bool,
},
CenterPoint { CenterPoint {
channel: usize, channel: usize,
center: CenterPoint, center: CenterPoint,
@ -243,12 +239,6 @@ fn off_on(input: &[u8]) -> IResult<&[u8], bool> {
))(input) ))(input)
} }
fn boolean(input: &[u8]) -> IResult<&[u8], bool> {
alt((value(false, tag("false")),
value(true, tag("true"))
))(input)
}
fn channel(input: &[u8]) -> IResult<&[u8], usize> { fn channel(input: &[u8]) -> IResult<&[u8], usize> {
map(one_of("01"), |c| (c as usize) - ('0' as usize))(input) map(one_of("01"), |c| (c as usize) - ('0' as usize))(input)
} }
@ -331,16 +321,6 @@ fn pwm_pid(input: &[u8]) -> IResult<&[u8], ()> {
value((), tag("pid"))(input) value((), tag("pid"))(input)
} }
fn pwm_polarity_swapped(input: &[u8]) -> IResult<&[u8], bool> {
preceded(
tag("polarity_swapped"),
preceded(
whitespace,
boolean,
)
)(input)
}
fn pwm(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> { fn pwm(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
let (input, _) = tag("pwm")(input)?; let (input, _) = tag("pwm")(input)?;
alt(( alt((
@ -353,10 +333,6 @@ fn pwm(input: &[u8]) -> IResult<&[u8], Result<Command, Error>> {
let (input, ()) = pwm_pid(input)?; let (input, ()) = pwm_pid(input)?;
Ok((input, Ok(Command::PwmPid { channel }))) Ok((input, Ok(Command::PwmPid { channel })))
}, },
|input| {
let (input, swapped) = pwm_polarity_swapped(input)?;
Ok((input, Ok(Command::PwmPolaritySwapped { channel, swapped })))
},
|input| { |input| {
let (input, config) = pwm_setup(input)?; let (input, config) = pwm_setup(input)?;
match config { match config {