58 Commits

Author SHA1 Message Date
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
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
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
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
Enrico Faulhaber
16e69e7778 fix entangle integration
StringIO::multicommunicate can now only handle up to 100 messages.
Should be sufficient.

Change-Id: Id3ccdf03143b80a37aa0ef0b87c47090ef802a42
Reviewed-on: https://forge.frm2.tum.de/review/16288
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2017-09-19 18:30:21 +02:00
Enrico Faulhaber
eeac276601 Remove obsolete protocol implementations
Change-Id: I9342ff3d00666238b6412b41a3785dadd96a7778
Reviewed-on: https://forge.frm2.tum.de/review/16273
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2017-09-18 15:14:04 +02:00
Enrico Faulhaber
3d3558ccd8 make StringType default maximum size = 255 Bytes
Change-Id: I0c26fc24ad99ff4185ff5a0b9b8ada9a10817b8b
Reviewed-on: https://forge.frm2.tum.de/review/16269
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2017-09-18 14:15:25 +02:00
Enrico Faulhaber
0c63522eab fix tests
Change-Id: I53e9143121a6d01dbd1733f6fcd71fe1a9a9e3e3
Reviewed-on: https://forge.frm2.tum.de/review/16260
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2017-09-18 13:58:08 +02:00
Enrico Faulhaber
3c3eaa166b provide an mean to use commands in the gui
Change-Id: Ia6a3fa03b50496abcab47026637a8f292c761d0c
2017-09-13 17:09:41 +02:00
Enrico Faulhaber
f2006607b2 make sip optional
Change-Id: I8afe4d37d1ad918ed94b3606dbe1b703a769b5b3
2017-09-13 13:49:31 +02:00
Enrico Faulhaber
c5671dd26e implement Writable as specified.
Change-Id: I8a1b192dcfba91ae1828a2b2e0e2e8bd24538c08
2017-09-13 09:32:59 +02:00
Enrico Faulhaber
54379a586a remove unneeded commands
Change-Id: I2b3a343a117fced0195f23c3051902c1387e6bcc
2017-09-12 18:32:53 +02:00
Enrico Faulhaber
b9b2db1763 fixups
Change-Id: Ibbae99d1c51edcbf251f43cd75f21e448825139c
2017-09-12 18:25:06 +02:00
Enrico Faulhaber
96ac437fd3 fix transport and display of node-properties
Change-Id: I35a3021768e386a5ce922c8e24128d0bc3a039be
2017-09-12 16:10:22 +02:00
Enrico Faulhaber
7a50ff2603 adopt to new jsonify of string/blob/arrayof datatyes
+ further fixes

Change-Id: I6411a689436ba246bcf572b420ca2a0385b033a2
2017-09-12 11:08:09 +02:00
Enrico Faulhaber
ba59448442 fixups
Change-Id: If1377ef41f8d500ccab0e2a0979343b4c090c036
2017-09-11 17:50:20 +02:00
Enrico Faulhaber
5992ba3c35 fixups
Change-Id: I120865555596b2671c6e8aa65841f3ea984c7e03
2017-09-11 15:39:26 +02:00
Enrico Faulhaber
357056d478 fixups
Change-Id: I72abe9b4c2deb08e58ce69786f853ccc4b385a5d
2017-09-11 15:22:33 +02:00
Enrico Faulhaber
9a402857f3 Only send async updates for exported params
Change-Id: I466d99bf0234529ed58fa8045af83a0da44f96f7
2017-09-11 15:22:13 +02:00
Enrico Faulhaber
b26b64032e fixups
Change-Id: Ib0c6fddd38f594d735feadce31e4809e7a4c5d44
2017-09-11 11:27:52 +02:00
Enrico Faulhaber
dc891466cb fix formatting of timestamps
Change-Id: I92e714833f333b13257e8e54561aa18716d89ecb
2017-09-07 16:37:48 +02:00
Enrico Faulhaber
123d0fb504 [GUI]: create buttons for commands
very basic!

Change-Id: Iee528a307be41e2da1f6f54d8442b7d24634bebe
2017-09-07 15:03:36 +02:00
Alexander Lenz
a0a75af601 Fix wrong paths.
Change-Id: I7321f887a9c2a472c27cca72157368805fc5fcb8
2017-09-07 11:20:24 +02:00
Alexander Lenz
449bdcd48b Fix path detection.
Change-Id: If76969e6c753596fff885fdb021ba53b1537c945
2017-09-07 11:08:10 +02:00
Alexander Lenz
5b20cec19f secop-server: import compability for daemon pkgs.
Change-Id: I3884cbe4285fae5faa47633b89e92e64ae83ba16
2017-08-01 13:51:49 +02:00
Enrico Faulhaber
2e492269b8 fix typo
Change-Id: Ic7125870f209dd9b12e597e43a4874c30da3ca05
2017-07-27 11:38:04 +02:00
Enrico Faulhaber
2bb96bea70 provide setup for MLZ_Amagnet to be used @PSI soon
Also implement lots of fixes and improvements.

