README.md

@@ -142,7 +142,6 @@ 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

pytec/plot.py

@@ -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()

pytec/tec_qt.py

@@ -840,9 +840,8 @@ 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:
+                if settings['temperature'] is not None and settings['tec_i'] 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)

src/channel_state.rs

@@ -2,13 +2,11 @@ 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,
@@ -31,11 +29,9 @@ 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 {
@@ -48,11 +44,9 @@ 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,
         }
     }
 

src/channels.rs

@@ -118,15 +118,11 @@ impl<'a> Channels<'a> {
             1 => self.channel1.vref_meas,
             _ => unreachable!(),
         };
-        // let i_set = self.channel_state(channel).i_set;
+        // let center_point = self.get_center(channel);
         let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
         let voltage = self.get_dac(channel);
         let i_tec = (voltage - center_point) / (10.0 * r_sense);
-        if self.channel_state(channel).swap_tec_polarity {
-            -i_tec
-        } else {
-            i_tec
-        }
+        i_tec
     }
 
     /// i_set DAC
@@ -147,17 +143,11 @@ 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_set * 10.0 * r_sense + center_point;
+        let voltage = i_tec * 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
     }
 
@@ -388,12 +378,7 @@ impl<'a> Channels<'a> {
 
     // Get current passing through TEC
     pub fn get_tec_i(&mut self, channel: usize) -> ElectricCurrent {
-        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
-        }
+        (self.read_itec(channel) - self.read_vref(channel)) / ElectricalResistance::new::<ohm>(0.4)
     }
 
     // Get voltage across TEC
@@ -465,7 +450,6 @@ 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),
@@ -563,7 +547,6 @@ pub struct Report {
     sens: Option<ElectricalResistance>,
     temperature: Option<f64>,
     pid_engaged: bool,
-    current_swapped: bool,
     i_set: ElectricCurrent,
     dac_value: ElectricPotential,
     dac_feedback: ElectricPotential,

src/command_handler.rs

@@ -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_set = channels.get_i(channel);
+        let i_tec = channels.get_i(channel);
         let state = channels.channel_state(channel);
         state.center = center;
         if !state.pid_engaged {
-            channels.set_i(channel, i_set);
+            channels.set_i(channel, i_tec);
         }
         send_line(socket, b"{}");
         Ok(Handler::Handled)
@@ -412,14 +412,6 @@ 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),
@@ -449,7 +441,6 @@ 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),
         }
     }
 }

src/command_parser.rs

@@ -191,7 +191,6 @@ pub enum Command {
     },
     FanCurveDefaults,
     ShowHWRev,
-    SwapTECPolarity,
 }
 
 fn end(input: &[u8]) -> IResult<&[u8], ()> {
@@ -601,7 +600,6 @@ 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)
 }
 

src/config.rs

@@ -22,7 +22,6 @@ pub struct ChannelConfig {
     pwm: PwmLimits,
     /// uses variant `PostFilter::Invalid` instead of `None` to save space
     adc_postfilter: PostFilter,
-    swap_tec_polarity: bool,
 }
 
 impl ChannelConfig {
@@ -42,7 +41,6 @@ impl ChannelConfig {
             sh: state.sh.clone(),
             pwm,
             adc_postfilter,
-            swap_tec_polarity: state.swap_tec_polarity,
         }
     }
 
@@ -53,7 +51,6 @@ 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);