linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638 Commits 20 Branches 1 Tag
0bbf3337b28ca4648d741618dfddbae87b4068f6
Commit Graph

638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Zaft
0bbf3337b2 Fix Simulation and Proxy 
Combination of changes 30188 and 30194 leads to simulation and proxy
still reading 'default' instead of 'value'

Change-Id: I176a42f534a4eb04916b57bb3b54e880a2531ed3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30502
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-02-22 17:28:20 +01:00
Jenkins system
43b5f707e8 [deb] Release v0.17.1 2023-02-21 17:44:57 +01:00
Georg Brandl
612695b644 gui: make plot windows children of the node, so they close automatically 
Change-Id: I025bff02bc566be8bbaa8d90bf0035d1e2bf2a69
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30494
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 17:29:39 +01:00
Georg Brandl
cb8366105d gui: clear tree selection by clicking into empty space 
Change-Id: Ib065feeffa8636ee0b3160d7612f069057ef6b0e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30492
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 17:29:35 +01:00
Georg Brandl
5de9ff2901 gui: as a stopgap measure, apply %g format to floats 
Needs to be properly fixed by sharing the code to format
parameter values everywhere.

Change-Id: I766e4d2cb644153f99f9f40ce0414aa314b47307
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30491
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 17:29:31 +01:00
Georg Brandl
35fce652b7 gui console: better formatting of input/output 
Change-Id: I2ffb3712bb4ef5dcdfbcae869e4971bdc7a116ad
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30490
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 17:29:26 +01:00
Markus Zolliker
eb46733c86 fix links in doc/introduction 
Change-Id: I9f613c77835472c79be2850265126686cb57e8b9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30493
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-02-21 17:17:52 +01:00
Georg Brandl
318f33961a gui: make spacing more consistent 
Change-Id: I5bb44c440b33cb0b5de0f5e2457c9226afe74a50
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30489
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 17:01:45 +01:00
Georg Brandl
d641784104 cfg: repair demo cfg after conversion 
Change-Id: I00b4e92d8e10842e9b2ae1ae904402473e77107f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30488
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 16:47:18 +01:00
Georg Brandl
97a9e6624b config: demo config fixes 
Change-Id: I380e101065179bf0d784bacfe6b79731b40af4c5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30487
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 16:47:14 +01:00
Georg Brandl
72a28b198b gitignore: ignore demo PID file 
Change-Id: Iab6bd32c51772f5bcf256802c9bb7082be5e7873
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30486
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-02-21 16:47:01 +01:00
Jenkins system
86f97f0492 [deb] Release v0.17.0 2023-02-21 13:52:17 +01:00
Alexander Zaft
9a91f28413 Merge "Rework GUI." 2023-02-21 12:35:53 +01:00
Georg Brandl
9c17f09bdf doc: fix trailing comma in authors 
Change-Id: Ie611a3258a5b1acbdcbdfa55aad5198c4613f647
 2023-02-21 12:06:12 +01:00
Georg Brandl
7465824423 ci: remove duplicate variable 
Change-Id: I839ac4d9eda36082ba24c7c06df234a78798be2c
 2023-02-21 12:03:36 +01:00
Alexander Zaft
a36d875fae Rework GUI. 
Work-in-progress state of the new gui.

Change-Id: Ib5e9ad2178b372fbd2914077096a9c73f025ecb7
 2023-02-21 11:41:23 +01:00
Jenkins system
12f21996e4 [deb] Release v0.16.1 2023-02-21 08:44:29 +01:00
Jenkins system
879267aad1 [deb] Release v0.16.4 2023-02-21 08:09:20 +01:00
Jenkins system
7081976612 [deb] Release v0.16.3 2023-02-21 08:00:15 +01:00
Jenkins system
ea98023c28 [deb] Release v0.16.2 2023-02-21 07:50:13 +01:00
Enrico Faulhaber
167294aad8 Merge "gui: move icon resources for the cfg editor to its subdirectory" 2023-02-20 21:45:32 +01:00
Jenkins system
716fd0df2c [deb] Release v0.16.1 2023-02-20 17:17:23 +01:00
Enrico Faulhaber
d168384d0c add frappy-cli to package 
Change-Id: I8697f05517935470a7c867ebddd63f5d28be21c3
 2023-02-20 17:15:23 +01:00
Jenkins system
56454b9d9a [deb] Release v0.16.0 2023-02-20 16:15:11 +01:00
Markus Zolliker
4000371b97 Merge "README: add link to doc on forge.frm2.tum.de" 2023-02-20 16:02:48 +01:00
Markus Zolliker
1b18337d2a Merge "do proper value import on the client side" 2023-02-20 16:01:48 +01:00
Markus Zolliker
55077e2417 README: add link to doc on forge.frm2.tum.de 
Change-Id: I4a183202590a7e73ee1a905538c35af175f6c82d
 2023-02-20 15:53:50 +01:00
Alexander Zaft
127f1712ee Convert example configs to python 
Fixes: #4627

Change-Id: I1049af9fa2f3f9ec06e55811dc9ecfa5f359c805
 2023-02-20 15:41:56 +01:00
Markus Zolliker
c4fbd8a7bf Merge "T controller tutorial and improve documentation" 2023-02-20 08:44:45 +01:00
Alexander Zaft
4a7294679b Change Readme title 
Change-Id: Id8b07e76cb5748aa595fb484d78ffcc43f9cdddf
 2023-02-16 12:00:51 +01:00
