Skip to content

Make it possible top up with period of 0.5min #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
anacso17 wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Make it possible top up with period of 0.5min #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3de673
injctrl.ENH: add option to inject with period of 0.5min and change de…
anacso17 Nov 2, 2024
723a27e
Update version to 2.93.0
anacso17 Nov 2, 2024
1e3a075
Merge branch 'master' into update-injctrl
xresende Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions siriuspy/siriuspy/injctrl/csdev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,11 @@ def get_injctrl_propty_database():
'type': 'enum', 'value': _ct.TopUpSts.Off, 'enums': _et.TOPUPSTS,
'unit': 'Off_Wai_TOn_Inj_TOff_Skip'},
'TopUpPeriod-SP': {
'type': 'int', 'value': 1, 'unit': 'min',
'lolim': 1, 'hilim': 6*60},
'type': 'float', 'value': 1, 'unit': 'min', 'prec': 1,
'lolim': 0.5, 'hilim': 6*60},
'TopUpPeriod-RB': {
'type': 'int', 'value': 1, 'unit': 'min',
'lolim': 1, 'hilim': 6*60},
'type': 'float', 'value': 1, 'unit': 'min', 'prec': 1,
'lolim': 0.5, 'hilim': 6*60},
'TopUpHeadStartTime-SP': {
'type': 'float', 'value': 0, 'unit': 's', 'prec': 2,
'lolim': 0, 'hilim': 2*60},
Expand Down
9 changes: 8 additions & 1 deletion siriuspy/siriuspy/injctrl/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,9 +767,16 @@ def set_accum_state(self, value):

def set_topup_period(self, value):
"""Set top-up period [min]."""
if not 1 <= value <= 6*60:
if not 0.5 <= value <= 6*60:
return False

if value < 1:
# for period < 1min, only permits 30s
value = 0.5
else:
# for period > 1min, only permits integer periods
value = int(value)

sec = value * 60
if self._topup_state_sts != _Const.TopUpSts.Off:
now = _Time.now().timestamp()
Expand Down
Loading