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

659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Pedersen
4b2260d77c Remove bootstrapping code from Jenkinsfile 
Change-Id: I444509902b64b5112d3ca579a5217680b83e1614
Reviewed-on: https://forge.frm2.tum.de/review/18618
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2018-09-26 08:53:01 +02:00
Björn Pedersen
8c5f602a99 Add dockerized ci infrastructure 
Change-Id: I30c4a028c75dbbd50675312cea2861fa419c1101
Reviewed-on: https://forge.frm2.tum.de/review/18617
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2018-09-26 08:52:57 +02:00
Enrico Faulhaber
7e54cd93b7 minor fixes 
Change-Id: I4be15d264e402be000811dffc1b28a2bc93ab297
Reviewed-on: https://forge.frm2.tum.de/review/18941
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-09-25 12:50:35 +02:00
Enrico Faulhaber
5f640ce299 [server.py] rename initialisation steps for better clarity 
initialisation occurs in this order:
 - object creeation (via __init__ which should consume the cfg values it knows about)
 - registering each object with the dispatcher
 - calling init_module() on each module (for connecting to other modules, checking hw, creating threads....)
 - calling start_module(cb) on each module. after the module finished startup it should call cb(self) once.
   This is the right place to do initialisation of hw which is not needed to read from the hw.
   (uploading curves, polling/re-setting all parameters, etc.)

Change-Id: Ieaf9df5876e764634836861241f58ab986027f44
Reviewed-on: https://forge.frm2.tum.de/review/18566
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-08-29 15:36:01 +02:00
Enrico Faulhaber
acb8e6d0a1 [MLZ:entangle] fix windowtimeout 
condition was not 100% right.

Change-Id: I189f0bb7f548d434dab9379727abd85ba0de58fa
Reviewed-on: https://forge.frm2.tum.de/review/18540
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-07-27 15:04:45 +02:00
JenkinsCodeReview
916b1ba85f [deb] Release v0.6.3 2018-07-27 09:32:00 +02:00
Enrico Faulhaber
b1f1653ebd fix several regressions from switching to accessibles 
also include some basic tests now

Change-Id: Ia07892c03f4d72f5da307a79a9827f926940881d
Reviewed-on: https://forge.frm2.tum.de/review/18539
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-07-27 09:22:40 +02:00
Enrico Faulhaber
5b273e36a7 MLZ: fix typo 
(OK instead of IDLE)

Change-Id: Ie063041828da1cf30ad434f197e06420e802a23f
Reviewed-on: https://forge.frm2.tum.de/review/18482
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>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
 2018-07-19 16:06:56 +02:00
Enrico Faulhaber
ba1a527cf4 pylintrc: increase allowed module length 
Change-Id: Ic542039e97d9024600950a47ea1ed1f8a1d0cae0
Reviewed-on: https://forge.frm2.tum.de/review/18483
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-07-19 15:42:22 +02:00
Enrico Faulhaber
29480bd496 improve debug output if polling loop crashes 
Change-Id: Ia5f6f02542720701f5e64574254252ac7d5e5482
Reviewed-on: https://forge.frm2.tum.de/review/18481
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-07-19 15:40:05 +02:00
Enrico Faulhaber
90af930b3d datatypes: fix converting command datatype 
Change-Id: I6f543a45fb58cbcb0c8e390c0485bd555979c1b3
Reviewed-on: https://forge.frm2.tum.de/review/18480
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-07-19 15:35:22 +02:00
Enrico Faulhaber
2c59df26ed Makefile: include targets for making pkg's 
Change-Id: I26709923220a6a79470ed62c01e48e7d3eee6a1c
Reviewed-on: https://forge.frm2.tum.de/review/18479
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-07-19 15:35:07 +02:00
JenkinsCodeReview
3d65be46c3 [deb] Release v0.6.2 2018-07-18 12:06:58 +02:00
Enrico Faulhaber
37f6d79769 interface/tcp: handle dead connection correctly 
Change-Id: Ida4d09dab54ee367508de1e883ecf252369ecc1d
Reviewed-on: https://forge.frm2.tum.de/review/18460
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-07-18 12:03:28 +02:00
Enrico Faulhaber
75e31714b8 secop/modules: make polling thread more robust 
Change-Id: I530088d56e31dc2d415cc1c79b1db9d446c0b391
Reviewed-on: https://forge.frm2.tum.de/review/18259
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
 2018-06-27 10:18:33 +02:00
