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

1271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
camea
4f5cc3059e add FT furnace 2022-11-23 22:41:23 +01:00
l_samenv
d845fedc03 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-11-21 14:38:40 +01:00
l_samenv
1b2e364f70 magfield adapted to new state machine 2022-11-21 14:37:53 +01:00
l_samenv
4405b2b02c new state machine, HasStates mixin 2022-11-21 14:13:52 +01:00
l_samenv
49b9bfa11d improvements for triton 
- set cooldown channel befor setting action
- improve max heater setting
 2022-11-15 16:57:52 +01:00
l_samenv
df428f4c0c check readback and try up to 3 times when it does not match 2022-11-15 16:57:00 +01:00
Markus Zolliker
b17030afa2 Merge "interactive client: fix detection of overriding modules" 2022-11-10 17:01:34 +01:00
Markus Zolliker
37c9efb27b interactive client: fix detection of overriding modules 
+ add docstring to PrettyFloat

Change-Id: Idc92e169e94d0c2bd3f9b8958870393295c87b18
 2022-11-10 15:58:28 +01:00
Enrico Faulhaber
4167ce7b00 fix sorce package name 
Change-Id: I91cd5d5e6d2da00eedc3e2ff0ee2a1d3e9ed4b04
 2022-11-10 15:00:27 +01:00
Jenkins system
2b7b2267d2 [deb] Release v0.15.0 2022-11-10 14:46:02 +01:00
Enrico Faulhaber
8071c21819 Merge "Fix typo in .description" 2022-11-10 14:43:32 +01:00
Enrico Faulhaber
e16ef3ae87 Merge "rename debian files" 2022-11-10 14:42:54 +01:00
Björn Pedersen
51147d8e09 Fix doc warnings/errors 
Change-Id: Idd6feeb66d58bc562853d3a82831645ef2d5ccf6
 2022-11-10 11:12:32 +02:00
Alexander Zaft
6909eb8541 rename debian files 
Change-Id: Ib990ecb8ef5ad856eb32110e5448064acf9a5a12
 2022-11-10 09:46:46 +01:00
Björn Pedersen
5d6b208671 CI build: upgrade base image 
- use python 3.9 (3.9 bullseyse)
- add latex-fonts-extra to fix missing tgtermes.sty
- in bullseye python3-pytango has been renamend to python3-tango
 (https://packages.debian.org/stable/python/python3-tango)

Change-Id: I06c8d8e432644f657057d14bbe754f28e2c10dd4
 2022-11-10 09:08:21 +01:00
Alexander Zaft
b3eebb6c6a rename debian package files 
Change-Id: I376082a68ceacd6fda984dc8dc1d53fa4afbbfef
 2022-11-09 16:31:40 +01:00
Alexander Zaft
7f166a5b8c Rename from secop to frappy 
debian/ is still missing, will follow in next commit.

Fixes: #4626

Change-Id: Ia87c28c1c75b8402eedbfca47f888585a7881f44
 2022-11-09 16:29:29 +01:00
Alexander Zaft
c1eb764b09 fixed pylint warnings 
Change-Id: Ibb3da77e9a53b7293a280659defc029416e30e3b
 2022-11-09 17:19:17 +02:00
Christian Felder
a9d798fabc Fix typo in .description 
Change-Id: I84def1c25279a2492d39931590f32a3b6fea8856
 2022-11-08 17:44:58 +01:00
Alexander Zaft
a928c95efd Merge "Add requirements-gui.txt and add PyQT5" 2022-11-03 15:50:19 +01:00
Enrico Faulhaber
7df4584150 Merge "Remove iohandler left-overs from docs" 2022-11-03 15:00:54 +01:00
Alexander Zaft
b7cebe2cd8 Add requirements-gui.txt and add PyQT5 
Change-Id: I8e2cdcc2d0353f4384ba8ea026e02af65064ece9
 2022-11-03 14:41:25 +01:00
Georg Brandl
b8b2dafaf8 Makefile: fix release target 
Change-Id: I1cc94a91cbb03c046092a814163664a507c88bdc
 2022-11-03 13:56:24 +01:00
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