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

21 Commits

Author SHA1 Message Date
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
Enrico Faulhaber
c0fd2e9907 Use mlzlog for better logging 
Change-Id: Ic82ca0d7b43a906cb9c7d3f1350287e7082afc45
 2017-05-16 18:17:43 +02:00
Enrico Faulhaber
d5e935788f Bug hunting and polishing 
Change-Id: I0f05730dd4e01e926ab0c4870c27ed5754f3ccfd
 2017-01-23 17:48:50 +01:00
Alexander Lenz
d442da0789 Stub debug client gui. 
Change-Id: Ib422c66bc36245e1fc3c450765d7555da5c8dda0
 2017-01-19 10:04:16 +01:00
Enrico Faulhaber
78bb3b5f96 Pep8 improvements + cleanup 
Change-Id: I9052e703b58e93b639c027521b47f693ae853f6e
 2016-12-16 14:21:42 +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
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
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
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