Commit Graph

134 Commits

Author SHA1 Message Date
d3df467017 Move sigActivatedHandle to CtrlPanel 2024-10-07 13:27:54 +08:00
bd6adf9526 Get rid of timeout on readline 2024-10-07 13:27:54 +08:00
0786fa0158 Put send_command in CtrlPanel 2024-10-07 13:27:48 +08:00
547700ac51 Extra bail removed 2024-10-07 13:24:02 +08:00
a76268a81f return hwrev when start_session 2024-10-07 13:24:02 +08:00
7668bbf57e state str 2024-10-07 13:24:02 +08:00
f93e76eaa0 params update concurrently 2024-10-07 13:24:01 +08:00
067ab925dd Stuff non-UI changes in Thermostat model 2024-10-07 13:24:01 +08:00
5bef8883e0 Base Thermostat connectivity UI changes to state 2024-10-07 13:24:01 +08:00
a19c64ce98 Remove wait_for
OSError raised anyways
2024-10-07 13:24:01 +08:00
0107ed0acc Actually its OSError 2024-10-07 13:24:01 +08:00
3a1c7792c9 {start,end}_session -> [dis]connect 2024-10-07 13:24:01 +08:00
22de1b623f Simplify on_connect_btn_clicked
Raise if OSError
2024-10-07 13:24:01 +08:00
e8387acbc9 Connecting task moved? 2024-10-07 13:24:01 +08:00
7abcc63a90 AsyncIO version Client -> AsyncioClient 2024-10-07 13:24:01 +08:00
c4d31a78b1 Exclusively use the Thermostat object as a medium
All calls to the Thermostat should be forwarded by the medium.
2024-10-07 13:23:56 +08:00
047bde887e Integrate WrappedClient into Thermostat model 2024-10-07 13:22:55 +08:00
c83e6dc388 Should not stop cancelling read if timeout'd 2024-10-07 13:22:55 +08:00
d4f46b994b Fix Autotuner state for forceful disconnect 2024-10-07 13:22:55 +08:00
f61c09596e _ 2024-10-07 13:22:55 +08:00
b587a72345 Make connection loss handling more elegant
Show an info box on connection lost informing the user that the
Thermostat was forcefully disconnected.
2024-10-07 13:22:55 +08:00
88c3c6f815 Use new style super() 2024-10-07 13:22:55 +08:00
71d1c7390a Move command line host:port setting handling
To main
2024-10-07 13:22:55 +08:00
1256b5ff49 aioclient: Add missing readline for saving
Saving all channels returns multiple JSON objects, read the extra {}.
2024-10-07 13:22:55 +08:00
e59f8d05e0 import order rearrange 2024-10-07 13:22:55 +08:00
7f45437492 This is bail 2024-10-07 13:22:55 +08:00
dcf628b542 thermostat: Properly register task
Also Thermostat.task -> Thermostat._update_params_task
2024-10-07 13:22:55 +08:00
958fddf953 ip -> host 2024-10-07 13:22:55 +08:00
1db3a3ccb9 Lazy evaluating for debug string command 2024-10-07 13:22:55 +08:00
05d46030b4 Add pytec runnables 2024-10-07 13:22:55 +08:00
d3e878e294 Exactlier wording 2024-10-07 13:22:55 +08:00
38eb1c886d unused 2024-10-07 13:22:55 +08:00
1d4bc5c53f encoding 2024-10-07 13:22:55 +08:00
1ec541d580 Just catch asyncio.TimeoutError
Will just change to TimeoutError once we switch to Python 3.11 in the
flake.
2024-10-07 13:22:55 +08:00
eb8944e5ac Remove exception too general 2024-10-07 13:22:55 +08:00
abe08e4be6 Use asserts to check for connectivity 2024-10-07 13:22:55 +08:00
0024ebae5f Add back the parent 2024-10-07 13:22:55 +08:00
3f5ae9e333 Fix method call 2024-10-07 13:22:55 +08:00
f77f5399cf Swap order arounda bit more 2024-10-07 13:22:55 +08:00
f632349c62 Formatting 2024-10-07 13:22:55 +08:00
41abad7aa3 send_command: Remove "activater"
Interpret commands anomalies directly in send_command instead
2024-08-14 16:07:15 +08:00
5c8d9c7cce send_command: Simplify "pid_autotune" parameters 2024-08-14 16:07:15 +08:00
278898fad2 send_command: Switch to thermostat:set_param
Use a `dict` to map values to thermostat parameters, which correspond to
the `set_param` parameters in the pytec client. New tag
"thermostat:set_param" used in JSON.
2024-08-14 16:07:14 +08:00
dd83daa5d9 send_command: Remove indirect path to parameter
The child at inner_param's childpath to the root parameter... is just
inner_param itself.
2024-08-14 16:06:31 +08:00
d57cc9ef2a send_command: Alias data as new_value 2024-08-14 16:06:24 +08:00
be77a6f205 send_command: Use in syntax 2024-08-14 16:06:17 +08:00
d244ba392a Fix typos 2024-07-19 15:34:31 +08:00
44bea87f03 Thermostat.disconnect -> Thermostat.end_session
QObject already has a disconnect method, avoid overriding it.
2024-07-10 15:56:43 +08:00
271fe449ba Remove duplicated show call
MainWindow.show() already called in coro_main
2024-07-10 15:56:43 +08:00
70db0a39eb Remove duplicated antialias config option
Already set in live_plot_view.py
2024-07-10 15:56:43 +08:00
26c7382b1e Move GUI components and examples into folder
For better organisation
2024-07-10 15:56:43 +08:00
c415d9de8a Use MANIFEST.in
Allows for more accurate control over included files in pytec package
2024-07-10 15:56:43 +08:00
7069111e21 Expose frontend scripts exclusively in pytec 2024-07-10 15:56:43 +08:00
1707728c3c thermostat_data_model.py -> thermostat.py 2024-07-10 15:56:34 +08:00
a16d2e9a9e Follow CapWords convention for class names
Re: PEP8
2024-07-10 15:45:03 +08:00
bc4ac43e0b Put comments in right place 2024-07-10 13:07:31 +08:00
9acff86547 Restructure GUI Code, Improve and Fix Bugs
- Bugs fix:
1. Params Tree user input will not get overwritten
    by incoming report thermostat_data_model.
