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

36 Commits

Author SHA1 Message Date
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
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
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
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
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
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
ab5beeeae6 wait for tango 
Change-Id: Ie316eb0fbd954c40ccef1dab0f60916a78340994
Reviewed-on: https://forge.frm2.tum.de/review/16327
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-22 17:34:28 +02:00
Enrico Faulhaber
c627caf0d1 fix init script 
Change-Id: I0bc2e95bf87eaba02b5d502719354e439042de1e
Reviewed-on: https://forge.frm2.tum.de/review/16323
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2017-09-22 13:29:00 +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
c5671dd26e implement Writable as specified. 
Change-Id: I8a1b192dcfba91ae1828a2b2e0e2e8bd24538c08
 2017-09-13 09:32:59 +02:00
Enrico Faulhaber
b9b2db1763 fixups 
Change-Id: Ibbae99d1c51edcbf251f43cd75f21e448825139c
 2017-09-12 18:25:06 +02:00
Enrico Faulhaber
2613c7daf1 update descriptions of provided configurations 
Change-Id: I6ab0049d62ee0442898c964f14c8fea5ac23fab5
 2017-09-12 16:19:15 +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
ba59448442 fixups 
Change-Id: If1377ef41f8d500ccab0e2a0979343b4c090c036
 2017-09-11 17:50:20 +02:00
Enrico Faulhaber
b26b64032e fixups 
Change-Id: Ib0c6fddd38f594d735feadce31e4809e7a4c5d44
 2017-09-11 11:27:52 +02:00
Alexander Lenz
54ca6e1f4e init script: add should start. 
Change-Id: I86bc1c410e8d4be7b9856939d8f84b29250041c2
 2017-08-01 12:27:03 +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
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
f984129986 GUI: show grouping of parameters 
still todo: grouping of modules

Change-Id: I67e8582004f16061dda96e455f424f5a12e6a163
 2017-05-24 17:15:22 +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
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
Enrico Faulhaber
d5e935788f Bug hunting and polishing 
Change-Id: I0f05730dd4e01e926ab0c4870c27ed5754f3ccfd
 2017-01-23 17:48:50 +01:00
Enrico Faulhaber
78bb3b5f96 Pep8 improvements + cleanup 
Change-Id: I9052e703b58e93b639c027521b47f693ae853f6e
 2016-12-16 14:21:42 +01:00
Enrico Faulhaber
7320ac1538 Provide basic client Object 
also improve the describing data and core params

Change-Id: I645444f2a618fdfd40a729e1007c58def24d5ffb
 2016-12-15 14:24:25 +01:00
Enrico Faulhaber
b6af55c358 reworking messages 
1) start 'bin/secop-server test'
2) connect to localhost port 10767
3) enter help<enter>
4) enjoy

Change-Id: I488d5f9cdca8c91c583691ab23f541a4a8759f4e
 2016-12-08 13:46:32 +01:00
Enrico Faulhaber
44537ad0d9 split epics related devices into epics.py 
also split the configfile:
test.cfg for normal playing around
epics.cfg for playing with epics

Change-Id: Id91042fbbdcb6972b1493419960667b39f56f17e
 2016-08-31 10:27:24 +02:00
Enrico Faulhaber
8c825a93ed Implement a variant of the Demo protocol from Markus 
include LOTs of bugfixes as well

todo: documentation!

Change-Id: I52252ade34966d24990afd9672f38049882c3199
 2016-08-31 08:28:51 +02:00
Enrico Faulhaber
92cf6f34a1 [Test] Erik is testing SECoP with PVEPICS module 
Change-Id: Ie6124a5ab8a48efe16ab2970f337363e8f44a14d
 2016-08-26 14:06:38 +02:00
Alexander Lenz
2dae7649be Fix/Improve startup/init. 
Change-Id: Ia4b90c75a8cf89f4069bd8984a0e0c88f9ffa832
 2016-08-08 13:39:50 +02:00
Enrico Faulhaber
c11bca3c37 rework on transport (encoding/framing) and dispatcher 
put encoders and framers into their own files.
also rework messages and dispatcher
make tcpserver functional

FIRST WORKING VERSION!
(no daemon mode yet, sorry)

start bin/server.py, connect a terminal to localhost:10767
and press enter....

note: not all requests are bug free yet, ListDevicesRequest() works

Change-Id: I46d6e469bca32fc53057d64ff48cce4f41ea12ea
 2016-06-29 18:14:55 +02:00
Enrico Faulhaber
d3c430e1b9 Devices infrastructure and minimal server 
starts and creates (server-side) devices
no daemonizing and servicing yet

hint: try starting:
$ bin/server.py -v start

Change-Id: I6ac7a78dfff309a459cc0338a8d0d319ee72ada5
 2016-06-22 17:21:18 +02:00
Enrico Faulhaber
b52c2d7a60 First checkin, base point for development 
+ docu-converter
+ some python source files
+ Makefile

Change-Id: I055522c2feff9b72fc4bc88d6663642c78693fe8
 2016-06-13 15:49:23 +02:00