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

1248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Pedersen
f66411dded Remove iohandler left-overs from docs 
The iohandler module has been remove in 28526

Change-Id: I24c86f88c8a37f85018cfcdec48279a1438da408
 2022-11-03 13:52:27 +01:00
Jenkins system
ce4bbec766 [deb] Release v0.14.3 2022-11-03 13:51:52 +01:00
Enrico Faulhaber
355810a887 MLZ/entangle: fix AnalogOutput.read_status() 
Change-Id: I584cd8f559b6c57f3c73105b28bc533526f6f492
 2022-11-03 12:59:58 +01:00
Bjoern Pedersen
aa98604f88 Upgrade for ci 
fixes outdated options and macros in Jenkinsfile
fixes outdated options in pylintrc

Change-Id: Ib064cc8b4235536c21288733676438297e15736d
 2022-11-03 12:27:37 +01:00
Georg Brandl
b0051ca3f0 secop_mlz/amagnet: formatting fixup 
Change-Id: I05ec4568c87d58f32cf48479ac653075e2211ed3
 2022-10-28 16:20:29 +02:00
Enrico Faulhaber
92edbb27ea change repo to secop/frappy 
Change-Id: I515c0d958c87d555156861db83a7b22c60046ead
 2022-10-21 12:40:33 +02:00
Jenkins system
20fc48ddf0 [deb] Release v0.14.2 2022-10-20 15:38:45 +02:00
Georg Brandl
340c031f46 systemd generator: adapt to changed config API 
Change-Id: Idb2527b7007aca3a051c1ec9a2d8eecdb55cacef
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29535
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2022-10-20 15:13:29 +02:00
Jenkins system
3ac8b4e255 [deb] Release v0.14.1 2022-10-20 14:04:07 +02:00
Georg Brandl
6ffc73a1e1 Makefile: fix Jenkins host 
Change-Id: I1ae3c27d0839b8dffde4cf9da5a13fa00f88a9d3
 2022-10-20 14:03:59 +02:00
Georg Brandl
4ef0b0c01d mlz: avoid error on import due to consistency check 
Change-Id: I43751a93b16a0cd9a64ae79da7045fd4e879b065
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29529
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-10-20 10:39:08 +02:00
Georg Brandl
1fc805a5a2 gui: clarify needed input for "add sec node" dialog 
Change-Id: Ia34eef4df50d545fa779979dd25a239803af0a8e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29528
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-10-20 07:54:05 +02:00
Markus Zolliker
05edf98dfe secop_psi.entangle.AnalogInput: fix main value 
when the unit of parameter 'value' is taken from tango, the
'$' units of other parameters are already replaced by the configured
value and are not updated. this change fixes this.

not yet tested on entangle, but a test with similar code works

Change-Id: I87ad112b0965b39bb204d6c3d1fc1de6d4e14f60
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29357
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-10-19 17:27:29 +02:00
Jenkins system
e09c365ea5 [deb] Release v0.14.0 2022-10-19 11:31:51 +02:00
camea
0c93ca8c75 add comment "do not use mb11stick" 2022-10-18 16:41:04 +02:00
camea
971c1dcfee Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-10-04 15:13:23 +02:00
camea
498dbd4179 sea.py: fix status datatype 
sea status is a string (not a tuple) and needs therefore
special treatment.
interestingly this bug did not yet appear ...
 2022-10-04 15:11:57 +02:00
l_samenv
00b0a54f12 ramp unit must be $/min 2022-09-22 17:12:54 +02:00
l_samenv
48076edd99 improve magfield and ips_mercury 2022-09-22 17:12:30 +02:00
Markus Zolliker
64cb297a06 HasIO: automatic creation of io from uri fails 
attached io in HasIO must not be mandatory - either uri or io
has to be given

Change-Id: Id39e40f98020d4051c1ad8105f6af6018aafaea8
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29349
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-09-22 15:37:42 +02:00
Markus Zolliker
eaefa1ce87 apply main unit also in structured types 
Change-Id: I5a3efb167f2b460b847d8e7ac75a21848976b5f8
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29350
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-09-22 14:59:24 +02:00
Markus Zolliker
71aaf7187a improvements on interactive client 
- fix handling of exceptions
- add selective logging
- improve formatting of values

Change-Id: I69c11e95aca1cdd222800fd3fd192a6b12b38411
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29348
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-09-22 14:59:10 +02:00
Markus Zolliker
0a28192c15 improve general config 
for easier configuration of multiple servers on the same machine,
FRAPPY_* env. variables are overriding the values from the
general config file

+ apply expanduser where approporiate

Change-Id: Icb73543402f5fb1b8a248a8b8d7fb470971492f4
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29351
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-09-22 14:58:47 +02:00
Markus Zolliker
1b9cac04b1 fix bug when restarting statemachine 
- fixed bad if clause
+ better debug message on restart/stop

Change-Id: I4c2327593c014749a32377dac45f0f46c680df2b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29352
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-09-22 14:58:20 +02:00
Markus Zolliker
2b1986ad8f fix bug in persistent.py 
- use dirname instead of basename

