auto-formatter

bsp_q7s/core/ObjectFactory.cpp

@@ -756,9 +756,9 @@ ReturnValue_t ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF,
       new AxiPtmeConfig(objects::AXI_PTME_CONFIG, q7s::UIO_PTME, q7s::uiomapids::PTME_CONFIG);
   PtmeConfig* ptmeConfig = new PtmeConfig(objects::PTME_CONFIG, axiPtmeConfig);
 
-  *ipCoreHandler = new CcsdsIpCoreHandler(
+  *ipCoreHandler = new CcsdsIpCoreHandler(objects::CCSDS_HANDLER, objects::PTME,
-      objects::CCSDS_HANDLER, objects::PTME, objects::CCSDS_PACKET_DISTRIBUTOR, ptmeConfig,
+                                          objects::CCSDS_PACKET_DISTRIBUTOR, ptmeConfig, gpioComIF,
-      gpioComIF, gpioIds::RS485_EN_TX_CLOCK, gpioIds::RS485_EN_TX_DATA);
+                                          gpioIds::RS485_EN_TX_CLOCK, gpioIds::RS485_EN_TX_DATA);
   VirtualChannel* vc = nullptr;
   vc = new VirtualChannel(ccsds::VC0, config::VC0_QUEUE_SIZE, objects::CCSDS_HANDLER);
   (*ipCoreHandler)->addVirtualChannel(ccsds::VC0, vc);

linux/devices/CMakeLists.txt

@@ -3,7 +3,8 @@ if(EIVE_BUILD_GPSD_GPS_HANDLER)
 endif()
 
 target_sources(
-  ${OBSW_NAME} PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp ImtqPollingTask.cpp
+  ${OBSW_NAME}
+  PRIVATE Max31865RtdPolling.cpp ScexUartReader.cpp ImtqPollingTask.cpp
           ScexDleParser.cpp ScexHelper.cpp RwPollingTask.cpp)
 
 add_subdirectory(ploc)

mission/system/objects/ComSubsystem.cpp

@@ -10,7 +10,6 @@
 
 #include <utility>
 
-
 ComSubsystem::ComSubsystem(object_id_t setObjectId, uint32_t maxNumberOfSequences,
                            uint32_t maxNumberOfTables, uint32_t transmitterTimeout)
     : Subsystem(setObjectId, maxNumberOfSequences, maxNumberOfTables), paramHelper(this) {

mission/system/objects/ComSubsystem.h

@@ -1,10 +1,10 @@
 #ifndef MISSION_SYSTEM_COMSUBSYSTEM_H_
 #define MISSION_SYSTEM_COMSUBSYSTEM_H_
 
+#include <fsfw/events/EventMessage.h>
 #include <fsfw/parameters/HasParametersIF.h>
 #include <fsfw/parameters/ParameterHelper.h>
 #include <fsfw/subsystem/Subsystem.h>
-#include <fsfw/events/EventMessage.h>
 
 #include "mission/comDefs.h"
 
@@ -17,7 +17,8 @@ class ComSubsystem : public Subsystem, public ReceivesParameterMessagesIF {
    * @param maxNumberOfSequences
    * @param maxNumberOfTables
    * @param transmitterTimeout	Maximum time the transmitter of the syrlinks
-	 * 														will be enabled
+   * 														will be
+   * enabled
    */
   ComSubsystem(object_id_t setObjectId, uint32_t maxNumberOfSequences, uint32_t maxNumberOfTables,
                uint32_t transmitterTimeout);
@@ -30,7 +31,6 @@ class ComSubsystem : public Subsystem, public ReceivesParameterMessagesIF {
   virtual void performChildOperation() override;
 
  private:
-
   static const Mode_t INITIAL_MODE = 0;
 
   ReturnValue_t handleCommandMessage(CommandMessage *message) override;

mission/system/tree/comModeTree.cpp

@@ -10,7 +10,8 @@
 
 const auto check = subsystem::checkInsert;
 
-ComSubsystem satsystem::com::SUBSYSTEM = ComSubsystem(objects::COM_SUBSYSTEM, 12, 24, TRANSMITTER_TIMEOUT);
+ComSubsystem satsystem::com::SUBSYSTEM =
+    ComSubsystem(objects::COM_SUBSYSTEM, 12, 24, TRANSMITTER_TIMEOUT);
 
 static const auto OFF = HasModesIF::MODE_OFF;
 static const auto ON = HasModesIF::MODE_ON;
@@ -18,39 +19,48 @@ static const auto NML = DeviceHandlerIF::MODE_NORMAL;
 
 auto COM_SEQUENCE_RX_ONLY =
     std::make_pair(::com::Submode::RX_ONLY, FixedArrayList<ModeListEntry, 3>());
-auto COM_TABLE_RX_ONLY_TGT =
+auto COM_TABLE_RX_ONLY_TGT = std::make_pair(
-    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_ONLY << 24) | 1, FixedArrayList<ModeListEntry, 3>());
+    static_cast<uint32_t>(::com::Submode::RX_ONLY << 24) | 1, FixedArrayList<ModeListEntry, 3>());
-auto COM_TABLE_RX_ONLY_TRANS_0 =
+auto COM_TABLE_RX_ONLY_TRANS_0 = std::make_pair(
-    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_ONLY << 24) | 2, FixedArrayList<ModeListEntry, 3>());
+    static_cast<uint32_t>(::com::Submode::RX_ONLY << 24) | 2, FixedArrayList<ModeListEntry, 3>());
-auto COM_TABLE_RX_ONLY_TRANS_1 =
+auto COM_TABLE_RX_ONLY_TRANS_1 = std::make_pair(
-    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_ONLY << 24) | 3, FixedArrayList<ModeListEntry, 3>());
+    static_cast<uint32_t>(::com::Submode::RX_ONLY << 24) | 3, FixedArrayList<ModeListEntry, 3>());
 
 auto COM_SEQUENCE_RX_AND_TX_LOW_RATE =
     std::make_pair(::com::Submode::RX_AND_TX_LOW_DATARATE, FixedArrayList<ModeListEntry, 3>());