Alexander Zaft
5c3d09288b Add initial README 
Change-Id: I314b6bf527ba6bb7011804a3768e7785ed4046e3
 2023-02-16 11:51:46 +01:00
Markus Zolliker
365476256e do proper value import on the client side 
json values were not converted properly, resulting in integers
instead of enums at the client side

+ add log.debug in rx thread

Change-Id: Ifc3c3b28540eb6a516d77387a3f83711f34b7480
 2023-02-15 15:33:58 +01:00
Markus Zolliker
a2cd6051f2 Merge "HasStates: fix status code inheritance" 2023-02-14 08:25:22 +01:00
Markus Zolliker
5b060d1b1c Merge "HasControlledBy and HasOutputModule mixins" 2023-02-14 08:24:51 +01:00
Markus Zolliker
10a61aa760 T controller tutorial and improve documentation 
add tutorial for Berlin hands-on workshop

+ improve the documentation (hints for structure welcome)
+ remove 'optional' parameter property
  (is not yet used - should not appear in doc)
+ added test property in frappy_demo.cryo alters Parameter class
  ('test' property appears in Parameter doc)

Change-Id: I3ea08f955a92f72451fd23a5ff00d1185c7fb00e
 2023-02-13 15:58:39 +01:00
Markus Zolliker
60f6c2dda5 Merge "interactive client: improve watch function" 2023-02-02 17:35:10 +01:00
Markus Zolliker
a72c2b685d add lakeshore demo for hands-on workshop 
- a simple LakeShore model 336 driver

a tutorial follows

Change-Id: I291a615efa5bd58a0dd908949210086d2f82c2ca
 2023-02-02 15:18:44 +01:00
Markus Zolliker
6b751f845f interactive client: improve watch function 
- watch is now a command, not a module method
- finish watching with ctrl-C
- watching an io module logs communication
- add bin/frappy-cli to start interactive client
+ remove sorted function from StructOf.format_value

Change-Id: I7dd707473e4534f2d39c5d6afc533c2d872380f8
 2023-01-31 13:11:07 +01:00
Markus Zolliker
12ef37504a Merge "adapt tutorial to new config file format" 2023-01-31 11:44:45 +01:00
Alexander Zaft
3c1f4b0bc1 Merge "Add .desktop file" 2023-01-31 07:29:07 +01:00
Markus Zolliker
ada9e53a4d raise ProtcolError when specifier is missing 
- fixed this for 'read', 'change' and 'do' message
+ fix an error in frappy.client.SecopClient closing the connection
  when the identifier is None

fixes: #4672

Change-Id: Iaba0f9ed86b6eb6ef7588403ba640ded552dded6
 2023-01-30 17:15:27 +01:00
Markus Zolliker
66d363cc07 adapt tutorial to new config file format 
Change-Id: Iafd8a2dbed8cd1283ce97b6559138c7bc02714c7
 2023-01-26 16:43:56 +01:00
Markus Zolliker
ddd16f4ed4 HasControlledBy and HasOutputModule mixins 
for supporting coupled modules (output - input case)

Change-Id: I58488faa0d52b3b984a3dc70ff44ee4a9a218d7a
 2023-01-25 10:25:31 +01:00
Markus Zolliker
a4ebcb9bb7 HasStates: fix status code inheritance 
use mro for status code inheritance
- as a consequence, the decorator class 'StatusCode' is now a
  decorator function 'status_code'. snake case is anyway more
  common for decorators.
- adapt tests
+ fix an error message

Change-Id: Ib409b963c51e0fe807397ff1d73d77d0147b8580
 2023-01-25 08:49:02 +01:00
Markus Zolliker
878bb6f892 do not throw ZeroDivisonError when pollinterval is 0 
fast_interval might be 0, indicating to poll as fast as possible
- this should not throw a zero division error

Change-Id: I26e18f5a656c943b906c6ffff65361e1fcf16d50
 2023-01-24 15:37:45 +01:00
Markus Zolliker
e571abdb18 improve persistent parameters 
A value given in config overrides values read from the persistent data file.
To let the loaded parameter have precedence, configure a default only.
The write_<param> method of a persistent parameter is now always called
on startup.

- add tests for persistent behaviour
+ simplify Modules.writeInitParams: remove started_callback argument

Change-Id: I08b49de52e9d9a2ed0918018eb2fe538141a4f5e
 2023-01-24 15:35:50 +01:00
Alexander Zaft
ec16ee7e8b Add .desktop file 
Fixes: #4632
Change-Id: Ie0f07049462ed6664cca4062bced09c15bdd5a56
 2023-01-24 10:56:39 +01:00
Georg Brandl
401447ffd6 gui: move icon resources for the cfg editor to its subdirectory 
Change-Id: Iebda39c73d9886701a58fe58b91ef54b70a4fd73
 2023-01-24 09:29:55 +01:00
Markus Zolliker
37ca162ae2 fix copy method of Attached 
a copy of 'Attached' must also copy the basecls

Change-Id: Ia80cc458b241cb1f224f4c24f0241ed1d4ec1060
 2023-01-24 08:22:58 +01:00
Markus Zolliker
dcd79506a9 Merge "improve parameter initialisation" 2023-01-23 08:25:36 +01:00