From 1df9b0a91ad7ce339753e8aa21849968118a6f9c Mon Sep 17 00:00:00 2001 From: Irini Kosmidou Date: Mon, 27 Jun 2022 20:18:26 +0200 Subject: [PATCH] continued scex.py --- pus_tc/devs/scex.py | 136 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 111 insertions(+), 25 deletions(-) diff --git a/pus_tc/devs/scex.py b/pus_tc/devs/scex.py index 464faff..022414a 100644 --- a/pus_tc/devs/scex.py +++ b/pus_tc/devs/scex.py @@ -1,4 +1,6 @@ import enum +import json +import struct from config.definitions import CustomServiceList from tmtccmd.tc.pus_8_funccmd import generate_action_command @@ -7,17 +9,40 @@ from tmtccmd.tc.definitions import TcQueueT from config.object_ids import SCEX_HANDLER_ID +USE_SCEX_CONF_FILE = True + + class OpCodes: PING = ["0", "ping"] + ION_CMD = ["1", "ion"] + TEMP_CMD = ["2", "temp"] + EXP_STATUS_CMD = ["3", "expStatus"] + + ONE_CELLS_CMD = ["4", "oneCell"] + ALL_CELLS_CMD = ["5", "allCells"] + FRAM = ["6", "fram"] class ActionIds(enum.IntEnum): PING = 7 ION_CMD = 4 + TEMP_CMD = 3 + EXP_STATUS_CMD = 2 + + ONE_CELLS_CMD = 6 + ALL_CELLS_CMD = 5 + FRAM = 1 class Info: PING = "Send Ping command" + ION_CMD = "Read Ion" + TEMP_CMD = "Read Temperature" + EXP_STATUS_CMD = "Read Experiment Status" + + ONE_CELLS_CMD = "One Cell" + ALL_CELLS_CMD = "All Cells" + FRAM = "Read FRAM" def add_scex_cmds(cmd_dict: ServiceOpCodeDictT): @@ -26,10 +51,27 @@ def add_scex_cmds(cmd_dict: ServiceOpCodeDictT): op_code_dict=op_code_dict, keys=OpCodes.PING, info=Info.PING ) - # ion - op_code_dict = dict() add_op_code_entry( - op_code_dict=op_code_dict, keys=OpCodes.ION, info=Info.ION + op_code_dict=op_code_dict, keys=OpCodes.ION_CMD, info=Info.ION_CMD + ) + + add_op_code_entry( + op_code_dict=op_code_dict, keys=OpCodes.TEMP_CMD, info=Info.TEMP_CMD + ) + + add_op_code_entry( + op_code_dict=op_code_dict, keys=OpCodes.EXP_STATUS_CMD, info=Info.EXP_STATUS_CMD + ) + + add_op_code_entry( + op_code_dict=op_code_dict, keys=OpCodes.ONE_CELLS_CMD, info=Info.ONE_CELLS_CMD + ) + + add_op_code_entry( + op_code_dict=op_code_dict, keys=OpCodes.ALL_CELLS_CMD, info=Info.ALL_CELLS_CMD + ) + add_op_code_entry( + op_code_dict=op_code_dict, keys=OpCodes.FRAM, info=Info.FRAM ) add_service_op_code_entry( @@ -40,35 +82,79 @@ def add_scex_cmds(cmd_dict: ServiceOpCodeDictT): ) -""" - #in app_data - app_data.extend(struct.pack("!H", first_dac)) - append_16_bit_val(packet=packet, val=CFG.exp_cfg.first_dac[cn]) - append_16_bit_val(packet=packet, val=CFG.exp_cfg.last_dac[cn]) - append_16_bit_val(packet=packet, val=CFG.exp_cfg.res_switch1[cn]) - append_16_bit_val(packet=packet, val=CFG.exp_cfg.res_switch2[cn]) - - packet.append(CFG.exp_cfg.dac_weight1[cn]) - packet.append(CFG.exp_cfg.dac_weight2[cn]) - packet.append(CFG.exp_cfg.dac_weight3[cn]) -""" def pack_scex_cmds(tc_queue: TcQueueT, op_code: str): if op_code in OpCodes.PING: tc_queue.appendleft((QueueCommands.PRINT, Info.PING)) app_data = bytes([0]) command = generate_action_command(SCEX_HANDLER_ID, ActionIds.PING, app_data) tc_queue.appendleft(command.pack_command_tuple()) - if op_code in OpCodes.ION: - tc_queue.appendleft((QueueCommands.PRINT, Info.ION)) + + if op_code in OpCodes.ION_CMD: + tc_queue.appendleft((QueueCommands.PRINT, Info.ION_CMD)) app_data = bytes([0]) - command = generate_action_command(SCEX_HANDLER_ID, ActionIds.ION, app_data) + command = generate_action_command(SCEX_HANDLER_ID, ActionIds.ION_CMD, app_data) + tc_queue.appendleft(command.pack_command_tuple()) + + if op_code in OpCodes.TEMP_CMD: + tc_queue.appendleft((QueueCommands.PRINT, Info.TEMP_CMD)) + app_data = bytes([0]) + command = generate_action_command(SCEX_HANDLER_ID, ActionIds.TEMP_CMD, app_data) + tc_queue.appendleft(command.pack_command_tuple()) + + if op_code in OpCodes.EXP_STATUS_CMD: + tc_queue.appendleft((QueueCommands.PRINT, Info.EXP_STATUS_CMD)) + app_data = bytes([0]) + command = generate_action_command(SCEX_HANDLER_ID, ActionIds.EXP_STATUS_CMD, app_data) tc_queue.appendleft(command.pack_command_tuple()) # one cell - if op_code in OpCodes.ION: - tc_queue.appendleft((QueueCommands.PRINT, Info.ION)) - app_data = bytearray([0]) - #todo cell number - app_data.extend(struct.pack("!H", first_dac)) #aus json holen - command = generate_action_command(SCEX_HANDLER_ID, ActionIds.ION, app_data) - tc_queue.appendleft(command.pack_command_tuple()) \ No newline at end of file + if op_code in OpCodes.ONE_CELLS_CMD: + tc_queue.appendleft((QueueCommands.PRINT, Info.ONE_CELLS_CMD)) + app_data = bytearray() + + # cell number + while True: + cell_select = input("Which solar cell should be measured? (1-10): ") + if not cell_select.isdigit(): + print("Invalid cell number. Try again.") + continue + cell_select = int(cell_select) + if cell_select < 1 or cell_select > 10: + print( + f"Invalid cell number {cell_select}, " + f"Please enter a valid number: " + ) + continue + cn = cell_select - 1 + break + + if USE_SCEX_CONF_FILE: + with open("template/scex_conf.json") as json_file: + json_data = json.load(json_file) + # print(json_data) + first_dac = json_data["first_dac"] + last_dac = json_data["last_dac"] + res_switch1 = json_data["res_switch1"] + res_switch2 = json_data["res_switch2"] + dac_weight1 = json_data["dac_weight1"] + dac_weight2 = json_data["dac_weight2"] + dac_weight3 = json_data["dac_weight3"] + + # in app_data + app_data.extend(struct.pack("!H", first_dac)) + append_16_bit_val(packet=app_data, val=first_dac[cn]) + append_16_bit_val(packet=app_data, val=last_dac[cn]) + append_16_bit_val(packet=app_data, val=res_switch1[cn]) + append_16_bit_val(packet=app_data, val=res_switch2[cn]) + + app_data.append(dac_weight1[cn]) + app_data.append(dac_weight2[cn]) + app_data.append(dac_weight3[cn]) + + command = generate_action_command(SCEX_HANDLER_ID, ActionIds.ONE_CELLS_CMD, app_data) + tc_queue.appendleft(command.pack_command_tuple()) + + +def append_16_bit_val(packet: bytearray, val: int): + packet.append((val >> 8) & 0xFF) + packet.append(val & 0xFF) \ No newline at end of file