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

260 Commits

Author SHA1 Message Date
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
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
l_samenv
9ff8c3ba54 add ma10, add stick motors 2022-04-29 11:08:04 +02:00
Markus Zolliker
9fa5aba052 add dom motor to MA7 
Change-Id: I32b9ec469e030da90519b0a9e3d38b881e94d59f
 2022-04-28 17:21:46 +02:00
zebra
bc13a912b4 change descr of ccr3 (ZEBRA) 2022-04-28 16:32:38 +02:00
l_samenv
33ba9ca946 add ccr3 
+ add missing ma6.config.json
 2022-04-28 16:31:20 +02:00
tasp
7d43f1cd58 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-04-28 13:43:46 +02:00
tasp
21a3865c5d general ini files for main, stick and addons 2022-04-28 13:43:09 +02:00
l_samenv
6752997048 replace 'iodev' by 'io' in cfg files 2022-04-22 16:45:12 +02:00
l_samenv
026ab3f4b2 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-04-22 16:36:03 +02:00
l_samenv
e9f687e6dd update phytron driver 
+ fixes in secop_psi/sea.py (iodev)
 2022-04-22 16:25:14 +02:00
HRPT
1ac2f8557c fixes in sch5 2022-04-20 15:53:15 +02:00
focus
1da7657483 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-04-20 14:52:17 +02:00
Markus Zolliker
ac3bf5b122 add cryosim and magsim cfg 
Change-Id: I5ad510c2119ec08cbef234b6565dda69aa370436
 2022-04-13 10:46:57 +02:00
Markus Zolliker
b1ddc01fbb merge until "support write_ method on readonly param and more" 
from gerrit

Change-Id: I8d2ad2a381d3a37947d8afc5e17be0428d94df36
 2022-03-21 14:00:12 +01:00
Markus Zolliker
7690481938 secop_psi.softcal: default path for calib 
Change-Id: I5ad2159587f13e1a0bcb75764397d4c784ed1c87
 2021-11-08 14:24:09 +01:00
Markus Zolliker
7d2eacfe5c fixes in sim_uniax 2021-11-04 13:01:40 +01:00
focus
b6cadf4a69 add ill4 
+ fixes in focus-be-filter
 2021-11-04 07:51:37 +01:00
Markus Zolliker
1c1911f8a8 adapt uniax simulation to newest uniax version 
Change-Id: Iad13306edf007ecfa4aebafdfb0bd38fa6be9c6a
 2021-10-27 16:35:54 +02:00
Markus Zolliker
99ebb9d110 closed loop force control 2021-10-27 16:36:44 +02:00
Markus Zolliker
57082e276f uniax, version 7.10.2021 
- driving with a generator
- 3 phases
  1) find active range (low current, far movement until force over hysteresis)
  2) release force until well below target
  3) adjusting using pid_p. (this is in fact an integral factor)
 2021-10-08 08:53:22 +02:00
Markus Zolliker
f491e53f8a fix uniax cfg typo 2021-10-06 14:12:56 +02:00
Markus Zolliker
92a812f92f update uniax.cfg for current box 2021-10-06 14:11:40 +02:00
Markus Zolliker
29226a1062 uniax: added force control as seperate module 
Change-Id: I8b14fc90f5885834e342f6bc5e5dd0ea711b27ea
 2021-10-06 13:33:34 +02:00
Markus Zolliker
8bbf65f6e8 Merge branch 'uniax' into wip 
Conflicts:
	cfg/uniax.cfg
	secop/core.py
	secop_psi/trinamic.py
 2021-09-21 16:52:15 +02:00
Markus Zolliker
73e06c590b add Phytron driver 
+ updates of cfg files

Change-Id: Ief24ee681423e18cae0fca29fe41419018d394dd
 2021-07-27 08:16:36 +02:00
Markus Zolliker
b30bd308a9 fixes for uniax device 2021-06-11 16:45:45 +02:00
Markus Zolliker
3687ed85e5 first tries with uniax stick 
Change-Id: I70da38aff091f7fc64f409485db335cde07163c9
 2021-06-08 15:32:12 +02:00
Markus Zolliker
25b8780b11 persistent module fixed 2021-06-08 14:59:20 +02:00
Markus Zolliker
246ab99e12 experimental persistent mixin 
- still contains changes in mouduls/params ...
 2021-06-08 14:59:20 +02:00
Markus Zolliker
114af36ac6 first tries with uniax stick 2021-06-08 14:59:20 +02:00
Markus Zolliker
ca6aebd290 added trinamic.cfg 2021-06-08 14:58:20 +02:00
amor
1619e042e9 added fftf furnace and smamor 2021-06-08 11:06:39 +02:00
amor
a771259ecf more fixes to SeaWritable 
+ fix mbe.cfg
 2021-05-20 17:57:41 +02:00
amor
c779d49548 fix: handle non Readable SeaModules correctly 2021-05-19 18:10:48 +02:00
amor
70c3f5f37f created SeaConfigCreator 
running frappy with 'seadesc' cfg does the same as previously
starting 'sea' cfg and performing seaconn:_describe automatically

create mbe.cfg
 2021-05-19 17:41:18 +02:00
SANS
3e599a24d7 fixed sea.cfg to be general 2021-04-29 10:58:15 +02:00
Markus Zolliker
772f45a241 add cfg/deleop directory 
Change-Id: Ia9f15af8bb68a8306a9d966ef2b217d587f0ab28
 2021-04-28 16:37:30 +02:00
Markus Zolliker
1a616ecab1 fixed doule entry tcoil1 in ma7.cfg 
Change-Id: I547e7dcb6cca72004dd3ea8e56a0601e7bf8771a
 2021-04-28 09:29:18 +02:00
Markus Zolliker
61aeafdfb6 added cfg files for SINQ Frappy 
Change-Id: Icb1ea5e2e1f9aedd77a6bac7ed6b14458aea4aa7
 2021-04-27 17:54:20 +02:00
Markus Zolliker
12b0549cc0 merged master with work 
Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
 2021-03-03 09:00:45 +01:00
Markus Zolliker
5c33cbf7a5 introduce update callbacks 
includes a use case:
- a software calibration, to be applied to any Readable.
- calibration could be changed on the fly

+ refactored a little bit update events mechanism

Change-Id: Ifa340770caa9eb2185fe7e912c51bd9ddb411ece
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23093
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-05-15 15:49:22 +02:00
Markus Zolliker
7d987b3e42 router bug fix 
- errors in cache are stored as Exception, not as tuple

Change-Id: I391c74a4bef1dc10a1783b98b1ad06fec90365df
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23044
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-05 10:04:38 +02:00
Markus Zolliker
64a3bf534b change cfg file format 
config file format change:

The section names no longer contain a space, the are either
bare module names or 'NODE' or 'INTERFACE' (capitalized in order to
distingish from module names).

The present code still accepts the old form.

Moving to the 'toml' format was considered too, but this needs some
more investigations. The necessary code changes would be limited
to the method Server.loadCfgFile.

Change-Id: I6020058c9dcc4c1cbf38f5b9e8f67e9aad670183
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23031
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
 2020-05-04 16:26:52 +02:00