From 8ef6283bf4f5cf5d12131c48365a753825fea637 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Dec 2020 14:10:38 +0100 Subject: [PATCH 1/7] added srv3 --- pus/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pus/CMakeLists.txt b/pus/CMakeLists.txt index 758c2629..c0e00448 100644 --- a/pus/CMakeLists.txt +++ b/pus/CMakeLists.txt @@ -5,6 +5,7 @@ target_sources(${LIB_FSFW_NAME} Service17Test.cpp Service1TelecommandVerification.cpp Service2DeviceAccess.cpp + Service3Housekeeping.cpp Service5EventReporting.cpp Service8FunctionManagement.cpp Service9TimeManagement.cpp From 1ac2479b28c1114b0876123e0db4155abfbf06fe Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Dec 2020 18:06:25 +0100 Subject: [PATCH 2/7] made warning flag optional --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02849ca4..aaf9a8af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,11 +110,18 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(WARNING_FLAGS -Wall -Wextra - -Wshadow=local -Wimplicit-fallthrough=1 -Wno-unused-parameter -Wno-psabi ) + + if(NOT DEFINED WARNING_SHADOW_LOCAL) + option(WARNING_SHADOW_LOCAL "Show shadows declarations warning." ON) + endif() + + if(WARNING_SHADOW_LOCAL) + list(APPEND WARNING_FLAGS "-Wshadow=local") + endif() endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") From b23309a5f4f1b73f86ee5d560f830e551e4b1e5e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 19 Jan 2021 16:30:17 +0100 Subject: [PATCH 3/7] improved options --- CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6911f61..9dbd24cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required(VERSION 3.13) +option(FSFW_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON) +# Options to exclude parts of the FSFW from compilation. +option(FSFW_USE_RMAP "Compile with RMAP" ON) +option(FSFW_USE_DATALINKLAYER "Compile with Data Link Layer" ON) + set(LIB_FSFW_NAME fsfw) add_library(${LIB_FSFW_NAME}) @@ -40,9 +45,7 @@ endif() message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.") -# Options to exclude parts of the FSFW from compilation. -option(FSFW_USE_RMAP "Compile with RMAP" ON) -option(FSFW_USE_DATALINKLAYER "Compile with Data Link Layer" ON) + add_subdirectory(action) add_subdirectory(container) @@ -116,12 +119,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -Wno-unused-parameter -Wno-psabi ) - - if(NOT DEFINED WARNING_SHADOW_LOCAL) - option(WARNING_SHADOW_LOCAL "Show shadows declarations warning." ON) - endif() - if(WARNING_SHADOW_LOCAL) + if(FSFW_WARNING_SHADOW_LOCAL_GCC) list(APPEND WARNING_FLAGS "-Wshadow=local") endif() From 2e9a85518187bc6256cfeb5890a3252be2d2b629 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 19 Jan 2021 16:33:01 +0100 Subject: [PATCH 4/7] updating cmakelists --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dbd24cb..80bb11bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,6 @@ endif() message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.") - - add_subdirectory(action) add_subdirectory(container) add_subdirectory(controller) From e0f8113eac7f4628cab072aa000a717572fa3336 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 19 Jan 2021 16:39:12 +0100 Subject: [PATCH 5/7] added missing endif --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dbd24cb..e18e3ede 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,10 +119,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -Wno-unused-parameter -Wno-psabi ) - - if(FSFW_WARNING_SHADOW_LOCAL_GCC) - list(APPEND WARNING_FLAGS "-Wshadow=local") - endif() + endif() + + if(FSFW_WARNING_SHADOW_LOCAL_GCC) + list(APPEND WARNING_FLAGS "-Wshadow=local") + endif() endif() From 50733e223adaf9fc95d9728c62a026ea6efac1d2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 19 Jan 2021 16:42:18 +0100 Subject: [PATCH 6/7] small fix --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70836d9e..3b0917fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(FSFW_WARNING_FLAGS -Wall -Wextra - -Wshadow=local -Wimplicit-fallthrough=1 -Wno-unused-parameter -Wno-psabi From 8850b770ee0b6e49a8627136fa69c7d190adc287 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 24 Jan 2021 17:03:03 +0100 Subject: [PATCH 7/7] important bugfix --- housekeeping/HousekeepingMessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/housekeeping/HousekeepingMessage.cpp b/housekeeping/HousekeepingMessage.cpp index 221f0a6f..5d732961 100644 --- a/housekeeping/HousekeepingMessage.cpp +++ b/housekeeping/HousekeepingMessage.cpp @@ -176,7 +176,7 @@ void HousekeepingMessage::setUpdateNotificationVariableCommand( void HousekeepingMessage::setUpdateSnapshotSetCommand(CommandMessage *command, sid_t sid, store_address_t storeId) { - command->setCommand(UPDATE_SNAPSHOT_VARIABLE); + command->setCommand(UPDATE_SNAPSHOT_SET); setSid(command, sid); command->setParameter3(storeId.raw); }