Markus Zolliker
fb1939d5c8 merge 'parameters' and 'commands' to 'accessibles' 
- for now, the definition also accepts the old syntax
  (to be changed later)
- Commands have datatype CommandType
- do not need keyword for the decription parameter of Override
- issue a Warning when a Parameter is overwritten without Overrride
  (this should be turned into an error message)
-

Change-Id: Ib2c0f520abb5b4d7e6aed4d77a0d2b8bc470a85a
Reviewed-on: https://forge.frm2.tum.de/review/18251
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2018-06-25 17:26:01 +02:00
Enrico Faulhaber
807f821968 MLZ_ccr12: update config file 
Change-Id: If1419a20318dd14c56c10f221f73e97349fdfeeb
Reviewed-on: https://forge.frm2.tum.de/review/18260
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-25 15:36:49 +02:00
Enrico Faulhaber
ec131dc5c3 server: allow absolute pathnames for cfg files 
will be extensivly used by tests.

Change-Id: I250fe9b7c2fdcd489efcde28a6558629d90eb810
Reviewed-on: https://forge.frm2.tum.de/review/18253
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2018-06-25 15:21:32 +02:00
Markus Zolliker
df0b59d0ec read parameters from hardware before starting up server 
+ send cached values on activate instead of reading from hardware

Change-Id: Ied9b29969cef3584a788fcd51d5b31946b0a3f25
Reviewed-on: https://forge.frm2.tum.de/review/18234
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2018-06-22 13:34:38 +02:00
Enrico Faulhaber
48382852b8 add features 
+ split out metaclass and params

Change-Id: I4d9092827cd74da6757ef1f30d2460471e5e5ef3
Reviewed-on: https://forge.frm2.tum.de/review/18190
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-21 14:00:50 +02:00
Enrico Faulhaber
33e6ded5b8 accessibles: provide global counter 
Change-Id: I65f4c8a1c0944e29c51eea1d40cdbbdb91c2ad18
Reviewed-on: https://forge.frm2.tum.de/review/18211
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-19 14:30:52 +02:00
Enrico Faulhaber
22645b449b rename Param -> Parameter 
Change-Id: Idcbc440b76219282a888172890673a4d74935dfd
Reviewed-on: https://forge.frm2.tum.de/review/18210
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-19 14:25:13 +02:00
Enrico Faulhaber
82caa33a5e fix leftover status imports 
Change-Id: I8d26ff2082f7b407040d2eb2467ad8c32f325ba9
Reviewed-on: https://forge.frm2.tum.de/review/18212
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-19 14:00:19 +02:00
Markus Zolliker
81202a9998 rename as_dict methods to for_export 
Change-Id: Id86c8cce35d133afeef913c6f868770bc4dcfc3e
Reviewed-on: https://forge.frm2.tum.de/review/18209
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-19 13:55:18 +02:00
Markus Zolliker
5ffe953c5c commands must be specified explicitely 
no more automatic definition by just declaring do_<command>

Change-Id: Ided91b5ae6fe657a6134f1cc14cc6484570a3646
Reviewed-on: https://forge.frm2.tum.de/review/18206
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2018-06-19 13:48:11 +02:00
Markus Zolliker
fc948972cc - remove obsolete option static_only of Param.as_dict 
- remove obsolete import of format_time
- fix commit message

Change-Id: Ie3a03694c5a40a0f3b86b2902a435131fd75e051
Reviewed-on: https://forge.frm2.tum.de/review/18191
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2018-06-19 10:10:28 +02:00
Enrico Faulhaber
0f405272e5 Add new 'pseudo' datatypes to simplifiy coding 
for descriptive data the composition will be used.

Change-Id: If35f8176d489231e223e6d97425c1bcea58060ff
Reviewed-on: https://forge.frm2.tum.de/review/18189
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-18 18:09:22 +02:00
Enrico Faulhaber
154a735908 Allow units of parameters to reference the unit of the main value 
via using '$' as special char.

Change-Id: Idfbad84b76d2f5161cb6ecc21d63349f23cd47fa
Reviewed-on: https://forge.frm2.tum.de/review/18188
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-18 18:04:56 +02:00
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