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

52 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4e9f7e3eec update docs 
- to reflect last Meeting
- to work on json structure

Change-Id: I2ec0eb86958d75b30a8e5d034202136644b675d8
 2017-07-07 22:28:45 +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
780c6779f9 provide anchor point for test suite using pytest 
Change-Id: I22937e22d3f657f95c512393d5fc262bbf6e7eaa
 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
Enrico Faulhaber
d5e935788f Bug hunting and polishing 
Change-Id: I0f05730dd4e01e926ab0c4870c27ed5754f3ccfd
 2017-01-23 17:48:50 +01:00
Enrico Faulhaber
8e3d0da5dd Polishing 
- unify (encoded) Errormessages. They now always contain the offeding request.
- adopt keywords to current spec
- fixed formatting of timestamp in WriteReply
- minor bugfixing + polishing

Change-Id: I0ab8836756551399643bdce3d062eedd345509f1
 2017-01-20 10:51:19 +01:00
Alexander Lenz
d442da0789 Stub debug client gui. 
Change-Id: Ib422c66bc36245e1fc3c450765d7555da5c8dda0
 2017-01-19 10:04:16 +01:00
Enrico Faulhaber
68f73b5aa1 Fix some bugs. 
- Commandreplies format their timestamp like events

Change-Id: I388b9f26bb8b0234d9209b05732e98f9ce1d01c7
 2016-12-21 17:00:22 +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
0432f01e16 Update docu to reflect current implementation. 
Change-Id: Iccaa51114b09ad31814ad2590e106d8466692b3e
 2016-12-09 17:55:57 +01:00
Enrico Faulhaber
002c843d74 fix wrong replies for change and do 
now correctly reply with 'changed' and 'done'

Change-Id: Ic2b8e6d6d7d4c8301dc8b273115a10e1f8e40a2e
 2016-12-09 14:15:47 +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
dc2d0a10aa Fix dispatcher._setParamValue 
Change-Id: Ibe00b4df7807dfbf1cc7c5de32331befc163bfb7
 2016-08-31 11:49:35 +02:00
Enrico Faulhaber
4f42b32385 unsubscribe upon disconnect 
Change-Id: I45f53526b8f65741fede170a0420f0f4aabc00fb
 2016-08-31 11:49:25 +02:00
Enrico Faulhaber
9b93f7d5af provide a status2 parameter 
for testing.
I'd like to have human-readable string together with the status code.
Since converting status to a vector needs code-changes in all devices,
as a first step we implement a differently named parameter to play with
and to decide which we would like better.

Change-Id: Ib73b8e5bd817ffdee4d413cfd8dddf46ec5e863d
 2016-08-31 11:48:52 +02:00
Enrico Faulhaber
f2f39f1287 Unify error handling (a little more) 
Change-Id: I81184c64aa4d51d0838df62269eace9e44b511da
 2016-08-31 11:48:07 +02:00
Enrico Faulhaber
43d0e600ee provide class and baseclass parameters 
Change-Id: Id3830bce6985c9d47da8c23fd2ea9082565e99aa
 2016-08-31 11:47:51 +02:00
Enrico Faulhaber
5339f0c4fe coding style: adopt pep8 
Change-Id: Ic037f925271c970406284e52a00a6c56d048452e
 2016-08-31 11:47:31 +02:00
Enrico Faulhaber
0cf2633717 Remove Features 
should be re-implemented in a virtual per-connection device

Change-Id: Ic752cf75218ecf802318fa53ba5faf5a4f31d948
 2016-08-31 11:47:02 +02:00
Enrico Faulhaber
4b0388d21b use per instance copies of PARAMS 
allowing more than one device per class

Change-Id: I9deabd38c8ca221c4ac416a2dfcc9a5ad4b73148
 2016-08-31 11:45:56 +02:00
Enrico Faulhaber
c964a9a2ec apply validators to before calling write_func 
Change-Id: I98f9c1eff4d2e236738f759cdc4a431f98a38bed
 2016-08-31 11:02:08 +02: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
69b979cdd0 Merge "Implement a variant of the Demo protocol from Markus" 2016-08-31 08:34:06 +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
8ad9e9396c demo syntax from Markus Zolliker, initial commit + test file 
squashed together

Change-Id: I11b2f4ae99abe72c3edbc83f18826df48b2ecd02
 2016-08-26 14:21:32 +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
6a2fa8d6a0 Fix deprecated imports. 
Change-Id: I5b721e90632a0b3ec0dcb64ebaef9bc15bc171ce
 2016-08-12 16:16:21 +02:00
Alexander Lenz
2dae7649be Fix/Improve startup/init. 
Change-Id: Ia4b90c75a8cf89f4069bd8984a0e0c88f9ffa832
 2016-08-08 13:39:50 +02:00
Alexander Lenz
e0bf201b48 Improvements. 
Change-Id: I773b69e72b7167292dbe0ec751039f15e76523a5
 2016-08-04 15:42:00 +02:00
Enrico Faulhaber
cac08110c7 Merge "rework on transport (encoding/framing) and dispatcher" 2016-06-29 18:18:49 +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
623e7e43db Merge "Devices infrastructure and minimal server" 2016-06-22 18:09:29 +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
Erik Dahlbäck
87ad1987ea Revert "This is a test commit" 
This reverts commit 83a636cd277cb173fe3458b0c15b2c1d3a5304d1.
 2016-06-15 14:50:29 +02:00
Erik Dahlbäck
83a636cd27 This is a test commit 
Change-Id: I40638c7dae561ee98ff8f70c2d5abb5a1ff8892c
 2016-06-15 13:58:57 +02:00
Enrico Faulhaber
8a9d2da503 enhance docu a little 
Change-Id: I59e46c61098106651fa584026f6c7edf33ee5dd1
 2016-06-13 17:48:44 +02:00
Enrico Faulhaber
e914d12096 move handlers to messages 
Change-Id: I1dd49e4d273d9fc3503757fd902767a4b1c42990
 2016-06-13 17:26:10 +02:00