apply auto-formatter

.run/fsfw-example-hosted.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
+  <configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Release" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
     <method v="2">
       <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
     </method>

CMakeLists.txt

@@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.13)
 
 # set(CMAKE_VERBOSE TRUE)
 
-set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 if(NOT FSFW_OSAL)
   set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")
@@ -173,5 +173,5 @@ add_custom_command(
   COMMENT ${POST_BUILD_COMMENT}
 )
 
-include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
+include (BuildType)
 set_build_type()

bsp_hosted/core/InitMission.cpp

@@ -1,12 +1,7 @@
 #include <OBSWConfig.h>
-
 #include <bsp_hosted/core/InitMission.h>
 #include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
 #include <bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.h>
-#include "example/utility/TaskCreation.h"
-
-#include "fsfw_tests/integration/assemblies/TestAssembly.h"
-
 #include <fsfw/modes/HasModesIF.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
@@ -14,12 +9,13 @@
 #include <fsfw/tasks/PeriodicTaskIF.h>
 #include <fsfw/tasks/TaskFactory.h>
 
+#include "example/utility/TaskCreation.h"
+#include "fsfw_tests/integration/assemblies/TestAssembly.h"
 
 #ifdef _WIN32
 #include <fsfw/osal/windows/winTaskHelpers.h>
 #endif
 
