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

fixes and subsystem

Browse Source
This commit is contained in:
Marius Eggert
2023-10-09 15:43:03 +02:00
parent 11f7ed8436
commit caa843fb1a
3 changed files with 94 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
eive_tmtc/tmtc/power/pwr_ctrl.py
View File

@ -52,17 +52,6 @@ class ParamId(enum.IntEnum):
HIGHER_MODES_LIMIT = 6
PARAM_DICT = {
ParamId.BATTERY_INTERNAL_RESISTANCE: "BATTERY_INTERNAL_RESISTANCE",
ParamId.BATTERY_MAXIMUM_CAPACITY: "BATTERY_MAXIMUM_CAPACITY",
ParamId.COULOMB_COUNTER_VOLTAGE_UPPER_THRESHOLD: "COULOMB_COUNTER_VOLTAGE_UPPER_THRESHOLD",
ParamId.MAX_ALLOWED_TIME_DIFF: "MAX_ALLOWED_TIME_DIFF",
ParamId.PAYLOAD_OP_LIMIT_ON: "PAYLOAD_OP_LIMIT_ON",
ParamId.PAYLOAD_OP_LIMIT_LOW: "PAYLOAD_OP_LIMIT_LOW",
ParamId.HIGHER_MODES_LIMIT: "HIGHER_MODES_LIMIT",
}
class OpCodes:
OFF = ["mode_off"]
ON = ["mode_on"]
@ -102,6 +91,9 @@ def acs_cmd_defs(defs: TmtcDefinitionWrapper):
oce.add(keys=OpCodes.REQUEST_ENABLE_PL_HK, info=Info.REQUEST_ENABLE_PL_HK)
oce.add(keys=OpCodes.ENABLE_ENABLE_PL_HK, info=Info.ENABLE_ENABLE_PL_HK)
oce.add(keys=OpCodes.DISABLE_ENABLE_PL_HK, info=Info.DISABLE_ENABLE_PL_HK)
defs.add_service(
name=CustomServiceList.PWR_CTRL.value, info="PWR Controller", op_code_entry=oce
)
@service_provider(CustomServiceList.PWR_CTRL.value)
@ -164,11 +156,11 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
for val in ParamId:
print("{:<2}: {:<20}".format(val, PARAM_DICT[val]))
print("{:<2}: {:<20}".format(val, val.name))
param = int(input(f"Specify parameter to set \n" f""))
match param:
case ParamId.BATTERY_INTERNAL_RESISTANCE:
value = int(input("Specify parameter value to set [Ohm]: "))
value = float(input("Specify parameter value to set [Ohm]: "))
q.add_pus_tc(
create_load_param_cmd(
create_scalar_float_parameter(
@ -180,7 +172,7 @@ def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
)
)
case ParamId.BATTERY_MAXIMUM_CAPACITY:
value = int(input("Specify parameter value to set [Ah]: "))
value = float(input("Specify parameter value to set [Ah]: "))
q.add_pus_tc(
create_load_param_cmd(
create_scalar_float_parameter(
@ -192,7 +184,7 @@ def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
)
)
case ParamId.COULOMB_COUNTER_VOLTAGE_UPPER_THRESHOLD:
value = int(input("Specify parameter value to set [V]: "))
value = float(input("Specify parameter value to set [V]: "))
q.add_pus_tc(
create_load_param_cmd(
create_scalar_float_parameter(
@ -204,7 +196,7 @@ def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
)
)
case ParamId.MAX_ALLOWED_TIME_DIFF:
value = int(input("Specify parameter value to set [s]: "))
value = float(input("Specify parameter value to set [s]: "))
q.add_pus_tc(
create_load_param_cmd(
create_scalar_double_parameter(
@ -216,7 +208,7 @@ def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
)
)
case ParamId.PAYLOAD_OP_LIMIT_ON:
value = int(input("Specify parameter value to set [1]: "))
value = float(input("Specify parameter value to set [1]: "))
q.add_pus_tc(
create_load_param_cmd(
create_scalar_float_parameter(
@ -228,7 +220,7 @@ def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
)
)
case ParamId.PAYLOAD_OP_LIMIT_LOW:
value = int(input("Specify parameter value to set [1]: "))
value = float(input("Specify parameter value to set [1]: "))
q.add_pus_tc(
create_load_param_cmd(
create_scalar_float_parameter(
@ -240,7 +232,7 @@ def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
)
)
case ParamId.HIGHER_MODES_LIMIT:
value = int(input("Specify parameter value to set [1]: "))
value = float(input("Specify parameter value to set [1]: "))
q.add_pus_tc(
create_load_param_cmd(
create_scalar_float_parameter(
@ -277,30 +269,21 @@ def handle_core_hk_data(pw: PrintWrapper, hk_data: bytes):
pw.dlog("Received HK set too small")
return
current_idx = 0
total_battery_current = [
f"{val:d}"
for val in struct.unpack(
fmt_int16, hk_data[current_idx : current_idx + inc_len_int16][0]
)
]
total_battery_current = struct.unpack(
fmt_int16, hk_data[current_idx : current_idx + inc_len_int16]
)[0]
current_idx += inc_len_int16
open_circuit_voltage_charge = [
f"{val:8.3f}"
for val in struct.unpack(
fmt_float, hk_data[current_idx : current_idx + inc_len_float][0]
)
]
open_circuit_voltage_charge = struct.unpack(
fmt_float, hk_data[current_idx : current_idx + inc_len_float]
)[0]
current_idx += inc_len_float
coulomb_counter_charge = [
f"{val:d}"
for val in struct.unpack(
fmt_float, hk_data[current_idx : current_idx + inc_len_float]
)
]
coulomb_counter_charge = struct.unpack(
fmt_float, hk_data[current_idx : current_idx + inc_len_float]
)[0]
current_idx += inc_len_float
pw.dlog(f"Total Battery Current: {total_battery_current} [mA]")
pw.dlog(f"Open Circuit Voltage Charge: {open_circuit_voltage_charge*100} [%]")
pw.dlog(f"Coulomb Counter Charge: {coulomb_counter_charge*100} [%]")
pw.dlog(f"Open Circuit Voltage Charge: {open_circuit_voltage_charge*100:8.3f} [%]")
pw.dlog(f"Coulomb Counter Charge: {coulomb_counter_charge*100:8.3f} [%]")
FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=3)
@ -312,12 +295,9 @@ def handle_enable_pl_data(pw: PrintWrapper, hk_data: bytes):
pw.dlog("Received HK set too small")
return
current_idx = 0
pl_use_allowed = [
f"{val:d}"
for val in struct.unpack(
fmt_uint16, hk_data[current_idx : current_idx + inc_len_uint16][0]
)
]
pl_use_allowed = struct.unpack(
fmt_uint16, hk_data[current_idx : current_idx + inc_len_uint16]
)[0]
current_idx += inc_len_uint16
pw.dlog(f"PL Use Allowed: {pl_use_allowed}")
FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=1)