Merge remote-tracking branch 'upstream/development' into mueller/storage-man-update

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,10 +45,6 @@ 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)
 add_subdirectory(controller)
@@ -111,12 +112,16 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	   set(FSFW_WARNING_FLAGS
 		  -Wall
 		  -Wextra
-		  -Wshadow=local
 		  -Wimplicit-fallthrough=1
 		  -Wno-unused-parameter
 		  -Wno-psabi
         )
-	endif()
+    endif()
+        
+    if(FSFW_WARNING_SHADOW_LOCAL_GCC)
+        list(APPEND WARNING_FLAGS "-Wshadow=local")
+    endif()
+	
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")

datapool/PoolReadHelper.h

@@ -1,7 +1,7 @@
-#ifndef FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_
-#define FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_
+#ifndef FSFW_DATAPOOL_POOLREADHELPER_H_
+#define FSFW_DATAPOOL_POOLREADHELPER_H_
 
-#include "LocalPoolDataSetBase.h"
+#include "ReadCommitIF.h"
 #include "../serviceinterface/ServiceInterface.h"
 #include <FSFWConfig.h>
 
@@ -48,4 +48,4 @@ private:
 
 
 
-#endif /* FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ */
+#endif /* FSFW_DATAPOOL_POOLREADHELPER_H_ */

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);
 }