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

61 Commits

Author SHA1 Message Date
Markus Zolliker
04f7f6ece5 bin/frappy-cli: fix hosts variable 2025-06-05 10:16:42 +02:00
Markus Zolliker
c0f6569f1b frappy-cli: connect to servers on localhost by default 
--scan option: specify where to scan if not on localhost

Change-Id: I51a694eb3cb045e7d18c19a332db8e6ba063009b
 2025-06-02 15:24:04 +02:00
Markus Zolliker
7a59cf4956 frappy-play: fix import order 2025-04-14 17:20:12 +02:00
Markus Zolliker
343ce90321 peus-plot: optionally give x-range as 2nd argument 
Change-Id: I445ef00487fc34343f5a0333643f61753a1c4948
 2025-04-02 14:56:47 +02:00
Ultrasound PC
8c548da2e0 bin/us-plot: fix usage message 2025-03-26 17:02:35 +01:00
Ultrasound PC
f8e3bd9ad2 improve ultrasound plot clients 
- make plot window not to raise to the front on replot
- chmod +x
 2025-03-26 16:18:54 +01:00
Markus Zolliker
6f547f0781 ultrasound: reworked after tests 
- new classes in frappy_psi/ultrasound.py and frappy_psi/adq.mr.py
- add signal plottter
- move clients to bin/ directory

Change-Id: I8db8e5ebc082c346278f09e0e54504e070655f14
 2025-03-26 15:31:46 +01:00
Markus Zolliker
bf9c946b1d frappy-scan: resolve ip numbers to names 
Change-Id: I07bf7c274aeb52f2aaa58e8aa2f3bcb2788556ee
 2025-03-17 09:36:50 +01:00
l_samenv
265dbb1a57 gui: add org- and app-name to QtApplication 
for a better path name of stored configuration
 2025-03-06 16:57:55 +01:00
Markus Zolliker
142add9109 add sim-server again based on socketserver 
- fix ls370test config file
+ fix issues with frappy_psi.ls370res
+ add frappy_psi.ls370sim

Change-Id: Ie61e3ea01c4b9c7c1286426504e50acf9413a8ba
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34957
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-11-19 14:03:28 +01:00
Alexander Zaft
35dd166fee fix frappy-server cfgfiles command 
frappy-server <name> errors after 34893

Change-Id: Ifba758fbabc3aef32e20b683f1c1edbfea711a75
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34913
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2024-11-15 10:39:47 +01:00
Georg Brandl
aee99df2d0 server: better handling of cfgfile argument 
No reason to keep stringly-typed data on that level

Change-Id: Iba8d88301bf36ef6051031d1916d1bac84ede546
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34893
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-11-15 10:39:47 +01:00
Alexander Zaft
eac58982d9 server: service discovery over UDP. 
implement RFC-005
- server broadcasts once on startup and answers to broadcasts
- small tool for listening on the port and sending broadcasts

Change-Id: I02d1184d6be62bef6f964eb9d238220aef062e94
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34851
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2024-11-15 10:39:47 +01:00
Alexander Zaft
e333763105 generalconfig: streamlined config discovery 
determine generalconfig file location in order:
  - command line argument
  - environment variable
  - git location (../cfg)
  - local location (cwd)
  - global location (/etc/frappy)

Change-Id: Ie34bcbd5188837075ee7bb7d5029d676ae72378e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34839
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-11-15 10:39:47 +01:00
Markus Zolliker
0204bdfe2f fix playground 
- fix initialization
- add description

Change-Id: Ic210c26edfec709bafa902e32eae04350d571acd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34874
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-11-15 10:39:47 +01:00
Georg Brandl
56c7bbc831 gui: do not add a console logger when there is no sys.stdout 
Change-Id: Icfd39bd508b5d482c902e6e781cbc557085b0c2e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34829
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2024-10-23 09:25:39 +02:00
Alexander Zaft
fe0aa3d7d5 all: start using pathlib 
Change-Id: I2b0d6ff8f534382913414fa9b35150d6f697acb4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34463
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-10-17 08:07:11 +02:00
Alexander Zaft
c92d6471eb bin: remove make_doc 
relic from markdown documentation