-auto COM_TABLE_RX_AND_TX_LOW_RATE_TGT = std::make_pair(
+auto COM_TABLE_RX_AND_TX_LOW_RATE_TGT =
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_LOW_DATARATE << 24) | 1, FixedArrayList<ModeListEntry, 3>());
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_LOW_DATARATE << 24) | 1,
-auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_0 = std::make_pair(
+                   FixedArrayList<ModeListEntry, 3>());
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_LOW_DATARATE << 24) | 2, FixedArrayList<ModeListEntry, 3>());
+auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_0 =
-auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_1 = std::make_pair(
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_LOW_DATARATE << 24) | 2,
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_LOW_DATARATE << 24) | 3, FixedArrayList<ModeListEntry, 3>());
+                   FixedArrayList<ModeListEntry, 3>());
+auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_1 =
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_LOW_DATARATE << 24) | 3,
+                   FixedArrayList<ModeListEntry, 3>());
 
 auto COM_SEQUENCE_RX_AND_TX_HIGH_RATE =
     std::make_pair(::com::Submode::RX_AND_TX_HIGH_DATARATE, FixedArrayList<ModeListEntry, 3>());
-auto COM_TABLE_RX_AND_TX_HIGH_RATE_TGT = std::make_pair(
+auto COM_TABLE_RX_AND_TX_HIGH_RATE_TGT =
-    static_cast<uint32_t>(::com::Submode::RX_AND_TX_HIGH_DATARATE << 24) | 1, FixedArrayList<ModeListEntry, 3>());
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_HIGH_DATARATE << 24) | 1,
-auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_0 = std::make_pair(
+                   FixedArrayList<ModeListEntry, 3>());
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_HIGH_DATARATE << 24) | 2, FixedArrayList<ModeListEntry, 3>());
+auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_0 =
-auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_1 = std::make_pair(
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_HIGH_DATARATE << 24) | 2,
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_HIGH_DATARATE << 24) | 3, FixedArrayList<ModeListEntry, 3>());
+                   FixedArrayList<ModeListEntry, 3>());
+auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_1 =
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_HIGH_DATARATE << 24) | 3,
+                   FixedArrayList<ModeListEntry, 3>());
 
 auto COM_SEQUENCE_RX_AND_TX_DEFAULT_RATE =
     std::make_pair(::com::Submode::RX_AND_TX_DEFAULT_DATARATE, FixedArrayList<ModeListEntry, 3>());
-auto COM_TABLE_RX_AND_TX_DEFAULT_RATE_TGT = std::make_pair(
+auto COM_TABLE_RX_AND_TX_DEFAULT_RATE_TGT =
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_DEFAULT_DATARATE << 24) | 1, FixedArrayList<ModeListEntry, 3>());
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_DEFAULT_DATARATE << 24) | 1,
-auto COM_TABLE_RX_AND_TX_DEFAULT_RATE_TRANS_0 = std::make_pair(
+                   FixedArrayList<ModeListEntry, 3>());
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_DEFAULT_DATARATE << 24) | 2, FixedArrayList<ModeListEntry, 3>());
+auto COM_TABLE_RX_AND_TX_DEFAULT_RATE_TRANS_0 =
-auto COM_TABLE_RX_AND_TX_DEFAULT_RATE_TRANS_1 = std::make_pair(
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_DEFAULT_DATARATE << 24) | 2,
-		static_cast<uint32_t>(::com::Submode::RX_AND_TX_DEFAULT_DATARATE << 24) | 3, FixedArrayList<ModeListEntry, 3>());
+                   FixedArrayList<ModeListEntry, 3>());
+auto COM_TABLE_RX_AND_TX_DEFAULT_RATE_TRANS_1 =
+    std::make_pair(static_cast<uint32_t>(::com::Submode::RX_AND_TX_DEFAULT_DATARATE << 24) | 3,
+                   FixedArrayList<ModeListEntry, 3>());
 
 namespace {
 

mission/system/tree/comModeTree.h

@@ -1,8 +1,8 @@
 #ifndef MISSION_SYSTEM_TREE_COMMODETREE_H_
 #define MISSION_SYSTEM_TREE_COMMODETREE_H_
 
-#include <mission/system/objects/ComSubsystem.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
+#include <mission/system/objects/ComSubsystem.h>
 
 namespace satsystem {
 

mission/system/tree/system.cpp

@@ -3,10 +3,11 @@
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/subsystem/Subsystem.h>
 #include <mission/acsDefs.h>
-#include "mission/comDefs.h"
+
 #include "acsModeTree.h"
 #include "comModeTree.h"
 #include "eive/objects.h"
+#include "mission/comDefs.h"
 #include "payloadModeTree.h"
 #include "tcsModeTree.h"
 #include "util.h"