KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'mueller/cfdp-routers' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/cfdp-routers

Browse Source
This commit is contained in:
Robin Müller 2022-08-30 11:21:12 +02:00
commit 80e8511a43
6 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/defaultcfg/fsfwconfig/objects/FsfwFactory.cpp
View File

@ -35,7 +35,7 @@ void Factory::produceFsfwObjects(void) {
} }
void Factory::setStaticFrameworkObjectIds() { void Factory::setStaticFrameworkObjectIds() {
PusServiceBase::packetSource = objects::NO_OBJECT; PusServiceBase::PUS_DISTRIBUTOR = objects::NO_OBJECT;
PusServiceBase::PACKET_DESTINATION = objects::NO_OBJECT; PusServiceBase::PACKET_DESTINATION = objects::NO_OBJECT;
CommandingServiceBase::defaultPacketSource = objects::NO_OBJECT; CommandingServiceBase::defaultPacketSource = objects::NO_OBJECT;

11
scripts/auto-formatter.sh
View File

@ -3,6 +3,11 @@ if [[ ! -f README.md ]]; then
cd .. cd ..
fi fi
folder_list=(
"./src"
"./unittests"
)
cmake_fmt="cmake-format" cmake_fmt="cmake-format"
file_selectors="-iname CMakeLists.txt" file_selectors="-iname CMakeLists.txt"
if command -v ${cmake_fmt} &> /dev/null; then if command -v ${cmake_fmt} &> /dev/null; then
@ -16,8 +21,10 @@ fi
cpp_format="clang-format" cpp_format="clang-format"
file_selectors="-iname *.h -o -iname *.cpp -o -iname *.c -o -iname *.tpp" file_selectors="-iname *.h -o -iname *.cpp -o -iname *.c -o -iname *.tpp"
if command -v ${cpp_format} &> /dev/null; then if command -v ${cpp_format} &> /dev/null; then
find ./src ${file_selectors} | xargs ${cpp_format} --style=file -i for dir in ${folder_list[@]}; do
find ./unittests ${file_selectors} | xargs ${cpp_format} --style=file -i echo "Auto-formatting ${dir} recursively"
find ${dir} ${file_selectors} | xargs clang-format --style=file -i
done
else else
echo "No ${cpp_format} tool found, not formatting C++/C files" echo "No ${cpp_format} tool found, not formatting C++/C files"
fi fi

5
src/fsfw/pus/Service11TelecommandScheduling.tpp
View File

@ -583,10 +583,11 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
} }
// additional security check, this should never be true // additional security check, this should never be true
if (itBegin->first > itEnd->first) { if (itBegin > itEnd) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "11::getMapFilterFromData: itBegin > itEnd\n" << std::endl;
#else #else
sif::printError("11::GetMapFilterFromData: itBegin > itEnd\n"); sif::printError("11::getMapFilterFromData: itBegin > itEnd\n");
#endif #endif
return returnvalue::FAILED; return returnvalue::FAILED;
} }

14
src/fsfw/timemanager/CCSDSTime.h
View File

@ -39,13 +39,13 @@ class CCSDSTime {
* Struct for CDS day-segmented format. * Struct for CDS day-segmented format.
*/ */
struct CDS_short { struct CDS_short {
uint8_t pField; uint8_t pField = P_FIELD_CDS_SHORT;
uint8_t dayMSB; uint8_t dayMSB = 0;
uint8_t dayLSB; uint8_t dayLSB = 0;
uint8_t msDay_hh; uint8_t msDay_hh = 0;
uint8_t msDay_h; uint8_t msDay_h = 0;
uint8_t msDay_l; uint8_t msDay_l = 0;
uint8_t msDay_ll; uint8_t msDay_ll = 0;
}; };
/** /**
* Struct for the CCS fromat in day of month variation with max resolution * Struct for the CCS fromat in day of month variation with max resolution

2
src/fsfw/tmtcservices/VerificationCodes.h
View File

@ -5,7 +5,7 @@
namespace tcverif { namespace tcverif {
enum VerifFlags : uint8_t { enum VerificationFlags : uint8_t {
NONE = 0b0000, NONE = 0b0000,
ACCEPTANCE = 0b0001, ACCEPTANCE = 0b0001,
START = 0b0010, START = 0b0010,

9
unittests/datapoollocal/CMakeLists.txt
View File

@ -1,3 +1,6 @@
target_sources( target_sources(${FSFW_TEST_TGT} PRIVATE
${FSFW_TEST_TGT} PRIVATE testLocalPoolVariable.cpp testLocalPoolVector.cpp testLocalPoolVariable.cpp
testDataSet.cpp testLocalPoolManager.cpp) testLocalPoolVector.cpp
testDataSet.cpp
testLocalPoolManager.cpp
)