atse/thermostat
1
0
Fork 0
forked from M-Labs/thermostat
Code Issues Pull Requests Activity
416 Commits 23 Branches 0 Tags 3.3 MiB
08925755a3
Commit Graph

62 Commits

Author SHA1 Message Date
atse
08925755a3 Just catch asyncio.TimeoutError 
Will just change to TimeoutError once we switch to Python 3.11 in the
flake.
 2024-07-16 13:28:47 +08:00
atse
3d41254f43 Integrate WrappedClient into Thermostat model 2024-07-16 13:28:47 +08:00
atse
744dabb868 Should not stop cancelling read if timeout'd 2024-07-16 13:28:47 +08:00
atse
9dd4138276 Remove exception too general 2024-07-16 13:28:47 +08:00
atse
a64532eb23 Fix Autotuner state for forceful disconnect 2024-07-16 13:28:47 +08:00
atse
759b9e57a1 Correct exception catching 
asyncio.Task.result() is simply going to throw the exception in
asyncio.Task.exception(), there is no need to manually throw it.
 2024-07-16 13:28:47 +08:00
atse
0f708c0298 Formatting 2024-07-16 13:28:11 +08:00
atse
01e4ff8dd5 Use asserts to check for connectivity 2024-07-16 13:27:29 +08:00
atse
85f81ff379 Add back the parent 2024-07-16 13:27:29 +08:00
atse
cff5bd9d61 Format JSON 2024-07-16 13:27:26 +08:00
atse
b37dc49915 Swap order arounda bit more 2024-07-16 13:26:33 +08:00
atse
d9b9b8d605 Fix method call 2024-07-16 13:26:33 +08:00
atse
2ae07107a2 Expand PID Settings on PID engage 2024-07-16 13:23:56 +08:00
atse
e1565e2dfc Try make the i_set parameter adjustable pid 
"Auto" box
 2024-07-16 13:23:56 +08:00
atse
fda4cc9bfb Make connection loss handling more elegant 
Show an info box on connection lost informing the user that the
Thermostat was forcefully disconnected.
 2024-07-16 13:23:12 +08:00
atse
d68ff0e182 $ch 2024-07-16 13:23:12 +08:00
atse
977261e684 Fix grammar in info box on PID Autotune failure 2024-07-16 11:32:34 +08:00
atse
eb8057ddec Don't say settings loaded on settings save 2024-07-16 11:32:34 +08:00
atse
d7033cfd76 ctrl_panel: PID Auto Tune -> PID Autotune 2024-07-16 11:32:34 +08:00
atse
0114de970a ctrl_panel: Stop crushing spinboxes 
It might not be the case on some themes, but on the default Qt theme the
spinbox blocks the containing numbers a bit. See
https://github.com/pyqtgraph/pyqtgraph/issues/701.
 2024-07-16 11:32:34 +08:00
atse
9830ee8636 ctrl_panel: Approriate units for measured current 
Allow the readonly display of current to vary its SI prefix in the unit,
since as a display entry it won't have the unit adjustment problem.
 2024-07-16 11:32:34 +08:00
atse
ddeb5e988e ctrl_panel: Pin down units for editable fields 
Avoids awkward value editing
 2024-07-16 11:32:31 +08:00
atse
3c7b21a709 ctrl_panel: Add tooltips 
For users' better understanding of what the parameters do
 2024-07-16 11:32:12 +08:00
atse
30ba8260d0 ctrl_panel: Refer to Parameters by concise names 
For displayed string representations, use the `title` key, or for
`ListParameter`s, use the dictionary mapping method instead.
 2024-07-15 12:23:01 +08:00
atse
27cc68e524 ctrl_panel: Config -> Settings 2024-07-12 17:45:59 +08:00
atse
44bea87f03 Thermostat.disconnect -> Thermostat.end_session 
QObject already has a disconnect method, avoid overriding it.
 2024-07-10 15:56:43 +08:00
atse
271fe449ba Remove duplicated show call 
MainWindow.show() already called in coro_main
 2024-07-10 15:56:43 +08:00
atse
70db0a39eb Remove duplicated antialias config option 
Already set in live_plot_view.py
 2024-07-10 15:56:43 +08:00
atse
26c7382b1e Move GUI components and examples into folder 
For better organisation
 2024-07-10 15:56:43 +08:00
atse
c415d9de8a Use MANIFEST.in 
Allows for more accurate control over included files in pytec package
 2024-07-10 15:56:43 +08:00
atse
7069111e21 Expose frontend scripts exclusively in pytec 2024-07-10 15:56:43 +08:00
atse
1707728c3c thermostat_data_model.py -> thermostat.py 2024-07-10 15:56:34 +08:00
atse
a16d2e9a9e Follow CapWords convention for class names 
Re: PEP8
 2024-07-10 15:45:03 +08:00
atse
bc4ac43e0b Put comments in right place 2024-07-10 13:07:31 +08:00
linuswck
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
atse
8753f4a0fc Finish GUI 2024-05-08 14:49:03 +08:00
atse
9a83d6850d Remove unused as clause 2024-05-08 14:49:03 +08:00
Egor Savkin
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
atse
44ef2c04e3 Fix bugs, grammar, text, and refactor into class 2024-05-08 14:49:03 +08:00
atse
623011fabb Change title 2024-05-08 14:49:03 +08:00
atse
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
atse
7dd5d15047 Remove unused 'as' clause 2024-05-08 14:49:03 +08:00
atse
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
Egor Savkin
e0ce14c616 Try move from Qthreads to qasync 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-05-08 14:49:03 +08:00
Egor Savkin
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
Egor Savkin
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
topquark12
b4b4ec987c add autotune 2024-05-08 14:49:03 +08:00
Egor Savkin
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
topquark12
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
topquark12
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