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

181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrico Faulhaber
574a66c65b rework EnumType to use better Enum's 
unfortunately IntEnum can't be bent like we would need it (extensible).
So we had to write our own....

The members of the Enum still behave like ints, but also have
.name and .value attributes, should they be needed.

needed adoptions to correctly use (and test) the EnumType are included.

Change-Id: Ie019d2f449a244c4fab00554b6c6daaac8948b59
Reviewed-on: https://forge.frm2.tum.de/review/17843
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-07 17:57:46 +02:00
Enrico Faulhaber
927ca854a2 rework polling 
Readable/Moveable can't be busy....

Change-Id: Icfe250e16dd30646cf3081f4850a8bacaa77a935
Reviewed-on: https://forge.frm2.tum.de/review/17859
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-26 16:43:55 +02:00
Enrico Faulhaber
f0ea4bd9b8 fix internal event handling 
stringify at the latest possible moment, not the earliest

Change-Id: I230138c5787f97a72e8726ddc3546c61092d87c5
Reviewed-on: https://forge.frm2.tum.de/review/17858
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-26 16:36:01 +02:00
Enrico Faulhaber
153b4d79f7 fix equipment_id handling 
Change-Id: Ibeba9f0771dca8e7f9754f8b6431535885d654a0
Reviewed-on: https://forge.frm2.tum.de/review/17857
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-26 16:32:51 +02:00
JenkinsCodeReview
6c4cde4f2f [deb] Release v0.6.1 2018-04-19 10:24:44 +02:00
Enrico Faulhaber
95ba534180 py2/3: provide fallback if six is missing. 
Change-Id: I3a65268367f3c2fb81429fdd90039f90c1864109
Reviewed-on: https://forge.frm2.tum.de/review/17770
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-19 10:21:46 +02:00
JenkinsCodeReview
b3f63b779b [deb] Release v0.6.0 2018-04-17 17:38:53 +02:00
Enrico Faulhaber
629a1338bb [MLZ:stressihtf2] add sensor 
Change-Id: Ic038b922dc4719c17357540f8a3b53ac605aec50
Reviewed-on: https://forge.frm2.tum.de/review/17749
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-17 17:36:27 +02:00
Enrico Faulhaber
3b802e67c8 improve Py2/3 compat 
Change-Id: I1dfdcb88a492401851d5157c734cd708496bf004
Reviewed-on: https://forge.frm2.tum.de/review/17734
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-17 17:34:24 +02:00
Enrico Faulhaber
0d25dc35e0 MLZ: fix tango WindowTimeout 
Change-Id: I4e1f7e9ab519fe1ae5b6bcc4b9898b44f017c45f
Reviewed-on: https://forge.frm2.tum.de/review/17742
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Tested-by: Jens Krueger <jens.krueger@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-17 17:23:07 +02:00
Jens Krüger
851da9696c GUI: clean up callback for enum ComboBoxes 
Change-Id: I17450fb1701aeb252c6ce5a27db5f336ba138bb0
Reviewed-on: https://forge.frm2.tum.de/review/17748
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Tested-by: Jens Krueger <jens.krueger@frm2.tum.de>
 2018-04-17 14:32:18 +02:00
Enrico Faulhaber
9f9dd9e3a3 GUI: Fix doubled slot on 'set' button click 
Change-Id: I65126fc33a25f9c63fa37d896a0fff6ac13150e8
Reviewed-on: https://forge.frm2.tum.de/review/17746
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
 2018-04-17 13:52:06 +02:00
Jens Krüger
82b3e93126 STRESSIHTF2: Fix maximum ramp value 
The maximum ramp value is 9999. This will be used by the entangle server
during the stop, but it collides with the former limit 600 and creates
errors in the client.

Change-Id: I6888b876515a4a13ba04e4ccad3d045a8092f499
Reviewed-on: https://forge.frm2.tum.de/review/17747
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
 2018-04-17 13:51:49 +02:00
JenkinsCodeReview
7041d0f020 [deb] Release v0.5.0 2018-04-17 12:45:59 +02:00
Enrico Faulhaber
7653809954 [GUI] fix 'double' click on go-buttons 
Change-Id: I338cb7100a9fdbf8d45110e23bea71538235268d
Reviewed-on: https://forge.frm2.tum.de/review/17743
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 17:38:27 +02:00
Enrico Faulhaber
b041d72b66 amagnet: fix wrongly renamed tangomodule 
Change-Id: I9069bbe4d7ad0812ab90013731ed5233c792cc63
Reviewed-on: https://forge.frm2.tum.de/review/17737
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 14:29:30 +02:00
Jens Krüger
279d28f960 CCR12: Fix setup to new parameter names 
Change-Id: If638d611f302292cf601956c69c75ad1ea97ac71
Reviewed-on: https://forge.frm2.tum.de/review/17723
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 14:27:02 +02:00
Jens Krüger
4c7752e3a2 STRESSIHTF2: add setup 
Change-Id: I4b5db4ac540a5d7f5e413f3f06f6a4cf817d97d9
Reviewed-on: https://forge.frm2.tum.de/review/17722
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 14:26:53 +02:00
Enrico Faulhaber
b7ab6036e5 MLZ: Fix mapping in NamedDigitalOutput device 
Change-Id: Iaef2c4672eb3eceeaba2ec5750f964864ce76aa9
Reviewed-on: https://forge.frm2.tum.de/review/17733
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 14:26:29 +02:00
Enrico Faulhaber
f54e8ccb45 improve readability be renaming PARAMS,PROPS,CMDS 
and others.