Change-Id: Id563794a8e5f5c9e4d31750f089eb3b9c3150d94
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29353
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-09-22 14:58:05 +02:00
Markus Zolliker
270152d503 improve HasConvergence mixin 
- add stop command
- fix bug in cleanup
- reset time spent on write_target

Change-Id: Iaa76cb7a9c6b4a2ccb08313f9880006ab14afe2b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29355
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-09-22 14:57:52 +02:00
Markus Zolliker
1922578dfa fix undefined status in softcal 
when the status of the rawsensor is not changed, the
status of the calibrated module was not initialized
properly.

Change-Id: I2c23e245226ffb7643060e486c9dfde250a79ce9
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/29356
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-09-22 14:56:23 +02:00
Jenkins system
485e81bfb0 [deb] Release v0.13.1 
Change-Id: Ib038475d75de7b2976bc463423c2493eb531c02a
 2022-09-21 16:19:34 +02:00
Enrico Faulhaber
0df50bb0f9 secop_mlz: minor rework entangle client 
Change-Id: Ie406b4220c22cdbf302a1fd36f2d7407d81a47fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28951
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2022-09-21 16:17:01 +02:00
Markus Zolliker
de5f17695c make startup faster in case of errors 
When the io of one SECoP module fails, it takes ages to startup
because each parameter poll takes the time to wait for a timeout.
After the first communication error on an io, no more startup polls
are tried on the modules using this io.

Change-Id: I0d250953dfe91a7d68d2d2b108395cc25d471afe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28588
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-09-21 16:16:48 +02:00
Markus Zolliker
e4aa2149f7 phytron: fix warning on repeated comm. error 
log only a warning when several retries ware successful

Change-Id: I2f1dfba920b0841914da82229820bcdd4b97c6e9
 2022-09-21 11:35:42 +02:00
Markus Zolliker
9f656546df fix undefined status in softcal 2022-09-20 12:07:11 +02:00
Markus Zolliker
5affb9f31b fix bug in persistent.py 
- use dirname instead of basename
 2022-09-20 12:07:11 +02:00
Markus Zolliker
5e3bf96df1 rework of uniax 
- try to deal with anomaly at 17 N
- reduce pid on overshoot
- use new statemachine
 2022-09-20 12:07:11 +02:00
Markus Zolliker
07995e2235 fix bug when restarting statemachine 
fixed bad if clause
+ better debug message on restart/stop
 2022-09-20 12:07:10 +02:00
zebra
54f091d0fe disable encoder for ma6 stick motor 2022-09-19 11:38:33 +02:00
zebra
14a71427fa jtccr: fix rel_paths 2022-09-19 11:37:56 +02:00
Markus Zolliker
486be9604e [WIP] uniax: removed do_ prefix 
Change-Id: I98d56a8ece681515de8f05767c67686715212c09
 2022-09-16 14:57:58 +02:00
Markus Zolliker
a8f1495bc8 [WIP] uniax after changing to StateMachine 
Change-Id: I0173f8c8eaaeb2526477d05803a615673297667d
 2022-09-16 14:53:42 +02:00
Markus Zolliker
3ab9821860 improve formatting of values 
Change-Id: I4a9290e85ee2071a3f2cfe0d00bc7dc4dcb4caed
 2022-09-16 08:06:45 +02:00
Markus Zolliker
0b9e227669 state after discussion with users 
- cirterium for "no substantial forece change" must be improved
 2022-09-16 08:16:15 +02:00
Markus Zolliker
befba09acc fix main value unit 
Change-Id: I27186e66bf065e015680a6925c5428714444c25e
 2022-09-14 14:54:48 +02:00
Markus Zolliker
554f265eb8 fix main value unit 
Change-Id: I30c6107fae31b5087bac75d66db6be8dee78a757
 2022-09-14 14:53:59 +02:00
Markus Zolliker
4287ec6477 apply main unit also in structured types 
Change-Id: I5a3efb167f2b460b847d8e7ac75a21848976b5f8
 2022-09-14 14:50:39 +02:00
Markus Zolliker
aad1c33742 improvements on interactive client 
- add selective logging
- fix handling of exceptions

Change-Id: I7e2c2d4ed12302874c3bb2cc7bd707aa8e487341
 2022-09-14 13:59:51 +02:00
Markus Zolliker
b0315e133b rework switch timing 
- specific things in ips_mercury.py
- general things in magfield.py

Change-Id: I7c2bae815b9a80a17803b44b8941ef3dea3adb60
 2022-09-14 13:58:12 +02:00
l_samenv
c3f55435da add reading of slave currents and voltages 
with fast polling
 2022-09-14 10:59:55 +02:00
camea
12cb0cdade Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-09-12 15:16:57 +02:00
camea
7ed7dd7493 add combined mb11 / mb11 stick 2022-09-12 15:16:26 +02:00
camea
031b30a4aa heater slots H2 and H3 are exchanged! 2022-09-12 15:15:24 +02:00