Merge branch 'develop' into mueller/move-archive-folder

linux/devices/startracker/StrHelper.cpp

@@ -6,8 +6,8 @@
 #include "OBSWConfig.h"
 #include "fsfw/timemanager/Countdown.h"
 #include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
-#include "mission/utility/Timestamp.h"
 #include "mission/utility/ProgressPrinter.h"
+#include "mission/utility/Timestamp.h"
 
 StrHelper::StrHelper(object_id_t objectId) : SystemObject(objectId) {}
 

linux/fsfwconfig/devices/gpioIds.h

@@ -1,126 +0,0 @@
-#ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_
-#define FSFWCONFIG_DEVICES_GPIOIDS_H_
-
-#include <fsfw_hal/common/gpio/GpioIF.h>
-
-namespace gpioIds {
-enum gpioId_t {
-  HEATER_0,
-  HEATER_1,
-  HEATER_2,
-  HEATER_3,
-  HEATER_4,
-  HEATER_5,
-  HEATER_6,
-  HEATER_7,
-  DEPLSA1,
-  DEPLSA2,
-
-  MGM_0_LIS3_CS,
-  MGM_1_RM3100_CS,
-  GYRO_0_ADIS_CS,
-  GYRO_1_L3G_CS,
-  GYRO_2_ADIS_CS,
-  GYRO_3_L3G_CS,
-  MGM_2_LIS3_CS,
-  MGM_3_RM3100_CS,
-
-  GNSS_0_NRESET,
-  GNSS_1_NRESET,
-  GNSS_0_ENABLE,
-  GNSS_1_ENABLE,
-  GNSS_SELECT,
-
-  GYRO_0_ENABLE,
-  GYRO_2_ENABLE,
-
-  TEST_ID_0,
-  TEST_ID_1,
-
-  RTD_IC_3,
-  RTD_IC_4,
-  RTD_IC_5,
-  RTD_IC_6,
-  RTD_IC_7,
-  RTD_IC_8,
-  RTD_IC_9,
-  RTD_IC_10,
-  RTD_IC_11,
-  RTD_IC_12,
-  RTD_IC_13,
-  RTD_IC_14,
-  RTD_IC_15,
-  RTD_IC_16,
-  RTD_IC_17,
-  RTD_IC_18,
-
-  CS_SUS_0,
-  CS_SUS_1,
-  CS_SUS_2,
-  CS_SUS_3,
-  CS_SUS_4,
-  CS_SUS_5,
-  CS_SUS_6,
-  CS_SUS_7,
-  CS_SUS_8,
-  CS_SUS_9,
-  CS_SUS_10,
-  CS_SUS_11,
-
-  SPI_MUX_BIT_0,
-  SPI_MUX_BIT_1,
-  SPI_MUX_BIT_2,
-  SPI_MUX_BIT_3,
-  SPI_MUX_BIT_4,
-  SPI_MUX_BIT_5,
-
-  CS_RAD_SENSOR,
-  ENABLE_RADFET,
-
-  PAPB_BUSY_N,
-  PAPB_EMPTY,
-
-  EN_RW1,
-  EN_RW2,
-  EN_RW3,
-  EN_RW4,
-
-  CS_RW1,
-  CS_RW2,
-  CS_RW3,
-  CS_RW4,
-
-  EN_RW_CS,
-
-  SPI_MUX,
-
-  VC0_PAPB_EMPTY,
-  VC0_PAPB_BUSY,
-  VC1_PAPB_EMPTY,
-  VC1_PAPB_BUSY,
-  VC2_PAPB_EMPTY,
-  VC2_PAPB_BUSY,
-  VC3_PAPB_EMPTY,
-  VC3_PAPB_BUSY,
-
-  PDEC_RESET,
-
-  RS485_EN_TX_DATA,
-  RS485_EN_TX_CLOCK,
-  RS485_EN_RX_DATA,
-  RS485_EN_RX_CLOCK,
-
-  BIT_RATE_SEL,
-
-  PLPCDU_ENB_VBAT0,
-  PLPCDU_ENB_VBAT1,
-  PLPCDU_ENB_DRO,
-  PLPCDU_ENB_X8,
-  PLPCDU_ENB_TX,
-  PLPCDU_ENB_HPA,
-  PLPCDU_ENB_MPA,
-  PLPCDU_ADC_CS
-};
-}
-
-#endif /* FSFWCONFIG_DEVICES_GPIOIDS_H_ */

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 141 translations.
  * @details
- * Generated on: 2022-03-01 18:04:34
+ * Generated on: 2022-03-04 15:13:02
  */
 #include "translateEvents.h"
 
@@ -148,7 +148,7 @@ const char *STR_HELPER_SENDING_PACKET_FAILED_STRING = "STR_HELPER_SENDING_PACKET
 const char *STR_HELPER_REQUESTING_MSG_FAILED_STRING = "STR_HELPER_REQUESTING_MSG_FAILED";
 
 const char *translateEvents(Event event) {
-  switch((event & 0xFFFF)) {
+  switch ((event & 0xFFFF)) {
     case (2200):
       return STORE_SEND_WRITE_FAILED_STRING;
     case (2201):

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 112 translations.
- * Generated on: 2022-03-01 18:04:38
+ * Generated on: 2022-03-04 15:13:13
  */
 #include "translateObjects.h"