linuswck
/
thermostat
forked from M-Labs/thermostat
1
0
Fork 0
Code Pull Requests 1 Activity
401 Commits 11 Branches 0 Tags 1.7 MiB
Commit Graph

52 Commits

Author SHA1 Message Date
atse 31c27c6a76 ctrl_panel: Bold "Control Method" text 2024-08-07 18:30:59 +08:00
atse 81ee2d0b27 ctrl_panel: Indicate active parameter of control 
Instead of hiding the inactive control parameter, underline and bold the
active control parameter title, e.g. "Set Current" when control method
is constant current, and "Setpoint" when it is temperature PID.
 2024-08-07 18:29:54 +08:00
atse dbbf30bfeb ctrl_panel: Limits fixes 
* PID Autotune test current should be positive

* max_v should be 4 V not 5 V

* r0 should not be negative
 2024-08-07 17:59:06 +08:00
atse 159c70972e ctrl_panel: Code cleanup 
* Remove unnecessary duplication of `THERMOSTAT_PARAMETERS`

* i -> ch

* Separate ParameterTree and Parameter initiation

* Remove extra "channel" option to root parameters, as the "value"
option is already the channel number
 2024-08-07 17:59:06 +08:00
atse 651e323206 ctrl_panel: PID Auto Tune -> PID Autotune 2024-08-07 17:59:06 +08:00
atse d6ba9be20c ctrl_panel: Stop crushing spinboxes 
It might not be the case on some themes, but on the default Qt theme the
spinbox are a bit too short for the containing numbers. See
https://github.com/pyqtgraph/pyqtgraph/issues/701.
 2024-08-07 17:59:06 +08:00
atse 66556f4c29 ctrl_panel: Pin down units for editable fields 
User input always has the same order of magnitude, so allowing multiple
siPrefixes would be unwanted complexity. Don't allow them to be changed.

The Parameter option "noUnitEditing" is added to do so by the following
measures:

1. Don't validate for changed siPrefix (if pinned) and suffix, which
avoids their removal.

2. Avoid getting the cursor embedded within the unit.
 2024-08-07 17:59:06 +08:00
atse c59e3e7ac4 ctrl_panel: Remove need for "mA" hack 
Remove all instances of mA scaling scattered all around the code and
specify it in the parameter tree with a single source of truth.

Done by adding the option "pinSiPrefix" for all Parameters of type `int`
or `float`, and using it for current Parameters with unit "mA".
 2024-08-07 17:59:06 +08:00
atse d96d36fb0c ctrl_panel: Appropriate 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-08-07 17:59:06 +08:00
atse ef7dbf9b5e ctrl_panel: Improve postfilter description 2024-08-07 17:59:03 +08:00
atse ed835ddfe6 ctrl_panel: Add tooltips 
For users' better understanding of what the parameters do
 2024-07-19 15:49:19 +08:00
atse 437c9cec34 ctrl_panel: Refer to Parameters by concise `name`s 
For displayed string representations, use the `title` key, or for
`ListParameter`s, use the dictionary mapping method instead.
 2024-07-19 15:49:19 +08:00
atse 7829ce6adf ctrl_panel: Config -> Settings 2024-07-19 15:49:16 +08:00
atse 0f14212622 Format JSON 2024-07-19 15:48:57 +08:00
atse d244ba392a Fix typos 2024-07-19 15:34:31 +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
topquark12 96f52ace8b pytec: simpler default graphs in plot 2021-01-25 13:51:50 +08:00
topquark12 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
Astro 7c55e34145 pytec: remove obsolete conversions 2020-12-18 19:37:25 +01:00
Astro 980d27ebfc pytec: remove client-side interval calculation 2020-12-18 15:44:11 +01:00
Astro b7e6cdbec2 pytec: measure interval 2020-12-16 22:14:21 +01:00
Astro 23d0c470e5 pytec: rename test.py to example.py 2020-12-09 01:08:34 +01:00
Astro 2a6f8ed874 pytec: use py3 dict methods 
Fixes Gitea issue #14
 2020-12-07 16:57:50 +01:00
Astro 5acebbef9f pytec: doc set_param 2020-10-01 00:35:16 +02:00
Astro 1b4a030e7e pytec: more methods, doc 2020-10-01 00:21:43 +02:00
Astro bfdb64ffd6 pytec: add configuration getters 2020-09-30 23:13:11 +02:00