linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
644 Commits 18 Branches 1 Tag
Commit Graph

644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Georg Brandl
e0132ed201 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-03-06 08:24:15 +01:00
Georg Brandl
e0090a5918 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-03-06 08:24:15 +01:00
Georg Brandl
ee9f8536b2 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-03-06 08:24:15 +01:00
Markus Zolliker
a1141c87c9 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-03-06 08:24:15 +01:00
Georg Brandl
b75d89ad16 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-03-06 08:24:15 +01:00
Georg Brandl
af32fd308c 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-03-06 08:24:15 +01:00
Georg Brandl
355eaeb864 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-03-06 08:24:15 +01:00
Georg Brandl
a2458005f1 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-03-06 08:24:15 +01:00
Jenkins system
1004512caf [deb] Release v0.17.0 2023-03-06 08:24:15 +01:00
Alexander Zaft
9f54d89efa Rework GUI. 
Work-in-progress state of the new gui.

Change-Id: Ib5e9ad2178b372fbd2914077096a9c73f025ecb7
 2023-03-06 08:24:15 +01:00
Georg Brandl
72f9f242d7 doc: fix trailing comma in authors 
Change-Id: Ie611a3258a5b1acbdcbdfa55aad5198c4613f647
 2023-03-06 08:24:15 +01:00
Georg Brandl
4857ebf043 ci: remove duplicate variable 
Change-Id: I839ac4d9eda36082ba24c7c06df234a78798be2c
 2023-03-06 08:24:15 +01:00
Jenkins system
25ff6018c4 [deb] Release v0.16.1 2023-03-06 08:24:15 +01:00
Jenkins system
b3fbf3b107 [deb] Release v0.16.4 2023-03-06 08:24:15 +01:00
Jenkins system
8651a5fb83 [deb] Release v0.16.3 2023-03-06 08:24:15 +01:00
Jenkins system
231f5942f8 [deb] Release v0.16.2 2023-03-06 08:24:15 +01:00
Georg Brandl
1d893974cb gui: move icon resources for the cfg editor to its subdirectory 
Change-Id: Iebda39c73d9886701a58fe58b91ef54b70a4fd73
 2023-03-06 08:24:15 +01:00
Jenkins system
6b32c4bb81 [deb] Release v0.16.1 2023-03-06 08:24:15 +01:00
Enrico Faulhaber
9b801e9487 add frappy-cli to package 
Change-Id: I8697f05517935470a7c867ebddd63f5d28be21c3
 2023-03-06 08:24:15 +01:00
Jenkins system
23b1f59320 [deb] Release v0.16.0 2023-03-06 08:24:15 +01:00
Markus Zolliker
3a2a90e712 README: add link to doc on forge.frm2.tum.de 
Change-Id: I4a183202590a7e73ee1a905538c35af175f6c82d
 2023-03-06 08:24:15 +01:00
Markus Zolliker
ad7ff7f7f3 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-03-06 08:24:15 +01:00
Alexander Zaft
8799710b38 Convert example configs to python 
Fixes: #4627

Change-Id: I1049af9fa2f3f9ec06e55811dc9ecfa5f359c805
 2023-03-06 08:24:15 +01:00
Markus Zolliker
e1d5170a90 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-03-06 08:24:15 +01:00
Alexander Zaft
a39db9a35d Change Readme title 
Change-Id: Id8b07e76cb5748aa595fb484d78ffcc43f9cdddf
 2023-03-06 08:24:15 +01:00
Alexander Zaft
5c874483a9 Add initial README 
Change-Id: I314b6bf527ba6bb7011804a3768e7785ed4046e3
 2023-03-06 08:24:15 +01:00
Markus Zolliker
65480cd773 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-03-06 08:24:15 +01:00
Markus Zolliker
7d59345f43 HasControlledBy and HasOutputModule mixins 
for supporting coupled modules (output - input case)

Change-Id: I58488faa0d52b3b984a3dc70ff44ee4a9a218d7a
 2023-03-06 08:24:15 +01:00
