Commit Graph

624 Commits

Author SHA1 Message Date
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
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
4000371b97 Merge "README: add link to doc on forge.frm2.tum.de" 2023-02-20 16:02:48 +01:00
1b18337d2a Merge "do proper value import on the client side" 2023-02-20 16:01:48 +01:00
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
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
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
a2cd6051f2 Merge "HasStates: fix status code inheritance" 2023-02-14 08:25:22 +01:00
5b060d1b1c Merge "HasControlledBy and HasOutputModule mixins" 2023-02-14 08:24:51 +01:00
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
60f6c2dda5 Merge "interactive client: improve watch function" 2023-02-02 17:35:10 +01:00
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
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
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
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
66d363cc07 adapt tutorial to new config file format
Change-Id: Iafd8a2dbed8cd1283ce97b6559138c7bc02714c7
2023-01-26 16:43:56 +01:00
ddd16f4ed4 HasControlledBy and HasOutputModule mixins
for supporting coupled modules (output - input case)

Change-Id: I58488faa0d52b3b984a3dc70ff44ee4a9a218d7a
2023-01-25 10:25:31 +01:00
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
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
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
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
dcd79506a9 Merge "improve parameter initialisation" 2023-01-23 08:25:36 +01:00
f4e974f46c improve parameter initialisation
- make 'value' a Parameter property instead of an attribute
- use 'value' instead of 'default' property for setting
  the initial value in the config file
- removal of initwrite parameter property

this change is the basis of a better implementation
for change 30041 (PersistentParam property 'override_cfg')

Change-Id: I2b82bdd54c2dacb87dcd2b3472004d2f0a730cf0
2023-01-20 16:55:06 +01:00
Alexander Zaft
d889401697 Revert limit change in demo
After 29724, the change in frappy_demo/modules.py from 30183 which was
made to run 'make demo' without errors can be reverted.

Change-Id: I00a6f512304a3159c10e44aef670ac0edd4703d7
2023-01-19 15:39:33 +01:00
85295a7d72 Merge "client: detect original frappy error class" 2023-01-19 12:29:37 +01:00
82957c287d Merge "rework datatypes (setter should not check limits)" 2023-01-19 08:28:30 +01:00
Alexander Zaft
05593d80f6 Bring demo up to date
* Add python config for test and demo server
* Remove old configs
* Fix issue with slow start of test server

Change-Id: If0e576f4e4dda8b03489fdbb79b209dfcdca29ff
2023-01-18 16:24:30 +01:00
7a870aa56c rework datatypes (setter should not check limits)
- use Datatype.validate for converting and checking limits
  (used also in properties)
- Datatype.__call__ converts and validates, but without checking
  limits (used in setter)
- Datatype.validate may be used to add missing optional struct elements
  from previous value (used in Dispatcher._setParameterValue)
- remove problematic range check
+ use shorter formula for converting float to int in ScaledInteger
  (leftover from python2 compatibility)
+ improve error messages (strip very long repr(value))

Change-Id: Ib85736fe558ec3370ebce4e1c43f957e3bb0497c
2023-01-16 10:18:15 +01:00
Alexander Zaft
09d48ea913 Merge "GUI: add logging infra, switch to argparse" 2023-01-12 13:12:09 +01:00
Alexander Zaft
8850edbc2d Merge "Change config to Python" 2023-01-12 13:10:37 +01:00
59cc981566 client: detect original frappy error class
The text part of the error report contains the original error
class - convert it to the frappy error class, if possible.
This makes the error messages on the client nicer, as the
error class would be duplicated in the error message on the
client side.

Change-Id: If2e0c3eb15ac2dd1b80a851ff42e4076557a325d
2022-12-22 13:44:08 +01:00
3cc9a75174 improve He level tutorial
values return from read_* methods should be converted
from string to float on float parameters

+ fix some wording

Change-Id: Ic80010c6fbe3eef23483ff69c8a43e25afb8bb6a
2022-12-22 13:39:47 +01:00
Alexander Zaft
52b77ba9e6 Change config to Python
- Change Configuration format to be python-based.
- move config logic to frappy/config.py
- Add first py-config: cryo_cfg.py
- Adapt test to new expected config format

Change-Id: Iaec484e0e1e21ebbb1e5c74b53be6231329ddf71
2022-12-20 09:48:14 +01:00
Bjoern Pedersen
db3b190c26 Improve jenkinsfile
Change-Id: I68efdd1a20135a0374fb9692e369a315824786ea
2022-12-19 14:34:48 +01:00
Alexander Zaft
c522c41654 GUI: add logging infra, switch to argparse
First part for #4662

Change-Id: I75877337e8ea35d4c4555471ee4518c942dac88a
2022-12-08 16:38:00 +01:00
Enrico Faulhaber
929e41ffff Merge "Fix identification response" 2022-12-06 18:00:10 +01:00