M-Labs
/
kirdy
3
0
Fork 1
Code Issues 11 Pull Requests Projects Releases Wiki Activity

Compare commits

base: M-Labs:b95b9dcefae9b61efedbe21d5b01e462deeb65a7
Branches Tags
M-Labs:master
..
compare: M-Labs:ec5bf1d6b64ae92931f276ba186c33868d50648a
Branches Tags
M-Labs:master

No commits in common. "b95b9dcefae9b61efedbe21d5b01e462deeb65a7" and "ec5bf1d6b64ae92931f276ba186c33868d50648a" have entirely different histories.
b95b9dcefa ... ec5bf1d6b6

1 changed files with 11 additions and 19 deletions
Show Stats Expand all files Collapse all files

30
pykirdy/kirdy_qt.py
View File

@ -216,21 +216,15 @@ class Graphs:
self._pd_mon_pwr_plot.hide() self._pd_mon_pwr_plot.hide()
self.pd_mon_pwr_connector.cb_append_data_point(0.0, ts) self.pd_mon_pwr_connector.cb_append_data_point(0.0, ts)
if tec_temp is None: if tec_temp is not None:
self._tec_temp_plot.hide() self.tec_temp_connector.cb_append_data_point(tec_temp, ts)
tec_temp = -273.15 if self._temp_setpoint_line.isVisible():
else: self.tec_setpoint_connector.cb_append_data_point(self._temp_setpoint_line.value(), ts)
self._tec_temp_plot.show() else:
self.tec_setpoint_connector.cb_append_data_point(tec_temp, ts)
self.tec_temp_connector.cb_append_data_point(tec_temp, ts) if tec_i_measure is not None:
if self._temp_setpoint_line.isVisible(): self.tec_i_measure_connector.cb_append_data_point(tec_i_measure, ts)
self.tec_setpoint_connector.cb_append_data_point(self._temp_setpoint_line.value(), ts) self.tec_i_target_connector.cb_append_data_point(tec_i_set, ts)
else:
self.tec_setpoint_connector.cb_append_data_point(tec_temp, ts)
if tec_i_measure is not None:
self.tec_i_measure_connector.cb_append_data_point(tec_i_measure, ts)
self.tec_i_target_connector.cb_append_data_point(tec_i_set, ts)
except Exception as e: except Exception as e:
logging.error(f"Graph Value cannot be updated. Data:{report}", exc_info=True) logging.error(f"Graph Value cannot be updated. Data:{report}", exc_info=True)
@ -666,6 +660,7 @@ class MainWindow(QtWidgets.QMainWindow):
param.parent().child('Lookback').value()) param.parent().child('Lookback').value())
self.autotuner.setReady() self.autotuner.setReady()
param.setOpts(title="Stop") param.setOpts(title="Stop")
self.kirdy_data_watcher.set_report_mode(True)
await self.kirdy.thermostat.set_constant_current_control_mode() await self.kirdy.thermostat.set_constant_current_control_mode()
self.kirdy_data_watcher.report_update_sig.connect(self.autotune_tick) self.kirdy_data_watcher.report_update_sig.connect(self.autotune_tick)
self.loading_spinner.show() self.loading_spinner.show()
@ -863,10 +858,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.params[2].child('Power').setValue('g' if report['pwr_on'] else 'w') self.params[2].child('Power').setValue('g' if report['pwr_on'] else 'w')
self.params[2].child('Alarm').setValue('r' if report['temp_mon_status']['over_temp_alarm'] else 'w') self.params[2].child('Alarm').setValue('r' if report['temp_mon_status']['over_temp_alarm'] else 'w')
with QSignalBlocker(self.params[3]): with QSignalBlocker(self.params[3]):
if report["temperature"] == None: self.params[3].child('Readings', 'Temperature').setValue(report["temperature"])
self.params[3].child('Readings', 'Temperature').setValue(-273.15)
else:
self.params[3].child('Readings', 'Temperature').setValue(report["temperature"])
self.params[3].child('Readings', 'Current through TEC').setValue(report["tec_i"]) self.params[3].child('Readings', 'Current through TEC').setValue(report["tec_i"])
except Exception as e: except Exception as e:
logging.error(f"Params tree cannot be updated. Data:{report}", exc_info=True) logging.error(f"Params tree cannot be updated. Data:{report}", exc_info=True)