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

1247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zebra
18ded2159c changed mf from Readable to Drivable 2022-06-28 08:09:00 +02:00
zebra
760fc9eb40 added jtccr sea cfg 2022-06-27 11:06:45 +02:00
zebra
5d348eb7b1 fix ma6 stick motor port 2022-06-27 11:06:00 +02:00
camea
86767e2fa1 add still and sorb heaters to dil5 2022-06-21 15:32:15 +02:00
camea
8a995aafed fix issue with non matching persistent field 2022-06-21 15:31:44 +02:00
camea
7379ea91e5 fix issue sending numbers in exp. format 
numbers must be fixed point, with maximum 8 digits
 2022-06-21 15:30:20 +02:00
Markus Zolliker
cf42119f85 fix handling of persistent_field parameter 
'persistent_field' parameter should be updated as long as the
switch is turning off

Change-Id: I76b592077ceb0a2a20beb8e6390487c620764650
 2022-06-17 08:24:38 +02:00
zebra
80d9a790ec fixed proper parameter inheritance 2022-06-15 16:02:38 +02:00
Markus Zolliker
5951312d40 fixes to make pylint happy 
Change-Id: I95baf4e585603a640d4ec71076a4d509082775ed
 2022-06-14 15:24:42 +02:00
camea
778ac17172 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-06-14 15:08:35 +02:00
camea
dfbc1c757a fixes in mercury an triton 
- Valve is now a drivable, as it will check success, and retry,
  which might take around 1 second
+ some more
 2022-06-14 15:07:17 +02:00
camea
54b58f2188 step_size instead of speed_factor 
no longer need to pre configure a speed_factor,
the proper units of speed and accel are taken from
the hardware
 2022-06-14 15:03:53 +02:00
camea
f855b9db40 fixes in convergence and statemachine 
- set spent_inside to 0 on set_target
- additional debug log messages in statemachine
 2022-06-14 14:07:24 +02:00
Markus Zolliker
6fd365197a sea driver: no events for unexported params 
Change-Id: Ia4b5f5f742d0240010218ee24dc147bb535c7c64
 2022-06-13 14:09:13 +02:00
focus
8b2abf7044 fix iodev to io in ill4stick.cfg 2022-06-10 14:31:44 +02:00
zebra
182a8c7e49 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-06-10 13:22:04 +02:00
zebra
6da1a89459 add dil4/variox, fix ma10 in cfg 2022-06-10 13:21:20 +02:00
zebra
f1d5e82bb4 remove unneccessary fiels in cfg/sea 2022-06-10 13:20:12 +02:00
Markus Zolliker
e6fdd79df4 start SEA server if not running 
before connecting to SEA

Change-Id: I75c02f25e023e0e1769810a180430efd48b9c550
 2022-06-08 16:28:39 +02:00
Markus Zolliker
a35231f5bd fixes in mb11/dil5 
- no need fro second slot in TemperatureLoop, PressureLoop
- only ValvePos needs two slots
- added testwise heater to mix chamber

Change-Id: Iac4592d037a5e6a4f586041762992d75cc77e3de
 2022-06-07 14:26:30 +02:00
zebra
9c7b6aeb94 various fixes on mb11/dil5 2022-06-07 11:45:25 +02:00
zebra
68e2e06905 fixes in convergence, mercury, phytron, triton 2022-06-01 09:21:47 +02:00
l_samenv
3563a0db16 fix ill4 2022-05-31 16:44:53 +02:00
zebra
4cb0031302 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-05-30 12:10:51 +02:00
zebra
4bfb76ca82 IPS mercury 
+ mb11, dil5, dil2, variox configs
 2022-05-30 12:09:57 +02:00
zebra
3e6f1bebf7 added features 2022-05-30 12:07:33 +02:00
Markus Zolliker
1357ead435 remove IOHandler stuff 
as all code using IO handlers has been changed to use
secop.rwhandler, IO handlers can be removed

Change-Id: Id57fbc4ce2744dbe73bb8792fd45449373f76bb5
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28526
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-05-30 09:58:00 +02:00
Markus Zolliker
6a0261c728 allow to convert numpy arrays to ArrayOf 
accept all sequences instead of just tuple / list
+ change Module.announceUpdate to convert value before
  comparing with previous one (comparing will not work with numpy arrays)

