eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity

fixes in procedures

Browse Source
This commit is contained in:
Jakob Meier
2022-06-02 18:51:40 +02:00
parent 7259fc008a
commit 3ff95280e5
6 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pus_tc/system/proc.py
View File

@ -1,5 +1,6 @@
from __future__ import annotations
import struct
import time
from typing import List
@ -188,6 +189,11 @@ def pack_generic_hk_listening_cmds(
sid=sid_list[i],
)
)
activate_all_rws_in_sequence(
tc_queue=tc_queue, test_speed=0, test_ramp_time=5000, init_ssc=0
)
tc_queue.appendleft((QueueCommands.WAIT, 30))
current_time = time.time()
current_time += collection_time
if not cfg.use_tc_sched:
@ -197,11 +203,14 @@ def pack_generic_hk_listening_cmds(
for cmd in disable_cmd_list:
tc_queue.appendleft(
generate_time_tagged_cmd(
release_time=struct.pack("!I", current_time),
release_time=struct.pack("!I", int(current_time)),
tc_to_insert=cmd,
ssc=0,
)
)
if not cfg.use_tc_sched:
tc_queue.appendleft((QueueCommands.WAIT, 120))
sid_list.clear()
diag_list.clear()
@ -323,7 +332,7 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
False,
False,
False,
False,
False
]
pack_acs_command(tc_queue=tc_queue, op_code="acs-a")
@ -343,6 +352,15 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
tc_queue.appendleft((QueueCommands.WAIT, 5.0))
pack_acs_command(tc_queue=tc_queue, op_code="acs-b")
sid_list.clear()
diag_list = [
False,
False,
False,
False,
False
]
for b_side_dev in b_side_pairs:
oid = b_side_dev[0]
set_id = b_side_dev[1]
@ -359,11 +377,24 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
tc_queue.appendleft((QueueCommands.WAIT, 5.0))
pack_acs_command(tc_queue=tc_queue, op_code="acs-d")
sid_list.clear()
for d_side_dev in d_side_pairs:
oid = d_side_dev[0]
set_id = d_side_dev[1]
sid_list.append(make_sid(oid, set_id))
diag_list = diag_list + diag_list
diag_list = [
False,
False,
False,
False,
False,
False,
False,
False,
False,
False,
]
pack_generic_hk_listening_cmds(
tc_queue=tc_queue,
proc_key=key,
@ -563,37 +594,29 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
key = KAI.RW_FT_ONE_RW[0]
rw_pairs = [
(oids.RW1_ID, RwSetIds.STATUS_SET_ID),
(oids.RW1_ID, RwSetIds.TEMPERATURE_SET_ID),
(oids.RW1_ID, RwSetIds.LAST_RESET),
(oids.RW1_ID, RwSetIds.TM_SET),
(oids.RW2_ID, RwSetIds.STATUS_SET_ID),
(oids.RW2_ID, RwSetIds.TEMPERATURE_SET_ID),
(oids.RW2_ID, RwSetIds.LAST_RESET),
(oids.RW2_ID, RwSetIds.TM_SET),
(oids.RW3_ID, RwSetIds.STATUS_SET_ID),
(oids.RW3_ID, RwSetIds.TEMPERATURE_SET_ID),
(oids.RW3_ID, RwSetIds.LAST_RESET),
(oids.RW3_ID, RwSetIds.TM_SET),
(oids.RW4_ID, RwSetIds.STATUS_SET_ID),
(oids.RW4_ID, RwSetIds.TEMPERATURE_SET_ID),
(oids.RW4_ID, RwSetIds.LAST_RESET),
(oids.RW4_ID, RwSetIds.TM_SET),
]
diag_list = [
True,
False,
False,
True,
False,
False,
True,
False,
False,
False,
False,
False,
False,
False,
False,
False,
False,
True,
False,
False,
]