Oksana Shliakhtun
bc553f889c Implement ramping qnw 
Change-Id: I9d7fab73194a0a8be3a230cc7ca99066d2553fce
 2023-03-02 17:01:43 +01:00
Oksana Shliakhtun
cae225df41 create qnw driver 
Change-Id: I7b466caf91b7a2a177fa94ac84cdfc315475f959
 2023-03-01 17:49:15 +01:00
Oksana Shliakhtun
3a52f9d31c fixes in lakeshore alarm 
Change-Id: Ibbcbe94d9a64d1c074025183e1310506a2cb00f4
 2023-03-01 17:49:15 +01:00
Markus Zolliker
4ebb15ca6c add lakeshore demo for hands-on workshop 
- a simple LakeShore model 336 driver

a tutorial follows

Change-Id: I291a615efa5bd58a0dd908949210086d2f82c2ca
 2023-02-20 12:52:05 +01:00
Markus Zolliker
240c4f027b 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-02-20 12:51:55 +01:00
Markus Zolliker
f7e24f13bb 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-02-20 12:51:22 +01:00
Markus Zolliker
c3d8068e02 adapt tutorial to new config file format 
Change-Id: Iafd8a2dbed8cd1283ce97b6559138c7bc02714c7
 2023-02-20 12:51:11 +01:00
Markus Zolliker
084e890645 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-02-20 12:50:38 +01:00
Markus Zolliker
edd3437682 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-02-20 12:50:19 +01:00
Alexander Zaft
c2728c8340 Add .desktop file 
Fixes: #4632
Change-Id: Ie0f07049462ed6664cca4062bced09c15bdd5a56
 2023-02-20 12:50:08 +01:00
Markus Zolliker
725820fafd fix copy method of Attached 
a copy of 'Attached' must also copy the basecls

Change-Id: Ia80cc458b241cb1f224f4c24f0241ed1d4ec1060
 2023-02-20 12:49:53 +01:00
Markus Zolliker
9f653b4e6f update interactive client 
Change-Id: Iacc521807969b23779f1172d09bfc164a0a66a3b
 2023-02-02 17:35:39 +01:00
Markus Zolliker
ae7d3514a1 update interactive frappy client 
Change-Id: Icf0ce4c7e2f99ac65e2b47e8fa1efb497322922a
 2023-02-02 17:33:53 +01:00
Oksana Shliakhtun
6b9d4a8140 . 
Change-Id: I45df6909814299a26eefdb25c63b827741872d82
 2023-02-02 17:31:24 +01:00
Oksana Shliakhtun
af295b12b0 fixed write_alarm 
Change-Id: I1c155a63c7340aa1292bc1e530cedfcc72d5ffed
 2023-02-02 17:25:34 +01:00
Oksana Shliakhtun
69dd011260 Added alarms 
Change-Id: Idd06278e44e01522ddf904b56a452ce8c704b5a6
 2023-02-02 17:22:08 +01:00
Oksana Shliakhtun
d62076128a add comma between command and arguments 
Change-Id: Ibc3a9072140842d521ebb4840eecb180e69b134e
 2023-01-31 09:42:45 +01:00
Markus Zolliker
38ae301cda add frappy-cli 
Change-Id: I2622212e178ceede7cc7285564a7a09929fafc5c
 2023-01-30 17:16:08 +01:00
Oksana Shliakhtun
2ee9ea65da fix SETP? 
Change-Id: I337adece10204ca67dcf720e4de36085b80601ba
 2023-01-30 17:13:52 +01:00
Oksana Shliakhtun
0dfaa79f77 fix set_par/get_par calls 
Change-Id: Iff6b244ca381849333646853b4c0bb8a347bbb3b
 2023-01-30 17:09:46 +01:00
Oksana Shliakhtun
866fe73f2e fix CDISP 
Change-Id: I09010a1997799bed04f25a7a3eb0157f7af5ad8b
 2023-01-30 17:04:28 +01:00
l_samenv
f5c96214b0 Merge branch 'develop' of gitlab.psi.ch:samenv/frappy into develop 2023-01-30 16:57:29 +01:00