Change-Id: I5eceef4297607107e2dde688af2833d3651a8775
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28525
Tested-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-05-25 14:22:30 +02:00
Markus Zolliker
d717a481d7 feature implementation 
implement features including two proposed features
HasOffset and HasLimits

Change-Id: I7949f12dc8abe28fb2ee040e64e7db19d1b23b9a
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28485
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-05-25 14:21:21 +02:00
Markus Zolliker
4c94580cb9 channel switcher for Lakeshore 370 with scanner 
- add a general channel switcher module
- change ls370res code from IOHandler to rwhandlers
+ fix an issue with the poller when io module is placed below
  using modules in cfg file

after this, IOHandler stuff may be removed from Frappy

Change-Id: I787101fc1e365ae3e0453bfe59291e2011a1fe53
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28512
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-05-25 07:47:32 +02:00
Ultrasound PC
efca358c72 add adq_mr and iqplot 2022-05-23 15:30:23 -04:00
Ultrasound PC
319f3b4649 upgrade upltrasound to newer version of frappy 2022-05-23 15:25:41 -04:00
l_samenv
7fc030191d Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-05-19 18:10:14 +02:00
l_samenv
3959da6847 stick rotatation is either om or stickrot 2022-05-19 18:10:02 +02:00
Markus Zolliker
39171fe06e add limits to phytron 
Change-Id: I431374efab7a858db6a652f78533b13b12ba6d57
 2022-05-19 18:05:52 +02:00
zebra
0972e8c7e8 add sign to phytron motor 
+ fixes in ma10 config
 2022-05-19 17:58:54 +02:00
Markus Zolliker
7b9d2d1701 allow quiet SEA requests 
SECoP read -> SEA hval should be quiet on the log file

Change-Id: Ie020b02ef62e5792ca60e08fe72b420a6377efee
 2022-05-16 17:04:47 +02:00
l_samenv
f276b973f5 add variox 2022-05-16 15:28:30 +02:00
l_samenv
8739ef04d7 add ori3 2022-05-12 16:39:28 +02:00
eiger
aea73d976c add ori6 2022-05-12 16:23:58 +02:00
l_samenv
4c98a4c706 add sticks and cfg 
ma02, ma10, ma11, mbe
 2022-05-12 16:16:26 +02:00
l_samenv
62146aa477 add heliox stick 2022-05-05 10:31:50 +02:00
Markus Zolliker
2bdfcf10a3 fix triton 
tested at warm kelvinox triton system

Change-Id: I1c8064c78846db5b077363be3a8ecff5e2766ddb
 2022-05-03 16:49:27 +02:00
tasp
f9db90d89b update secop_psi/sea.py 
fixes after serveral changes in frappy
 2022-04-29 16:30:19 +02:00
Markus Zolliker
1ded96abba fix keithley 2601b after tests 
- add missing super call in initModule
- change mode before writing levels
- fix MEASURE_DCVOLTS instead of MEASURE_VOLTS

Change-Id: Id93187e082db9868f443d4ef8cbdc85acd11be2b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28256
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-29 14:03:04 +02:00
Markus Zolliker
cb170bd73b allow a configfile path as single argument to secop-server 
when a full path is given as single argument to secop-server,
the server name has to be sanitized

Change-Id: I1d11f076157548e90877f380f0cab3a6a3f96784
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28232
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-04-29 14:03:04 +02:00
Markus Zolliker
a379805e43 add 'ts' to the ppms simulation 
+ convert from CRLF to LF

Change-Id: I46fab0c970ccc5e7e704a5dc0ab2cfd51213cd31
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28233
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2022-04-29 14:03:04 +02:00
l_samenv
9ff8c3ba54 add ma10, add stick motors 2022-04-29 11:08:04 +02:00
l_samenv
1d7351ba4f Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-04-29 08:47:39 +02:00
l_samenv
3ac8876b37 cti5, cti7, ma10 
+ fix .gitignore
 2022-04-29 08:47:11 +02:00