Change-Id: I8cb1913e6b6d1b8efe77d4d7f982f95e75166707
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34465
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-09-13 09:02:04 +02:00
Georg Brandl
c272a8d619 GUI: allow starting in detailed view by cmdline flag 
Change-Id: I4248bfee47d807833e02a35ce8dd85fa6b297e77
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34296
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-09-13 09:02:04 +02:00
Jens Krüger
318b3ad412 Update copyright year 
Change-Id: I7fe65e46639c2d8948fa93303ee9b14393e8bfca
 2024-09-13 08:59:40 +02:00
Markus Zolliker
15fc9ca16c add sim for ls372 
+ fix bin/sim-server

Change-Id: I6cad963d9e37faea172ca51a327474406ecafa4a
 2024-06-19 17:19:19 +02:00
Alexander Zaft
15d38d7cc1 all: remove coding cookies 
Change-Id: I53a4d79c3ebc50b8aed43a5ef1fa6538f8059a47
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32251
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 14:06:06 +01:00
Markus Zolliker
db9ce02028 Revert "revert commits done before MZ holidays" 
This reverts commit d2885bdd72.
 2023-08-18 16:32:16 +02:00
Markus Zolliker
d2885bdd72 revert commits done before MZ holidays 
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
 2023-07-06 08:03:15 +02:00
Markus Zolliker
975593dd6b update to gerrit version 
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
 2023-07-05 17:33:05 +02:00
Markus Zolliker
9a6421a54f up to date with develop/mlz 
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
 2023-05-31 14:27:36 +02:00
Markus Zolliker
df4a37085a frappy-cli: fix init(*...) 
Change-Id: Iba8106a779ac399e6d72d247ea93e6c1e8cdbf94
 2023-05-15 11:12:31 +02:00
l_samenv
087036922a move more code from bin/frappy-cli to frappy/client/interactive.py 2023-05-11 10:42:10 +02:00
Markus Zolliker
3fcd72b189 merge manually with mlz repo 
as of 2023-05-04

Change-Id: I5926617c454844927799e20a489db20d538db100
 2023-05-04 16:34:09 +02:00
Markus Zolliker
748ea1400a improve interactive client 
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace

Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:54:32 +02:00
Markus Zolliker
da15df076a fetched mlz version 
- before some chamges in the gerrit pipline

Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
 2023-05-02 15:25:11 +02:00
Markus Zolliker
b19a8c2e5c converter for creating python config files 
+ testmode in server returns errors
+ fix in (old) statemachine

Change-Id: Icdfd6c3d8f70e717fecd61e8a54adad326be6000
 2023-01-23 18:00:56 +01:00
Markus Zolliker
526a182ed7 init generalConfig.defaults only in secop-server 
generalConfig.defaults must not be set on import, as this
depends on import order

Change-Id: I00395b40b4281ddc044c196713f6512068011380
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27985
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-04-08 15:36:23 +02:00
Markus Zolliker
34b93adef0 more merges from gerrit 
Change-Id: I13441cd8889dd39f74a2dd1a85e75a1b76bb93c8
 2022-03-08 10:52:14 +01:00
Markus Zolliker
acb3bdad6a varios fixes at psi repo, as of 2022-02-01 
Change-Id: I8cdc849126d52ef0f2f27a0faf661830aac6f874
 2022-02-02 09:57:30 +01:00
Markus Zolliker
fbccd0f9b7 remove obsolete code 
- basic_validators is not needed any more since the implementation
  of datatypes.Stub
- client/baseclient.y is replaced by client/__init__.py both for
  the gui client and NICOS SECoP client
- lib/parsing.py used by baseclient only