Change-Id: Ie37768ed813acdf0cb0707c70ff63397ec8bfbf1
Reviewed-on: https://forge.frm2.tum.de/review/17320
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 14:05:33 +02:00
Jens Krüger
aba67dde7f NODECTRL: Fix some problems with logging and callbacks 
- The widgets do not have a logger itself, the node logger has to be
  used
- The 'target_go' callback function has to be part of the Driveable
  widget not the Readable widget

Change-Id: Ie045fb02414d768fcf9c5e3f8590267209e23d83
Reviewed-on: https://forge.frm2.tum.de/review/17721
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 11:51:45 +02:00
Jens Krüger
b96bae8e6b MLZ: enable the 'setposition' commands in entangle 
The command 'setposition' wasn't sane declared so the use of one of the
devices using this command lead always to a ProgrammingError during the
'describe' command via the server interface.

Change-Id: I34a6b07e8f0fbd861496515a5e18d3181ad134d5
Reviewed-on: https://forge.frm2.tum.de/review/17715
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 11:49:51 +02:00
Jens Krüger
b49dcf0fa8 UI: Add connection from exit button to close the window 
Change-Id: I168b06efa8ae95b09a9be408a25c510f90937c4c
Reviewed-on: https://forge.frm2.tum.de/review/17714
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 11:47:06 +02:00
Enrico Faulhaber
e830666315 Support PyQt5 (fallback to PyQt4) 
Change-Id: I7fa1add00d677e626fee5cd1071dee54d0bf8565
Reviewed-on: https://forge.frm2.tum.de/review/17666
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-11 12:43:04 +02:00
Enrico Faulhaber
40e75aefcc minor adoptions 
Change-Id: I8ee3968b46609ffb22f3618b61f6d15f0e5188c1
Reviewed-on: https://forge.frm2.tum.de/review/17281
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 15:36:45 +01:00
Enrico Faulhaber
d0620964fd fix unbound unit access 
Change-Id: I6dfb1a1c3c08fda54283ebbd1c862d99281b4c1e
Reviewed-on: https://forge.frm2.tum.de/review/17280
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 14:53:42 +01:00
Enrico Faulhaber
8117b26363 GUI: Saveguard against missing mandatory parameter status 
Change-Id: I04fa866474a8f2205c1e77f19d3eef4cd100ccf0
Reviewed-on: https://forge.frm2.tum.de/review/17279
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 14:50:39 +01:00
Enrico Faulhaber
b8abcfaf85 remember Widgets for modulectrl and paramctl 
to not recreate them when another module/param got selected

Change-Id: Ic81bd8e3105f666d3a03dffb3de4e15603d99c39
Reviewed-on: https://forge.frm2.tum.de/review/17276
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 12:13:23 +01:00
Enrico Faulhaber
99f763647f Avoid race condition upon gui start with autoconnect 
Change-Id: I9f886dd858d50584403da5adf0c995e73fe67267
Reviewed-on: https://forge.frm2.tum.de/review/17277
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 12:05:12 +01:00
Enrico Faulhaber
66503e8975 Add value parser + use it for the gui 
replaces eval which is used so far

Change-Id: Ie5ff8c82175786e233d52bc0faac4e72e3bc27e9
Reviewed-on: https://forge.frm2.tum.de/review/17271
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:54:04 +01:00
Enrico Faulhaber
c146f477aa secop/errors: add comments 
Change-Id: If03094acd29a8fd437ad9b82a8b332cc5ad8366b
Reviewed-on: https://forge.frm2.tum.de/review/17270
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:38:55 +01:00
Enrico Faulhaber
b9324876b3 Makefile: allow specifying only a subset of the tests to run 
Change-Id: I4502789e7bad322372f915051320d1d0d8b25fb3
Reviewed-on: https://forge.frm2.tum.de/review/17269
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
 2018-02-08 09:38:51 +01:00