2. PID Autotune Sampling Period is now set according to Thermostat sampling interval
3. PID Autotune won't get stuck in Fail State
4. Various types disconnection related Bugs
5. Number of Samples stored in the plot cannot be set
6. Limit the max settable output current to be 2000mA

- Improvement:
1. Params Tree settings can be changed with external json
2. Use a Tab system to show a single channel of config instead of two
3. Expose PID Autotune lookback params
4. Icon is changed to Artiq logo

- Restructure:
1. Restructure the code to follow Model-View-Delegate Design Pattern
2024-06-06 17:34:15 +08:00
8753f4a0fc Finish GUI 2024-05-08 14:49:03 +08:00
9a83d6850d Remove unused as clause 2024-05-08 14:49:03 +08:00
772863f4b2 Add paramtree view, without updates
Signed-off-by: Egor Savkin <es@m-labs.hk>

Fix signal blocker argument -atse
2024-05-08 14:49:03 +08:00
44ef2c04e3 Fix bugs, grammar, text, and refactor into class 2024-05-08 14:49:03 +08:00
623011fabb Change title 2024-05-08 14:49:03 +08:00
400f3a98e8 Stop polling drift
Just waiting for the update_s doesn't take into account the time to
execute update_params, and causes time drift.
2024-05-08 14:49:03 +08:00
7dd5d15047 Remove unused 'as' clause 2024-05-08 14:49:03 +08:00
65e1f4a146 Finish moving over to qasync
Also:

* Add aioclient

The old client is synchronous and blocking, and the only way to achieve
true asynchronous IO is to create a new client that interfaces with
asyncio.

* Finish Nix Flake description and make the GUI available for `nix run`
2024-05-08 14:49:03 +08:00
e0ce14c616 Try move from Qthreads to qasync
Signed-off-by: Egor Savkin <es@m-labs.hk>
2024-05-08 14:49:03 +08:00
a79679a074 Create client watcher, that would poll Thermostat for config
Signed-off-by: Egor Savkin <es@m-labs.hk>
2024-05-08 14:49:03 +08:00
b9acba69d3 Create basic GUI, that would connect and control thermostat's fan
Signed-off-by: Egor Savkin <es@m-labs.hk>
2024-05-08 14:49:03 +08:00
b4b4ec987c add autotune 2024-05-08 14:49:03 +08:00
e3e3237d2f Emit warning when current/voltage limits are near zero
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-03-23 16:58:05 +08:00
26ad2f0119 rewrite PID
Rewrite of PID according to https://hackmd.io/IACbwcOTSt6Adj3_F9bKuw PID implementation.

To migrate:
- TEC+/- pin polarity has to be reversed.
- Some saved settings might be wiped upon flashing of new firmware, back up settings before upgrade
- Min / Max integral parameters no longer exist
- kp, ki, kd will likely need to be retuned

The software has been tested on hardware with good temperature control stability.

Reviewed-on: M-Labs/thermostat#68
Co-authored-by: topquark12 <aw@m-labs.hk>
Co-committed-by: topquark12 <aw@m-labs.hk>
2022-02-24 20:16:47 +08:00
a5d8661b10 main: fix handling of incomplete data received (#55)
Reviewed-on: M-Labs/thermostat#55
Co-Authored-By: topquark12 <aw@m-labs.hk>
Co-Committed-By: topquark12 <aw@m-labs.hk>
2021-01-29 16:18:07 +08:00
96f52ace8b pytec: simpler default graphs in plot 2021-01-25 13:51:50 +08:00
73dd6d9154 add PID autotune code
Co-Authored-By: topquark12 <aw@m-labs.hk>
Co-Committed-By: topquark12 <aw@m-labs.hk>
2021-01-06 11:02:52 +08:00
7c55e34145 pytec: remove obsolete conversions 2020-12-18 19:37:25 +01:00
980d27ebfc pytec: remove client-side interval calculation 2020-12-18 15:44:11 +01:00
b7e6cdbec2 pytec: measure interval 2020-12-16 22:14:21 +01:00
23d0c470e5 pytec: rename test.py to example.py 2020-12-09 01:08:34 +01:00
2a6f8ed874 pytec: use py3 dict methods
Fixes Gitea issue #14
2020-12-07 16:57:50 +01:00
5acebbef9f pytec: doc set_param 2020-10-01 00:35:16 +02:00
1b4a030e7e pytec: more methods, doc 2020-10-01 00:21:43 +02:00
bfdb64ffd6 pytec: add configuration getters 2020-09-30 23:13:11 +02:00
4b75c6147d pytec plot: update legend, rm debug add pid_output 2020-09-30 19:13:50 +02:00
97490e5e1b pytec: init 2020-09-29 02:52:46 +02:00