Change-Id: I15b6ac880017000e155b8f6b7e2456e1bbf56dab
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25058
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2021-02-26 17:27:13 +01:00
Markus Zolliker
4411707f6a change arguments of stringio-server 
+ add verbosity flag

Change-Id: I0425efb11f03f8a59d3d81e8f2eeb95aca22e138
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23032
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>
 2020-05-04 16:30:36 +02:00
Markus Zolliker
bd56481276 support for multiple secop servers 
- server port can be given as cmd line argument
- multiple cfg files may be merged on one server

needed for the way how frappy is planned to be used at PSI

+ add --test option in bin/secop-server

Change-Id: I1e77f65891b15a70b191cbac8168e69715ace3dc
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22947
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-04-23 09:48:08 +02:00
Markus Zolliker
89c98fa716 move argument handling from mainwindow.py to bin/secop-gui 
allows calling the GUI client independently from command line arguments

Change-Id: If51b899c456ad610cf8a64f9b0f7c8a218cf5c5b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22503
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-02-24 08:09:02 +01:00
Markus Zolliker
9825b9c135 new generic secop client 
new client intended as base class for all clients

- based on Ennos secop client in nicos ([WIP] provide secop client)
- self healing connection singletons
- extension for other than TCP is foreseen (by extending new uri schemes)
- extensible name mangling
- seperate rx and tx threads supporting events
- internal cache
- extensible error handling
- callback for unhandled messages
- callback for descriptive data change
- callback for node stat change (connected, disconnected)
- a short close down and reconnect without change in descriptive data
  does not disturb the client side

works with secop-gui (change follows), planned to be used for Frappy
internal secop proxy and as a replacement for secop.client.baseclient.Client
in the nicos secop device.

-> secop/client/baseclient.py to be removed after planned changes

moved secop/client/__init__.py to secop/client/console.py because secop.client
would be the natural place to put the new base class.

Change-Id: I1a7b1f1ded2221a8f9fcdd52f9cc7414e8fbe035
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22218
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-01-30 08:51:47 +01:00
Markus Zolliker
cb4874331b driver for Lakeshore Model 370 resistivity measurement 
- this does not (yet) include temperatures and control loop
- including stringio-server for test purposes

Change-Id: I414ae2e6663bb0773fe60db1798401dfc9dde018
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22005
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2019-12-13 17:13:05 +01:00
Enrico Faulhaber
8e619a67d4 fix debian files 
to work again (hopefully).

Also:
 - few minor tweaks for py3
 - added psi facility
 - split secop-gui into separate package, so secop-core doesn't need QT

Change-Id: I457d3c9c60c78feb40e15c2fb153ce0d3491d1e8
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21327
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-09-26 16:24:58 +02:00
Markus Zolliker
c1164568ae further fixes of py3 issues 
complaints by pylint are mainly related to
- remove object from base list in class definitions
- unnecessary else/elif after return/raise

Change-Id: I13d15449149cc8bba0562338d0c9c42e97163bdf
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21325
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2019-09-26 14:15:48 +02:00
Enrico Faulhaber
70a9c42a7a Remove py2 support 
Change-Id: Ieeaeb3b8efcae004e94aea6c1d2703c9782a8650
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21320
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-09-26 10:32:01 +02:00
Seger Sandra
e1f017d678 add cfg-editor 
Change-Id: I68b8ba9311ec0487d7a2676095a7170a2447b3d0
Reviewed-on: https://forge.frm2.tum.de/review/20206
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-07-23 14:23:26 +02: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
e830666315 Support PyQt5 (fallback to PyQt4) 
Change-Id: I7fa1add00d677e626fee5cd1071dee54d0bf8565
Reviewed-on: https://forge.frm2.tum.de/review/17666
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-11 12:43:04 +02:00
Alexander Lenz
449bdcd48b Fix path detection. 
Change-Id: If76969e6c753596fff885fdb021ba53b1537c945
 2017-09-07 11:08:10 +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