fixes: #3381

Change-Id: Ibe6664da00756ae5813b90f190295045808b2ff0
2017-07-27 11:21:05 +02:00
Enrico Faulhaber
63418fce04 Add lib/sequence support
Change-Id: If9bde0062185a5f13d17d9d2cea091bde7c98db9
2017-07-20 16:11:24 +02:00
Enrico Faulhaber
2e2af35817 [deb] Add control files.
Change-Id: I081d0dbb35a96810617c58b2ca99c02161122918
2017-07-19 11:09:23 +02:00
Enrico Faulhaber
29ee07c5b3 several improvements and bugfixes
+ rework GUI
  - include a combobox for selection of visibility
  - include a checkbox wether validation should be done in the client
  - remove unused lineEdit
+ improve datatypes
+ improve tests for new descriptive data
+ metaclasse: fix overlooked read_* or write_* func's
+ improve polling
+ Introduce new ErrorClasses
+ dispatcher: use new features of datatypes + PARAMS
+ improve lib
+ autopep8
+ first working version of MLZ_entangle integration
+ split specific stuff into it's own package (MLZ,demo,ess)

Change-Id: I8ac3ce871b28f44afecbba6332ca741095426712
2017-07-19 11:03:29 +02:00
Enrico Faulhaber
8a63a6c63f Switch descriptive data to new format
Change-Id: Ic8afe976564824d14394ed6a1b4b36df226648df
2017-07-10 18:11:14 +02:00
Enrico Faulhaber
2d27c6dd93 fix logging
Change-Id: If35a4a2fc49d26f262a925670079b2c1db80afac
2017-07-10 17:06:05 +02:00
Enrico Faulhaber
50fc67c818 datatypes: fix serialisation for unlimited types
Change-Id: If2d972a35a6da872be8571e27ad4c1156b0a98f4
2017-07-10 17:04:48 +02:00
Enrico Faulhaber
7e03fd2d9d (over-)improve error loging during startup
Change-Id: I62a9f46dd427d514a2ea1401b92e5f69d197151d
2017-07-10 12:34:15 +02:00
Enrico Faulhaber
67fb9ee24b remove obsolete file
Change-Id: I8a98625b268c2157d922bd2fa858cbecbfdf75fe
2017-07-09 22:23:36 +02:00
Enrico Faulhaber
bc3253a01a replace validators with datatypes
Change-Id: I446c4e14e24afa3f65e79c8b6e07eec3271532b0
2017-07-03 18:13:09 +02:00
Enrico Faulhaber
a87e568b55 implement datatypes
+tests

as agreed in last meeting

Change-Id: Ibc382f808927797e7e7ea268b97a5632713bfb56
2017-06-21 17:32:04 +02:00
Enrico Faulhaber
f984129986 GUI: show grouping of parameters
still todo: grouping of modules

Change-Id: I67e8582004f16061dda96e455f424f5a12e6a163
2017-05-24 17:15:22 +02:00
Enrico Faulhaber
462b6a0a7e autopep8
Change-Id: I4e40e0ef8e80999832846eac3a415fdd767c6d98
2017-05-24 17:15:20 +02:00
Erik Dahlbäck
241af728d6 fix whitespace issues
Change-Id: I2045828bb0a46a9840731f61cbeec41402fecb2b
2017-05-24 17:09:42 +02:00
Erik Dahlbäck
502d0f152a rework Epics support/testing with LS336
second approach, better fitting what was agreed upon so far.
- pv_names are local to SEC-node, so not exporting via json and marking
  them 'private'
- 2 devices for 2 temperature control loops, not one 'monster' device
  which handles everything.
- read_status implemented
- write_target also updates the status (may be sensible to go to the core?)
- provide working stubs in case epics is not installed (-> testing possible)
- tested with the stubs.
- tests with real epics.

found problems:
in EpicsTempCtrl(EpicsDriveable) the read/write_<paramname> methods from
EpicsDriveable needed to be reimplemented. This should not be needed!

Change-Id: I9e4eeaff83114131d117c8f04fba758dfe22237b
2017-05-24 12:29:10 +02:00
Enrico Faulhaber
c0fd2e9907 Use mlzlog for better logging
Change-Id: Ic82ca0d7b43a906cb9c7d3f1350287e7082afc45
2017-05-16 18:17:43 +02:00
Enrico Faulhaber
8123d21897 implement configurable module-properties
+ make parameter-properties configurable
+ better derivation of automatic properties
+ implement 'group' properties (how to display in gui???
+ clean up descriptive data by omitting unset and live properties

Change-Id: Icd2b6e91e09037e9d4a8d6ad88483f8509a2cf5f
2017-01-26 17:05:25 +01:00
Enrico Faulhaber
6ec30e38e8 polishing for a demo
+ adopting additional requests

Change-Id: If5ca29b5d247f1bc429ca101b0081b1d14f6e6f1
2017-01-26 10:13:12 +01:00