886 Commits

Author SHA1 Message Date
Björn Pedersen
92e421a939 Adjust path for docs
Change-Id: Ib6ab3a9b0163fdaa00b935962ba84eea65504eb8
Reviewed-on: https://forge.frm2.tum.de/review/19620
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-12-14 13:44:54 +01:00
Björn Pedersen
17ae9a4be6 Correctly publish pylint results
Change-Id: Ica71417f8e13959eb46065f1fe664b362d701d8c
Reviewed-on: https://forge.frm2.tum.de/review/19619
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-12-14 13:33:48 +01:00
Björn Pedersen
c0f7034b30 Run publish outside of docker container
Change-Id: I0ac8ee583f305efc7e27155624cfb11e2df8085f
Reviewed-on: https://forge.frm2.tum.de/review/19616
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-12-14 13:32:24 +01:00
Björn Pedersen
335db5f7e1 Add stage around pylint run
Change-Id: I8e58ae867660f9fd32c05606058d2b710a70cc3a
Reviewed-on: https://forge.frm2.tum.de/review/19615
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-12-14 13:32:18 +01:00
Björn Pedersen
a8bc6606af Include pylint into Jenkinsfile
Change-Id: Ica10d5aeba78f1f605965d688f7f41287f0b1c46
Reviewed-on: https://forge.frm2.tum.de/review/19555
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-13 13:36:23 +01:00
Björn Pedersen
dec643f522 docker image: add mlz tools
this supplies pylint2gerrit

Change-Id: Iae695513e6dfddc54935c9cee8a9469950a5a605
Reviewed-on: https://forge.frm2.tum.de/review/19554
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-13 13:36:23 +01:00
0a71c97f69 allow Override also for Commands
modified cryo.py for using Override correctly, here the description of the stop command is overridden

Change-Id: I060a2802226239f3af3dc1e573b7148d863b938c
Reviewed-on: https://forge.frm2.tum.de/review/19607
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-13 13:35:30 +01:00
Enrico Faulhaber
8c85a775a1 fix simulation
got broken during change of signatures of modules

Change-Id: Id423ac52fb1523ef207b08758fb941f0507eeec5
Reviewed-on: https://forge.frm2.tum.de/review/19535
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-12-04 14:03:53 +01:00
Georg Brandl
381495fe38 datatypes: require min, max ordering for size limits
Change-Id: I165b7d932716082b4bb9996f58f742763398b454
Reviewed-on: https://forge.frm2.tum.de/review/19533
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 13:30:22 +01:00
Georg Brandl
da3187ff8f fix changed Jenkinsfile
Change-Id: I55a9f254f140eda5c0cce14f718ba847ab1a6e2f
Reviewed-on: https://forge.frm2.tum.de/review/19534
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Georg Brandl <g.brandl@fz-juelich.de>
2018-12-04 12:55:35 +01:00
Björn Pedersen
63ffb86248 Improve build process
ensure the code is correctly on the virtual env python path.

Change-Id: Ie7ff4954a109840159c0b7a7f0b872c99845b73f
Reviewed-on: https://forge.frm2.tum.de/review/19530
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 11:19:42 +01:00
Enrico Faulhaber
a29ed09e56 reorder PHONY in Makefile
Change-Id: I854c432c78e34a598b02a2cf430ae431232a02d2
Reviewed-on: https://forge.frm2.tum.de/review/19532
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 11:02:08 +01:00
Enrico Faulhaber
61db0fe126 fix Makefile
Change-Id: Iebbf6fc0c19b192d4d54e6d0f5a64d70173ea6e6
Reviewed-on: https://forge.frm2.tum.de/review/19531
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:55:50 +01:00
Georg Brandl
0deb462c6a move path manipulation into single module
Change-Id: If88aafd03b757715b82cd733b3155e656c252b06
Reviewed-on: https://forge.frm2.tum.de/review/19529
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:54:59 +01:00
Enrico Faulhaber
50c3e5e47a fix tests
after isort change

Change-Id: I15975e4a665342139f88060e2db95ee2984d8dfe
Reviewed-on: https://forge.frm2.tum.de/review/19528
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:40:53 +01:00
Enrico Faulhaber
8efd1df92c fix isort
Change-Id: I5486e1f9b3143c6bb0804c49c7ca21adb9b84de1
Reviewed-on: https://forge.frm2.tum.de/review/19524
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:18:55 +01:00
Enrico Faulhaber
29a5b5c49e big rework to comply to current spec
- adapt to release(v2018-11-07)
- remove duplicate errors.py
- adapt tests

Change-Id: I383bb571f9808c72b37c12fbe55042011c4c0084
Reviewed-on: https://forge.frm2.tum.de/review/19397
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-12-04 10:18:40 +01:00
Enrico Faulhaber
87261382cf remove Message objects + rewrite server startup
Change-Id: Ide72fb915c3ca93c74edadd8952853508e677de7
Reviewed-on: https://forge.frm2.tum.de/review/19199
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-16 08:33:07 +02:00
Enrico Faulhaber
9824b9216d various unicode fixes
Change-Id: Ia3a83b678a5084fd1d43b8cf513b296fdbde3d91
Reviewed-on: https://forge.frm2.tum.de/review/19198
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-15 14:42:21 +02:00
Enrico Faulhaber
10f08f6dca fix sequencing in secop_demo.modules.MagnetiField
Change-Id: Idfd8746782b2bba61bfb30cba1010000f41aed75
Reviewed-on: https://forge.frm2.tum.de/review/19201
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-15 14:40:10 +02:00
Enrico Faulhaber
19854ecea1 by default export all modules
Change-Id: Ie4a1695c98d53072e52bf6948ab28ecf7f7aa9e1
Reviewed-on: https://forge.frm2.tum.de/review/19200
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2018-10-15 14:39:10 +02:00
Björn Pedersen
21fa01ff03 Use correct locale
Change-Id: Ic35065a2bbbbb2fdb3036a7e2a4da97e9b4fed07
Reviewed-on: https://forge.frm2.tum.de/review/18946
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 09:52:10 +02:00
Björn Pedersen
faabd1b930 CI: Add pytango dependency
Should later go to a requirements.txt on an appropriate level.

Change-Id: I3f58f18b3354110263edb67231947b89e5eb6a0e
Reviewed-on: https://forge.frm2.tum.de/review/18944
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 09:18:12 +02:00
Björn Pedersen
c57d92eb20 Fix git reference for docker env
Change-Id: Iaae09aef0838470753d4c80d43ba5812f23d11b6
Reviewed-on: https://forge.frm2.tum.de/review/18945
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Tested-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
2018-09-26 09:15:26 +02:00
Björn Pedersen
7e55d6625c Remove jenkins bootstrapping code
Change-Id: I227abd2b6ad1dfee550c05fda32a97785cc957fe
Reviewed-on: https://forge.frm2.tum.de/review/18669
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:12 +02:00
Björn Pedersen
bfe6aa364f Add docs test/build
Integrate the doc build in the new secop job

TODO: Check the publishing part

Change-Id: I361ec085aad04b5155bb3f972b329dd2a7445aaa
Reviewed-on: https://forge.frm2.tum.de/review/18661
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:09 +02:00
Björn Pedersen
f1fef1e50f Add venv initialisation
Install current (merged to master) requirements on container
creation.

Change-Id: I32595ac0a141e1477e9e5c1a99ea76729fe5b1b9
Reviewed-on: https://forge.frm2.tum.de/review/18620
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:05 +02:00
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
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
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