Enrico Faulhaber
3ae82fb352 fix regression from renaming device to module 
Change-Id: I05c6c1d5bef2d6e4bce6a6130793bf8a8ed9bd6c
Reviewed-on: https://forge.frm2.tum.de/review/17272
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:38:41 +01:00
Enrico Faulhaber
09df63fdec Remove old demo code (no longer used) 
Change-Id: I6976a28b57258cc451bac410767fd3acf2fb8d49
Reviewed-on: https://forge.frm2.tum.de/review/17267
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:37:54 +01:00
Enrico Faulhaber
5621b17ee4 More simulation cfg's 
Change-Id: I57c0d85513e673cf070870708a7a3f75e90ebeda
Reviewed-on: https://forge.frm2.tum.de/review/17157
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-07 13:57:51 +01:00
Enrico Faulhaber
1c03b3c7f6 minor fixes 
Change-Id: Ic8ce37f62071bc928ea10a669da3ac7e43986f47
Reviewed-on: https://forge.frm2.tum.de/review/17156
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-23 15:21:18 +01:00
Enrico Faulhaber
62c2434f0f fix exceptions 
Change-Id: I09f33386d5ae1499f157f3ffb7aa3b08b65e27db
Reviewed-on: https://forge.frm2.tum.de/review/17127
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 18:27:40 +01:00
Enrico Faulhaber
8e7908f9b7 replace last references to device by module 
Change-Id: I2b7099715c356054aad21895f11b13547f104a88
Reviewed-on: https://forge.frm2.tum.de/review/17126
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 18:24:18 +01:00
Enrico Faulhaber
8538659b22 fix PARAMS handling + initialisation for simulation 
Change-Id: I1be9814b33884034301da0d8f3984011dfcf53b9
Reviewed-on: https://forge.frm2.tum.de/review/17128
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 18:03:32 +01:00
Enrico Faulhaber
41eb7e6508 Provide mlz_ccr12 simulation mockup cfg 
Change-Id: Ia473023dba6004a9148678c2af4dec9df9516054
Reviewed-on: https://forge.frm2.tum.de/review/17129
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 18:03:26 +01:00
Lutz Rossa
79d91d1f23 fix a connection timeout bug 
When connecting to a fast reacting server, if may be possible that
the "_communicate" function sends it command earlier than the question
for the SECoP version inside the "_inner_run" function. A new variable
showing the connection status forces to wait inside "_communicate".

Change-Id: Id521bbd53fea9e2e980b9c11b849d36cfdeb1ec2
Signed-off-by: Lutz Rossa <rossa@helmholtz-berlin.de>
Reviewed-on: https://forge.frm2.tum.de/review/17006
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-01-22 15:42:04 +01:00
Enrico Faulhaber
8220067795 Fix gui (leftover from extending datatypes) 
Change-Id: Id12d37d9381f622c3cc1bba2c388784169690b85
Reviewed-on: https://forge.frm2.tum.de/review/16916
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 15:15:02 +01:00
Enrico Faulhaber
b0c3ac01d4 Provide a mean for simulation dummy devices 
create the correct descriptive data.
Main use case is for unit-tests and testing custom configs.

Change-Id: I3077f80cb9fdbf2443ee9da796c3749707fd2b55
Reviewed-on: https://forge.frm2.tum.de/review/16806
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 15:00:04 +01:00
Enrico Faulhaber
8c26ecf5cf extend datatypes 
also make interface more explicit

Change-Id: Ib104e2c050d3e98e9d434d502951e33619784e2e
missing: test cases for *.from_string(input) methods
Reviewed-on: https://forge.frm2.tum.de/review/16893
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 14:08:42 +01:00
Frank Wutzler
3e9733d8f3 describe SECoP motivation discussed in meeting 2017-11-27 
Change-Id: Ib82b9ac195dccb29ce5c314e67840bcdd02e0515
Signed-off-by: Frank Wutzler <frank.wutzler@helmholtz-berlin.de>
Reviewed-on: https://forge.frm2.tum.de/review/16892
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 13:57:00 +01:00
Enrico Faulhaber
fd0f0ea961 playground: give sequencermixin a loopcounter (per step) 
Change-Id: Ibb300d426aa0a8191a08f4b1599965ca06731a02
Reviewed-on: https://forge.frm2.tum.de/review/16894
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-15 13:56:24 +01:00
Enrico Faulhaber
69e77749fb fix typo and include comment from Niklas 
Change-Id: I12656269a399d8e0602304187a833d0781906084
Reviewed-on: https://forge.frm2.tum.de/review/16848
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-12-05 10:01:00 +01:00
Enrico Faulhaber
97d0d33049 add info about Meeting @PSI 
Change-Id: I45231cd0fc35925d668615aed724b5c3d37629a3
Signed-off-by: Lutz Rossa <rossa@helmholtz-berlin.de>
Reviewed-on: https://forge.frm2.tum.de/review/16789
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Anders Pettersson <anders.pettersson@esss.se >
 2017-12-04 13:57:39 +01:00
Enrico Faulhaber
4b02a4c82e fix amagnet 
Change-Id: I6f1dedd5dfdd10cc828e27ea22440c35a25c2b9d
Reviewed-on: https://forge.frm2.tum.de/review/16790
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-11-30 10:55:34 +01:00
Markus Zolliker
4cf4ecb507 - fixed documentation hierarchy 
Change-Id: Ic61b10c393b1d5fa12d194a804c19f23a570c792
Reviewed-on: https://forge.frm2.tum.de/review/16708
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2017-11-15 11:48:47 +01:00