From eb4143e6b5144050abb6dfb965e74174d8bad063 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 12 May 2022 14:09:54 +0200 Subject: [PATCH 1/4] update .csv files --- config/events.csv | 8 +++++--- config/objects.csv | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/config/events.csv b/config/events.csv index 4570c0e..88fb35b 100644 --- a/config/events.csv +++ b/config/events.csv @@ -83,9 +83,11 @@ 11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h 11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h 11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h -11402;0x2c8a;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h -11403;0x2c8b;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h -11404;0x2c8c;MAIN_SWITCH_TIMEOUT;LOW;;mission/devices/HeaterHandler.h +11402;0x2c8a;HEATER_WENT_ON;INFO;;mission/devices/HeaterHandler.h +11403;0x2c8b;HEATER_WENT_OFF;INFO;;mission/devices/HeaterHandler.h +11404;0x2c8c;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h +11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h +11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;;mission/devices/HeaterHandler.h 11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h 11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h 11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h diff --git a/config/objects.csv b/config/objects.csv index 22fed88..f9380ec 100644 --- a/config/objects.csv +++ b/config/objects.csv @@ -37,9 +37,12 @@ 0x44260000;BPX_BATT_HANDLER 0x44300000;PLPCDU_HANDLER 0x443200A5;RAD_SENSOR +0x44330000;PLOC_UPDATER 0x44330001;PLOC_MEMORY_DUMPER 0x44330002;STR_HELPER 0x44330003;PLOC_MPSOC_HELPER +0x44330004;AXI_PTME_CONFIG +0x44330005;PTME_CONFIG 0x44330015;PLOC_MPSOC_HANDLER 0x44330016;PLOC_SUPERVISOR_HANDLER 0x44330017;PLOC_SUPERVISOR_HELPER @@ -109,6 +112,14 @@ 0x5400CAFE;DUMMY_INTERFACE 0x54123456;LIBGPIOD_TEST 0x54694269;TEST_TASK +0x60000000;HEATER_0_PLOC_PROC_BRD +0x60000001;HEATER_1_PCDU_BRD +0x60000002;HEATER_2_ACS_BRD +0x60000003;HEATER_3_OBC_BRD +0x60000004;HEATER_4_CAMERA +0x60000005;HEATER_5_STR +0x60000006;HEATER_6_DRO +0x60000007;HEATER_7_HPA 0x73000001;ACS_BOARD_ASS 0x73000002;SUS_BOARD_ASS 0x73000003;TCS_BOARD_ASS -- 2.34.1 From 8e20c2ab0879e5b483308d0feb4aeb5951ce00c9 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 12 May 2022 20:07:31 +0200 Subject: [PATCH 2/4] added command parameter to identify extenral cmds --- pus_tc/devs/heater.py | 5 +++++ pus_tm/verification_handler.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pus_tc/devs/heater.py b/pus_tc/devs/heater.py index c85e4d1..4dc9ef5 100644 --- a/pus_tc/devs/heater.py +++ b/pus_tc/devs/heater.py @@ -46,6 +46,10 @@ class Info: HEATER_HEALTHY_CMD = "Set to healthy" +# Needed in OBSW to differentiate between external and internal heater commands +COMMAND_SOURCE_PARAM_EXTERNAL = 1 + + class ActionIds(enum.IntEnum): SWITCH_HEATER = 0 @@ -214,6 +218,7 @@ def pack_switch_heater_command( command = bytearray() command.append(switch_nr) command.append(switch_action) + command.append(COMMAND_SOURCE_PARAM_EXTERNAL) return generate_action_command( object_id=object_id, action_id=ActionIds.SWITCH_HEATER, app_data=command ) diff --git a/pus_tm/verification_handler.py b/pus_tm/verification_handler.py index 2b81825..6182f9d 100644 --- a/pus_tm/verification_handler.py +++ b/pus_tm/verification_handler.py @@ -23,7 +23,7 @@ def handle_service_1_packet(printer: FsfwTmTcPrinter, raw_tm: bytes): ) else: retval_string = ( - f"Error Code information for code {srv1_packet.error_code}| " + f"Error Code information for code {srv1_packet.error_code} | " f"Name: {retval_info.name} | Info: {retval_info.info}" ) LOGGER.info(retval_string) -- 2.34.1 From 743670f6563d5713c883545186ef1c7a47784d1a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 12 May 2022 20:45:43 +0200 Subject: [PATCH 3/4] update events and retvals --- config/events.csv | 1 + config/returnvalues.csv | 1 + 2 files changed, 2 insertions(+) diff --git a/config/events.csv b/config/events.csv index 88fb35b..34326f6 100644 --- a/config/events.csv +++ b/config/events.csv @@ -88,6 +88,7 @@ 11404;0x2c8c;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h 11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h 11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;;mission/devices/HeaterHandler.h +11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;;mission/devices/HeaterHandler.h 11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h 11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h 11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h diff --git a/config/returnvalues.csv b/config/returnvalues.csv index a1b8e42..faf6dd6 100644 --- a/config/returnvalues.csv +++ b/config/returnvalues.csv @@ -389,6 +389,7 @@ 0x2e03; ASC_BufferTooSmall;;0x3;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER 0x1701; HHI_ObjectNotHealthy;;1;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF 0x1702; HHI_InvalidHealthState;;2;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF +0x1703; HHI_IsExternallyControlled;;3;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF 0x3101; CF_ObjectHasNoFunctions;;1;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF 0x3102; CF_AlreadyCommanding;;2;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF 0x3201; HF_IsBusy;;1;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF -- 2.34.1 From bf64181826de2682ec7298c2b86f500d079c26be Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 12 May 2022 20:51:25 +0200 Subject: [PATCH 4/4] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc2da02..600bf83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ list yields a list of all related PRs for each release. # [v1.11.0] - Added more RW HK handling and RW Assembly commands +- Pack additional parameter which identifiers whether heater is commanded externally or internally + PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/67 ## Added -- 2.34.1