From 16c226ed8c557409fdfe6644d11022a155d0408d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Apr 2021 19:27:58 +0200 Subject: [PATCH 1/5] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 2f51152..9f83739 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 2f511523cb71e00b4669db002b171d626a63fddf +Subproject commit 9f8373977179b79fabd5d56bc999d8cac2078d8c From 244cc972a5e6b5a73fa20eb8f3dfa0ad5c99084f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Apr 2021 19:30:36 +0200 Subject: [PATCH 2/5] reverted pus c changes --- mission/utility/TmFunnel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mission/utility/TmFunnel.cpp b/mission/utility/TmFunnel.cpp index b98c9e9..5579d18 100644 --- a/mission/utility/TmFunnel.cpp +++ b/mission/utility/TmFunnel.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include object_id_t TmFunnel::downlinkDestination = objects::NO_OBJECT; @@ -50,7 +50,7 @@ ReturnValue_t TmFunnel::handlePacket(TmTcMessage* message) { if(result != HasReturnvaluesIF::RETURN_OK){ return result; } - TmPacketPusC packet(packetData); + TmPacketBase packet(packetData); packet.setPacketSequenceCount(this->sourceSequenceCount); sourceSequenceCount++; sourceSequenceCount = sourceSequenceCount % From 1c265fa351268396e0a63da6fccc5ff86a6e81c0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Apr 2021 19:41:33 +0200 Subject: [PATCH 3/5] using pus a again for tmtc --- fsfw_hal | 2 +- tmtc/config/hook_base.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fsfw_hal b/fsfw_hal index a85c014..a4f5e78 160000 --- a/fsfw_hal +++ b/fsfw_hal @@ -1 +1 @@ -Subproject commit a85c01465bc8687773676f05c5e7eb8af54b25ff +Subproject commit a4f5e783e1d0452321559c1d612ef0add868d47c diff --git a/tmtc/config/hook_base.py b/tmtc/config/hook_base.py index abd29c9..6b04634 100644 --- a/tmtc/config/hook_base.py +++ b/tmtc/config/hook_base.py @@ -4,6 +4,7 @@ from typing import Dict, Union, Tuple from tmtccmd.core.hook_base import TmTcHookBase from tmtccmd.ecss.tc import PusTelecommand from tmtccmd.pus_tm.service_3_base import Service3Base +from tmtccmd.ecss.conf import PusVersion class FsfwHookBase(TmTcHookBase): @@ -19,7 +20,7 @@ class FsfwHookBase(TmTcHookBase): def add_globals_pre_args_parsing(self, gui: bool = False): from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing - set_default_globals_pre_args_parsing(gui=gui, apid=0xef) + set_default_globals_pre_args_parsing(gui=gui, apid=0xef, pus_tm_version=PusVersion.PUS_A) def add_globals_post_args_parsing(self, args: argparse.Namespace, json_cfg_path: str = ""): from tmtccmd.defaults.globals_setup import set_default_globals_post_args_parsing From 74278c16cf0b007b97c525c9c3ab99758a241faa Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Apr 2021 19:54:26 +0200 Subject: [PATCH 4/5] update fsfw and FSFWConfig for PUS A --- bsp_hosted/fsfwconfig/FSFWConfig.h | 2 +- fsfw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bsp_hosted/fsfwconfig/FSFWConfig.h b/bsp_hosted/fsfwconfig/FSFWConfig.h index 5bae107..7e9b9f0 100644 --- a/bsp_hosted/fsfwconfig/FSFWConfig.h +++ b/bsp_hosted/fsfwconfig/FSFWConfig.h @@ -17,7 +17,7 @@ #define FSFW_DISABLE_PRINTOUT 0 #endif -#define FSFW_USE_PUS_C_TELEMETRY 1 +#define FSFW_USE_PUS_C_TELEMETRY 0 //! Can be used to disable the ANSI color sequences for C stdio. #define FSFW_COLORED_OUTPUT 1 diff --git a/fsfw b/fsfw index 9f83739..097244b 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 9f8373977179b79fabd5d56bc999d8cac2078d8c +Subproject commit 097244bf8b429d1b107343a3dbd77fa537a9c86d From 15dba9f945c169ece0fa2d8f8a283d0f5593373b Mon Sep 17 00:00:00 2001 From: Steffen Gaisser Date: Thu, 29 Apr 2021 20:00:17 +0200 Subject: [PATCH 5/5] Added submodules in NOTICE File --- NOTICE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/NOTICE b/NOTICE index 46f4708..75ba469 100644 --- a/NOTICE +++ b/NOTICE @@ -14,3 +14,24 @@ For full authorship information, see the version control history. Except as otherwise noted (below and/or in individual files), the Flight Software Framework Example is licensed under the Apache License, Version 2.0. + + +This example uses: + +The Flight Software Framework from egit@irs.uni-stuttgart.de. + +And optional: +The fsfw_hal from egit@irs.uni-stuttgart.de, + +Hardware Abstraction Layers for common OS / Hardware. + +tmtccmd, from https://github.com/rmspacefish/tmtccmd/, + +A python based TM/TC Tool for testing via the PUS Interface. + +rtems-cmake, from https://github.com/rmspacefish/tmtccmd/ + +A project to build RTEMS with cmake. + + +