-
 void InitMission::createTasks() {
   TaskFactory* taskFactory = TaskFactory::instance();
   if (taskFactory == nullptr) {
@@ -44,8 +40,7 @@ void InitMission::createTasks() {
   /* TMTC Distribution */
   PeriodicTaskIF* distributerTask = taskFactory->createPeriodicTask(
       "DIST", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.1, deadlineMissedFunc);
-    ReturnValue_t result = distributerTask->addComponent(
+  ReturnValue_t result = distributerTask->addComponent(objects::CCSDS_DISTRIBUTOR);
-            objects::CCSDS_DISTRIBUTOR);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     task::printInitError("CCSDS distributor", objects::CCSDS_DISTRIBUTOR);
   }
@@ -63,9 +58,7 @@ void InitMission::createTasks() {
 #endif
   /* UDP bridge */
   PeriodicTaskIF* udpBridgeTask = taskFactory->createPeriodicTask(
-            "TCPIP_TMTC_BRIDGE", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2,
+      "TCPIP_TMTC_BRIDGE", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, deadlineMissedFunc);
-            deadlineMissedFunc
-    );
   result = udpBridgeTask->addComponent(objects::TCPIP_TMTC_BRIDGE);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     task::printInitError("TMTC bridge", objects::TCPIP_TMTC_BRIDGE);
@@ -75,8 +68,7 @@ void InitMission::createTasks() {
   currPrio = 80;
 #endif
   PeriodicTaskIF* udpPollingTask = taskFactory->createPeriodicTask(
-            "TMTC_POLLING", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, deadlineMissedFunc
+      "TMTC_POLLING", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, deadlineMissedFunc);
-    );
   result = udpPollingTask->addComponent(objects::TCPIP_TMTC_POLLING_TASK);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     task::printInitError("TMTC polling", objects::TCPIP_TMTC_POLLING_TASK);
@@ -86,8 +78,7 @@ void InitMission::createTasks() {
   currPrio = 20;
 #endif
   PeriodicTaskIF* eventTask = taskFactory->createPeriodicTask(
-            "EVENT", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.100, deadlineMissedFunc
+      "EVENT", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.100, deadlineMissedFunc);
-    );
   result = eventTask->addComponent(objects::EVENT_MANAGER);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     task::printInitError("Event Manager", objects::EVENT_MANAGER);
@@ -104,8 +95,8 @@ void InitMission::createTasks() {
   result = pst::pollingSequenceExamples(timeslotDemoTask);
   if (result != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::error << "InitMission::createTasks: Timeslot demo task initialization failed!" <<
+    sif::error << "InitMission::createTasks: Timeslot demo task initialization failed!"
-                std::endl;
+               << std::endl;
 #else
     sif::printError("InitMission::createTasks: Timeslot demo task initialization failed!\n");
 #endif
@@ -122,7 +113,6 @@ void InitMission::createTasks() {
   }
 #endif /* OBSW_ADD_TASK_EXAMPLE == 1 */
 
-
 #if OBSW_ADD_PUS_STACK == 1
   /* PUS Services */
 #ifdef __unix__
@@ -190,8 +180,8 @@ void InitMission::createTasks() {
 #ifdef __unix__
   currPrio = 60;
 #elif _WIN32
-    currPrio = tasks::makeWinPriority(tasks::PriorityClass::CLASS_HIGH,
+  currPrio =
-            tasks::PriorityNumber::HIGHEST);
+      tasks::makeWinPriority(tasks::PriorityClass::CLASS_HIGH, tasks::PriorityNumber::HIGHEST);
 #endif
   FixedTimeslotTaskIF* testDevicesTimeslotTask = taskFactory->createFixedTimeslotTask(
       "PST_TEST_TASK", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, deadlineMissedFunc);
@@ -202,15 +192,14 @@ void InitMission::createTasks() {
 #else
     sif::printError("InitMission::createTasks: Test PST initialization failed!\n");
 #endif
-
   }
 
 #if _WIN32
   currPrio = tasks::makeWinPriority();
 #endif
 
-    PeriodicTaskIF* assemblyTask = taskFactory->createPeriodicTask("ASS_TASK", currPrio,
+  PeriodicTaskIF* assemblyTask = taskFactory->createPeriodicTask(
-            PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, nullptr);
+      "ASS_TASK", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, nullptr);
   if (assemblyTask == nullptr) {
     task::printInitError("ASS_TASK", objects::TEST_ASSEMBLY);
   }
@@ -290,5 +279,3 @@ void InitMission::createTasks() {
   }
 #endif /* OBSW_ADD_DEVICE_HANDLER_DEMO */
 }
-
-

bsp_hosted/core/ObjectFactory.cpp

@@ -1,26 +1,26 @@
 #include "ObjectFactory.h"
-#include "OBSWConfig.h"
+
 #include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
 #include <bsp_hosted/fsfwconfig/tmtc/apid.h>
 #include <bsp_hosted/fsfwconfig/tmtc/pusIds.h>
-
+#include <fsfw/datapoollocal/LocalDataPoolManager.h>
-#include "example/test/FsfwTestTask.h"
-#include "example/utility/TmFunnel.h"
-#include "example/core/GenericFactory.h"
-
 #include <fsfw/monitoring/MonitoringMessageContent.h>
 #include <fsfw/storagemanager/PoolManager.h>
-#include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcpacket/pus/tm.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
 
+#include "OBSWConfig.h"
+#include "example/core/GenericFactory.h"
+#include "example/test/FsfwTestTask.h"
+#include "example/utility/TmFunnel.h"
+
 #if OBSW_USE_TCP_SERVER == 0
 #include <fsfw/osal/common/UdpTcPollingTask.h>
 #include <fsfw/osal/common/UdpTmTcBridge.h>
 #else
-#include "fsfw/osal/common/TcpTmTcServer.h"
 #include "fsfw/osal/common/TcpTmTcBridge.h"
+#include "fsfw/osal/common/TcpTmTcServer.h"
 #endif
 
 void ObjectFactory::produce(void* args) {
@@ -28,23 +28,17 @@ void ObjectFactory::produce(void* args) {
 
 #if OBSW_ADD_CORE_COMPONENTS == 1
   {
-        LocalPool::LocalPoolConfig poolCfg = {
+    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
-                {16, 100}, {32, 50}, {64, 25}, {128,15}, {1024, 5}
-        };
     new PoolManager(objects::TC_STORE, poolCfg);
   }
 
   {
-        LocalPool::LocalPoolConfig poolCfg = {
+    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
-                {16, 100}, {32, 50}, {64, 25}, {128,15}, {1024, 5}
-        };
     new PoolManager(objects::TM_STORE, poolCfg);
   }
 
   {
-        LocalPool::LocalPoolConfig poolCfg = {
+    LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
-                {16, 100}, {32, 50}, {64, 25}, {128,15}, {1024, 5}
-        };
     new PoolManager(objects::IPC_STORE, poolCfg);
   }
 

bsp_hosted/core/ObjectFactory.h

@@ -6,7 +6,6 @@ namespace ObjectFactory {
 void setStatics();
 void produce(void* args);
 
-};
+};  // namespace ObjectFactory
-
 
 #endif /* MISSION_CORE_OBJECTFACTORY_H_ */

bsp_hosted/fsfwconfig/events/subsystemIdRanges.h

@@ -4,8 +4,7 @@
 #include "commonSubsystemIds.h"
 
 namespace SUBSYSTEM_ID {
-enum subsystemId: uint8_t {
+enum subsystemId : uint8_t {};
-};
 }
 
 #endif /* FSFWCONFIG_TMTC_SUBSYSTEMIDRANGES_H_ */

bsp_hosted/fsfwconfig/ipc/missionMessageTypes.cpp

@@ -1,4 +1,5 @@
 #include "missionMessageTypes.h"
+
 #include <fsfw/ipc/CommandMessage.h>
 #include <fsfw/ipc/CommandMessageCleaner.h>
 

bsp_hosted/fsfwconfig/ipc/missionMessageTypes.h

@@ -14,6 +14,6 @@ enum MISSION_MESSAGE_TYPE {
 
 void clearMissionMessage(CommandMessage* message);
 
-}
+}  // namespace messagetypes
 
 #endif /* FSFWCONFIG_IPC_MISSIONMESSAGETYPES_H_ */

bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp

@@ -2,4 +2,3 @@
  * Add polling sequence initialization which are not common to every BSP here.
  */
 #include "pollingSequenceFactory.h"
-

bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.h

@@ -1,14 +1,15 @@
 #ifndef POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_
 #define POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_
 
-#include "OBSWConfig.h"
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
+#include "OBSWConfig.h"
+
 class FixedTimeslotTaskIF;
 
 namespace pst {
 ReturnValue_t pollingSequenceExamples(FixedTimeslotTaskIF* thisSequence);
 ReturnValue_t pollingSequenceDevices(FixedTimeslotTaskIF* thisSequence);
-}
+}  // namespace pst
 
 #endif /* POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_ */

bsp_hosted/fsfwconfig/returnvalues/classIds.h

@@ -10,5 +10,4 @@ enum classIds: uint8_t {
 };
 }
 
-
 #endif /* FSFWCONFIG_RETURNVALUES_CLASSIDS_H_ */

bsp_hosted/fsfwconfig/tmtc/apid.h

@@ -1,9 +1,10 @@
 #ifndef FSFWCONFIG_TMTC_APID_H_
 #define FSFWCONFIG_TMTC_APID_H_
 
-#include <cstdint>
 #include <commonConfig.h>
 
+#include <cstdint>
+
 namespace apid {
 static const uint16_t APID = COMMON_APID;
 };

bsp_hosted/fsfwconfig/tmtc/pusIds.h

@@ -3,5 +3,4 @@
 
 #include <commonConfig.h>
 
-
 #endif /* FSFWCONFIG_TMTC_PUSIDS_H_ */

bsp_hosted/main.cpp

@@ -1,16 +1,15 @@
 #include <bsp_hosted/core/InitMission.h>
 #include <bsp_hosted/core/ObjectFactory.h>
-
-#include "example/test/MutexExample.h"
-#include "example/utility/utility.h"
-
-#include <fsfw/platform.h>
 #include <fsfw/objectmanager/ObjectManager.h>
+#include <fsfw/platform.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <fsfw/tasks/TaskFactory.h>
 
 #include <chrono>
 
+#include "example/test/MutexExample.h"
+#include "example/utility/utility.h"
+
 #ifdef PLATFORM_WIN
 static const char* COMPILE_PRINTOUT = "Windows";
 #elif defined(PLATFORM_UNIX)
@@ -27,7 +26,6 @@ ServiceInterfaceStream sif::error("ERROR", false, true, true);
 #endif
 
 int main() {
-
   utility::commonInitPrint("Hosted", COMPILE_PRINTOUT);
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1

bsp_hosted/utility/printChar.c

@@ -1,13 +1,10 @@
-#include <stdio.h>
 #include <stdbool.h>
-
+#include <stdio.h>
 
 void printChar(const char* character, bool errStream) {
   if (errStream) {
     fprintf(stderr, "%c", *character);
-	}
+  } else {
-	else {
     printf("%c", *character);
   }
 }
-

example_common

@@ -1 +1 @@
-Subproject commit c2a9db8ac8f7d8a153673a1c4d74a8d56922b56b
+Subproject commit c88a534e1c48387c6de584a4c9b0b75a81f9eeba

scripts/apply-clang-format.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+if [[ ! -f README.md ]]; then
+	cd ..
+fi
+
+find ./bsp_hosted -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
+find ./example_common -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i