Merge pull request 'Tweaks PAPB polling' (#533) from tweaks_papb_polling into develop

Reviewed-on: #533

CHANGELOG.md

@@ -21,6 +21,12 @@ will consitute of a breaking change warranting a new major release:
 - Proper Faulty/External Control handling for the dual lane assemblies.
 - ACS board devices: Go to ON mode instead of going to NORMAL mode directly.
 - SUS device handlers: Go to ON mode on startup instead of NORMAL mode.
+- Tweaks for the delay handling for the persistent TM stores. This allows pushing the full
+  high datarate when dumping telemetry. The most important and interesting fix is that
+  there needs to be a small delay between the polling of the GPIO. Polling the GPIO
+  without any delay consecutively can lead to scheduling issues.
+- Bump FSFW for fix of `ControllerBase` class `startTransition` implementation.
+- Bump FSFW for possible fix of `PowerSwitcherComponent`: Initial mode `MODE_UNDEFINED`.
 
 ## Changed
 

bsp_hosted/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 279 translations.
+ * @brief    Auto-generated event translation file. Contains 283 translations.
  * @details
- * Generated on: 2023-03-26 16:40:57
+ * Generated on: 2023-03-28 21:50:28
  */
 #include "translateEvents.h"
 
@@ -212,8 +212,7 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_
 const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900";
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901";
 const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING =
+const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
-    "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
 const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *CANT_GET_FIX_STRING = "CANT_GET_FIX";
@@ -279,12 +278,16 @@ const char *BIT_LOCK_TX_ON_STRING = "BIT_LOCK_TX_ON";
 const char *POSSIBLE_FILE_CORRUPTION_STRING = "POSSIBLE_FILE_CORRUPTION";
 const char *FILE_TOO_LARGE_STRING = "FILE_TOO_LARGE";
 const char *BUSY_DUMPING_EVENT_STRING = "BUSY_DUMPING_EVENT";
-const char *DUMP_WAS_CANCELLED_STRING = "DUMP_WAS_CANCELLED";
 const char *DUMP_OK_STORE_DONE_STRING = "DUMP_OK_STORE_DONE";
 const char *DUMP_NOK_STORE_DONE_STRING = "DUMP_NOK_STORE_DONE";
 const char *DUMP_MISC_STORE_DONE_STRING = "DUMP_MISC_STORE_DONE";
 const char *DUMP_HK_STORE_DONE_STRING = "DUMP_HK_STORE_DONE";
 const char *DUMP_CFDP_STORE_DONE_STRING = "DUMP_CFDP_STORE_DONE";
+const char *DUMP_OK_CANCELLED_STRING = "DUMP_OK_CANCELLED";
+const char *DUMP_NOK_CANCELLED_STRING = "DUMP_NOK_CANCELLED";
+const char *DUMP_MISC_CANCELLED_STRING = "DUMP_MISC_CANCELLED";
+const char *DUMP_HK_CANCELLED_STRING = "DUMP_HK_CANCELLED";
+const char *DUMP_CFDP_CANCELLED_STRING = "DUMP_CFDP_CANCELLED";
 
 const char *translateEvents(Event event) {
   switch ((event & 0xFFFF)) {
@@ -834,8 +837,6 @@ const char *translateEvents(Event event) {
       return FILE_TOO_LARGE_STRING;
     case (14302):
       return BUSY_DUMPING_EVENT_STRING;
-    case (14303):
-      return DUMP_WAS_CANCELLED_STRING;
     case (14305):
       return DUMP_OK_STORE_DONE_STRING;
     case (14306):
@@ -846,6 +847,16 @@ const char *translateEvents(Event event) {
       return DUMP_HK_STORE_DONE_STRING;
     case (14309):
       return DUMP_CFDP_STORE_DONE_STRING;
+    case (14310):
+      return DUMP_OK_CANCELLED_STRING;
+    case (14311):
+      return DUMP_NOK_CANCELLED_STRING;
+    case (14312):
+      return DUMP_MISC_CANCELLED_STRING;
+    case (14313):
+      return DUMP_HK_CANCELLED_STRING;
+    case (14314):
+      return DUMP_CFDP_CANCELLED_STRING;
     default:
       return "UNKNOWN_EVENT";
   }

bsp_hosted/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 169 translations.
- * Generated on: 2023-03-26 16:40:57
+ * Generated on: 2023-03-28 21:50:28
  */
 #include "translateObjects.h"
 

bsp_q7s/core/ObjectFactory.cpp

@@ -808,14 +808,14 @@ ReturnValue_t ObjectFactory::createCcsdsComponents(CcsdsComponentArgs& args) {
   // Core task which handles the HK store and takes care of dumping it as TM using a VC directly
   new PersistentSingleTmStoreTask(objects::HK_STORE_AND_TM_TASK, args.ipcStore,
                                   *args.stores.hkStore, *vc, persTmStore::DUMP_HK_STORE_DONE,
-                                  *SdCardManager::instance());
+                                  persTmStore::DUMP_HK_STORE_DONE, *SdCardManager::instance());
 
   vc = new VirtualChannel(objects::PTME_VC3_CFDP_TM, ccsds::VC3, "PTME VC3 CFDP TM", *ptme,
                           LINK_STATE);
   // Core task which handles the CFDP store and takes care of dumping it as TM using a VC directly
   new PersistentSingleTmStoreTask(objects::CFDP_STORE_AND_TM_TASK, args.ipcStore,
                                   *args.stores.cfdpStore, *vc, persTmStore::DUMP_CFDP_STORE_DONE,
-                                  *SdCardManager::instance());
+                                  persTmStore::DUMP_CFDP_CANCELLED, *SdCardManager::instance());
 
   ReturnValue_t result = (*args.ipCoreHandler)->connectModeTreeParent(satsystem::com::SUBSYSTEM);
   if (result != returnvalue::OK) {

fsfw

@@ -1 +1 @@
-Subproject commit 314f0fa2cde749ee1021d311e222bb0044cc2e5b
+Subproject commit 4f632e2c6866cee88dd9920a965aa0d079799aa3

generators/bsp_hosted_events.csv

@@ -272,9 +272,13 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h
 14301;0x37dd;FILE_TOO_LARGE;LOW;File in store too large. P1: Detected file size P2: Allowed file size;mission/persistentTmStoreDefs.h
 14302;0x37de;BUSY_DUMPING_EVENT;INFO;No description;mission/persistentTmStoreDefs.h
-14303;0x37df;DUMP_WAS_CANCELLED;LOW;Dump was cancelled. P1: Object ID of store.;mission/persistentTmStoreDefs.h
 14305;0x37e1;DUMP_OK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14306;0x37e2;DUMP_NOK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14307;0x37e3;DUMP_MISC_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14308;0x37e4;DUMP_HK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14309;0x37e5;DUMP_CFDP_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14310;0x37e6;DUMP_OK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14311;0x37e7;DUMP_NOK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14312;0x37e8;DUMP_MISC_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14313;0x37e9;DUMP_HK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14314;0x37ea;DUMP_CFDP_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h

generators/bsp_hosted_returnvalues.csv

@@ -291,8 +291,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x2e02;HPA_InvalidDomainId;No description;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
 0x2e03;HPA_InvalidValue;No description;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
 0x2e05;HPA_ReadOnly;No description;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2f01;ASC_NoPacketFound;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x2f01;ASC_TooLongForTargetType;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
-0x2f02;ASC_PossiblePacketLoss;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x2f02;ASC_InvalidCharacters;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
 0x2f03;ASC_BufferTooSmall;No description;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
 0x3001;POS_InPowerTransition;No description;1;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
 0x3002;POS_SwitchStateMismatch;No description;2;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
@@ -371,8 +371,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x3e03;HKM_PeriodicHelperInvalid;No description;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
 0x3e04;HKM_PoolobjectNotFound;No description;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
 0x3e05;HKM_DatasetNotFound;No description;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3f01;DLEE_StreamTooShort;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x3f01;DLEE_NoPacketFound;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
-0x3f02;DLEE_DecodingError;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x3f02;DLEE_PossiblePacketLoss;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
 0x4201;PUS11_InvalidTypeTimeWindow;No description;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4202;PUS11_InvalidTimeWindow;No description;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4203;PUS11_TimeshiftingNotPossible;No description;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
@@ -402,9 +402,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4406;UXOS_PcloseCallError;No description;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4500;HSPI_HalTimeoutRetval;No description;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4500;HSPI_OpeningFileFailed;No description;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
-0x4501;HSPI_HalBusyRetval;No description;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4501;HSPI_FullDuplexTransferFailed;No description;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
-0x4502;HSPI_HalErrorRetval;No description;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4502;HSPI_HalfDuplexTransferFailed;No description;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4601;HURT_UartReadFailure;No description;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
 0x4602;HURT_UartReadSizeMissmatch;No description;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
 0x4603;HURT_UartRxBufferTooSmall;No description;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
@@ -415,12 +415,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4805;HGIO_GpioDuplicateDetected;No description;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4806;HGIO_GpioInitFailed;No description;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4807;HGIO_GpioGetValueFailed;No description;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4aa0;MGMLIS3_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa1;MGMLIS3_InvalidRampTime;Action Message with invalid ramp time was received.;161;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa2;MGMLIS3_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa3;MGMLIS3_ExecutionFailed;Command execution failed;163;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa4;MGMLIS3_CrcError;Reaction wheel reply has invalid crc;164;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa5;MGMLIS3_ValueNotRead;No description;165;MGM_LIS3MDL;mission/acs/RwHandler.h
 0x4c00;SPPA_NoPacketFound;No description;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
 0x4c01;SPPA_SplitPacket;No description;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
 0x4fa1;HEATER_CommandNotSupported;No description;161;HEATER_HANDLER;mission/tcs/HeaterHandler.h
@@ -480,8 +474,12 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;mission/acs/str/StarTrackerHandler.h
 0x53b7;STRH_StartrackerNotRunningFirmware;Star tracker must be in firmware mode to run this command;183;STR_HANDLER;mission/acs/str/StarTrackerHandler.h
 0x53b8;STRH_StartrackerNotRunningBootloader;Star tracker must be in bootloader mode to run this command;184;STR_HANDLER;mission/acs/str/StarTrackerHandler.h
-0x58a0;SUSS_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h
+0x58a0;SUSS_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;SUS_HANDLER;mission/acs/RwHandler.h
-0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h
+0x58a1;SUSS_InvalidRampTime;Action Message with invalid ramp time was received.;161;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a2;SUSS_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a3;SUSS_ExecutionFailed;Command execution failed;163;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a4;SUSS_CrcError;Reaction wheel reply has invalid crc;164;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a5;SUSS_ValueNotRead;No description;165;SUS_HANDLER;mission/acs/RwHandler.h
 0x5d00;GOMS_PacketTooLong;No description;0;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h
 0x5d01;GOMS_InvalidTableId;No description;1;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h
 0x5d02;GOMS_InvalidAddress;No description;2;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h

generators/bsp_q7s_events.csv

@@ -272,9 +272,13 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h
 14301;0x37dd;FILE_TOO_LARGE;LOW;File in store too large. P1: Detected file size P2: Allowed file size;mission/persistentTmStoreDefs.h
 14302;0x37de;BUSY_DUMPING_EVENT;INFO;No description;mission/persistentTmStoreDefs.h
-14303;0x37df;DUMP_WAS_CANCELLED;LOW;Dump was cancelled. P1: Object ID of store.;mission/persistentTmStoreDefs.h
 14305;0x37e1;DUMP_OK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14306;0x37e2;DUMP_NOK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14307;0x37e3;DUMP_MISC_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14308;0x37e4;DUMP_HK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14309;0x37e5;DUMP_CFDP_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14310;0x37e6;DUMP_OK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14311;0x37e7;DUMP_NOK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14312;0x37e8;DUMP_MISC_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14313;0x37e9;DUMP_HK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14314;0x37ea;DUMP_CFDP_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h

generators/bsp_q7s_returnvalues.csv

@@ -291,8 +291,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x2e02;HPA_InvalidDomainId;No description;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
 0x2e03;HPA_InvalidValue;No description;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
 0x2e05;HPA_ReadOnly;No description;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2f01;ASC_NoPacketFound;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x2f01;ASC_TooLongForTargetType;No description;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
-0x2f02;ASC_PossiblePacketLoss;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x2f02;ASC_InvalidCharacters;No description;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
 0x2f03;ASC_BufferTooSmall;No description;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
 0x3001;POS_InPowerTransition;No description;1;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
 0x3002;POS_SwitchStateMismatch;No description;2;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
@@ -371,8 +371,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x3e03;HKM_PeriodicHelperInvalid;No description;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
 0x3e04;HKM_PoolobjectNotFound;No description;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
 0x3e05;HKM_DatasetNotFound;No description;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3f01;DLEE_StreamTooShort;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x3f01;DLEE_NoPacketFound;No description;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
-0x3f02;DLEE_DecodingError;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
+0x3f02;DLEE_PossiblePacketLoss;No description;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
 0x4201;PUS11_InvalidTypeTimeWindow;No description;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4202;PUS11_InvalidTimeWindow;No description;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4203;PUS11_TimeshiftingNotPossible;No description;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
@@ -402,9 +402,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4406;UXOS_PcloseCallError;No description;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4500;HSPI_HalTimeoutRetval;No description;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4500;HSPI_OpeningFileFailed;No description;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
-0x4501;HSPI_HalBusyRetval;No description;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4501;HSPI_FullDuplexTransferFailed;No description;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
-0x4502;HSPI_HalErrorRetval;No description;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+0x4502;HSPI_HalfDuplexTransferFailed;No description;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4601;HURT_UartReadFailure;No description;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
 0x4602;HURT_UartReadSizeMissmatch;No description;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
 0x4603;HURT_UartRxBufferTooSmall;No description;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
@@ -415,12 +415,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4805;HGIO_GpioDuplicateDetected;No description;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4806;HGIO_GpioInitFailed;No description;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4807;HGIO_GpioGetValueFailed;No description;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4aa0;MGMLIS3_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa1;MGMLIS3_InvalidRampTime;Action Message with invalid ramp time was received.;161;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa2;MGMLIS3_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa3;MGMLIS3_ExecutionFailed;Command execution failed;163;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa4;MGMLIS3_CrcError;Reaction wheel reply has invalid crc;164;MGM_LIS3MDL;mission/acs/RwHandler.h
-0x4aa5;MGMLIS3_ValueNotRead;No description;165;MGM_LIS3MDL;mission/acs/RwHandler.h
 0x4c00;SPPA_NoPacketFound;No description;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
 0x4c01;SPPA_SplitPacket;No description;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
 0x4fa1;HEATER_CommandNotSupported;No description;161;HEATER_HANDLER;mission/tcs/HeaterHandler.h
@@ -492,12 +486,16 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x57a1;PLSPVhLP_ProcessTerminated;Process has been terminated by command;161;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h
 0x57a2;PLSPVhLP_PathNotExists;Received command with invalid pathname;162;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h
 0x57a3;PLSPVhLP_EventBufferReplyInvalidApid;Expected event buffer TM but received space packet with other APID;163;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h
-0x58a0;SUSS_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h
+0x58a0;SUSS_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;SUS_HANDLER;mission/acs/RwHandler.h
-0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/acs/archive/LegacySusHandler.h
+0x58a1;SUSS_InvalidRampTime;Action Message with invalid ramp time was received.;161;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a2;SUSS_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a3;SUSS_ExecutionFailed;Command execution failed;163;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a4;SUSS_CrcError;Reaction wheel reply has invalid crc;164;SUS_HANDLER;mission/acs/RwHandler.h
+0x58a5;SUSS_ValueNotRead;No description;165;SUS_HANDLER;mission/acs/RwHandler.h
+0x5900;IPCI_NoReplyAvailable;No description;0;CCSDS_IP_CORE_BRIDGE;linux/acs/ImtqPollingTask.h
 0x5901;IPCI_NoPacketFound;No description;1;CCSDS_IP_CORE_BRIDGE;linux/com/SyrlinksComHandler.h
 0x59a0;IPCI_PapbBusy;No description;160;CCSDS_IP_CORE_BRIDGE;linux/ipcore/PapbVcInterface.h
 0x5aa0;PTME_UnknownVcId;No description;160;PTME;linux/ipcore/Ptme.h
-0x5c00;STRHLP_NoReplyAvailable;No description;0;STR_HELPER;linux/acs/ImtqPollingTask.h
 0x5c01;STRHLP_SdNotMounted;SD card specified in path string not mounted;1;STR_HELPER;linux/acs/StrComHandler.h
 0x5c02;STRHLP_FileNotExists;Specified file does not exist on filesystem;2;STR_HELPER;linux/acs/StrComHandler.h
 0x5c03;STRHLP_PathNotExists;Specified path does not exist;3;STR_HELPER;linux/acs/StrComHandler.h
@@ -515,7 +513,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x5d03;GOMS_InvalidParamSize;No description;3;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h
 0x5d04;GOMS_InvalidPayloadSize;No description;4;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h
 0x5d05;GOMS_UnknownReplyId;No description;5;GOM_SPACE_HANDLER;mission/power/GomspaceDeviceHandler.h
-0x5e02;PLMEMDUMP_InvalidCrc;No description;2;PLOC_MEMORY_DUMPER;linux/payload/ScexHelper.h
 0x5ea0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;160;PLOC_MEMORY_DUMPER;linux/payload/PlocMemoryDumper.h
 0x5ea1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;161;PLOC_MEMORY_DUMPER;linux/payload/PlocMemoryDumper.h
 0x5fa0;PDEC_AbandonedCltuRetval;No description;160;PDEC_HANDLER;linux/ipcore/PdecHandler.h
@@ -544,6 +541,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NvmParameterBase.h
 0x64a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;160;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
 0x64a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;161;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
+0x6502;PLMPHLP_InvalidCrc;No description;2;PLOC_MPSOC_HELPER;linux/payload/ScexHelper.h
 0x65a0;PLMPHLP_FileClosedAccidentally;File accidentally close;160;PLOC_MPSOC_HELPER;linux/payload/PlocMpsocHelper.h
 0x66a0;SADPL_CommandNotSupported;No description;160;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h
 0x66a1;SADPL_DeploymentAlreadyExecuting;No description;161;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 279 translations.
+ * @brief    Auto-generated event translation file. Contains 283 translations.
  * @details
- * Generated on: 2023-03-26 16:40:57
+ * Generated on: 2023-03-28 21:50:28
  */
 #include "translateEvents.h"
 
@@ -278,12 +278,16 @@ const char *BIT_LOCK_TX_ON_STRING = "BIT_LOCK_TX_ON";
 const char *POSSIBLE_FILE_CORRUPTION_STRING = "POSSIBLE_FILE_CORRUPTION";
 const char *FILE_TOO_LARGE_STRING = "FILE_TOO_LARGE";
 const char *BUSY_DUMPING_EVENT_STRING = "BUSY_DUMPING_EVENT";
-const char *DUMP_WAS_CANCELLED_STRING = "DUMP_WAS_CANCELLED";
 const char *DUMP_OK_STORE_DONE_STRING = "DUMP_OK_STORE_DONE";
 const char *DUMP_NOK_STORE_DONE_STRING = "DUMP_NOK_STORE_DONE";
 const char *DUMP_MISC_STORE_DONE_STRING = "DUMP_MISC_STORE_DONE";
 const char *DUMP_HK_STORE_DONE_STRING = "DUMP_HK_STORE_DONE";
 const char *DUMP_CFDP_STORE_DONE_STRING = "DUMP_CFDP_STORE_DONE";
+const char *DUMP_OK_CANCELLED_STRING = "DUMP_OK_CANCELLED";
+const char *DUMP_NOK_CANCELLED_STRING = "DUMP_NOK_CANCELLED";
+const char *DUMP_MISC_CANCELLED_STRING = "DUMP_MISC_CANCELLED";
+const char *DUMP_HK_CANCELLED_STRING = "DUMP_HK_CANCELLED";
+const char *DUMP_CFDP_CANCELLED_STRING = "DUMP_CFDP_CANCELLED";
 
 const char *translateEvents(Event event) {
   switch ((event & 0xFFFF)) {
@@ -833,8 +837,6 @@ const char *translateEvents(Event event) {
       return FILE_TOO_LARGE_STRING;
     case (14302):
       return BUSY_DUMPING_EVENT_STRING;
-    case (14303):
-      return DUMP_WAS_CANCELLED_STRING;
     case (14305):
       return DUMP_OK_STORE_DONE_STRING;
     case (14306):
@@ -845,6 +847,16 @@ const char *translateEvents(Event event) {
       return DUMP_HK_STORE_DONE_STRING;
     case (14309):
       return DUMP_CFDP_STORE_DONE_STRING;
+    case (14310):
+      return DUMP_OK_CANCELLED_STRING;
+    case (14311):
+      return DUMP_NOK_CANCELLED_STRING;
+    case (14312):
+      return DUMP_MISC_CANCELLED_STRING;
+    case (14313):
+      return DUMP_HK_CANCELLED_STRING;
+    case (14314):
+      return DUMP_CFDP_CANCELLED_STRING;
     default:
       return "UNKNOWN_EVENT";
   }

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-26 16:40:57
+ * Generated on: 2023-03-28 21:50:28
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 279 translations.
+ * @brief    Auto-generated event translation file. Contains 283 translations.
  * @details
- * Generated on: 2023-03-26 16:40:57
+ * Generated on: 2023-03-28 21:50:28
  */
 #include "translateEvents.h"
 
@@ -212,8 +212,7 @@ const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_
 const char *TRANSITION_OTHER_SIDE_FAILED_12900_STRING = "TRANSITION_OTHER_SIDE_FAILED_12900";
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_12901_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE_12901";
 const char *POWER_STATE_MACHINE_TIMEOUT_12902_STRING = "POWER_STATE_MACHINE_TIMEOUT_12902";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING =
+const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
-    "SIDE_SWITCH_TRANSITION_NOT_ALLOWED_12903";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
 const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *CANT_GET_FIX_STRING = "CANT_GET_FIX";
@@ -279,12 +278,16 @@ const char *BIT_LOCK_TX_ON_STRING = "BIT_LOCK_TX_ON";
 const char *POSSIBLE_FILE_CORRUPTION_STRING = "POSSIBLE_FILE_CORRUPTION";
 const char *FILE_TOO_LARGE_STRING = "FILE_TOO_LARGE";
 const char *BUSY_DUMPING_EVENT_STRING = "BUSY_DUMPING_EVENT";
-const char *DUMP_WAS_CANCELLED_STRING = "DUMP_WAS_CANCELLED";
 const char *DUMP_OK_STORE_DONE_STRING = "DUMP_OK_STORE_DONE";
 const char *DUMP_NOK_STORE_DONE_STRING = "DUMP_NOK_STORE_DONE";
 const char *DUMP_MISC_STORE_DONE_STRING = "DUMP_MISC_STORE_DONE";
 const char *DUMP_HK_STORE_DONE_STRING = "DUMP_HK_STORE_DONE";
 const char *DUMP_CFDP_STORE_DONE_STRING = "DUMP_CFDP_STORE_DONE";
+const char *DUMP_OK_CANCELLED_STRING = "DUMP_OK_CANCELLED";
+const char *DUMP_NOK_CANCELLED_STRING = "DUMP_NOK_CANCELLED";
+const char *DUMP_MISC_CANCELLED_STRING = "DUMP_MISC_CANCELLED";
+const char *DUMP_HK_CANCELLED_STRING = "DUMP_HK_CANCELLED";
+const char *DUMP_CFDP_CANCELLED_STRING = "DUMP_CFDP_CANCELLED";
 
 const char *translateEvents(Event event) {
   switch ((event & 0xFFFF)) {
@@ -834,8 +837,6 @@ const char *translateEvents(Event event) {
       return FILE_TOO_LARGE_STRING;
     case (14302):
       return BUSY_DUMPING_EVENT_STRING;
-    case (14303):
-      return DUMP_WAS_CANCELLED_STRING;
     case (14305):
       return DUMP_OK_STORE_DONE_STRING;
     case (14306):
@@ -846,6 +847,16 @@ const char *translateEvents(Event event) {
       return DUMP_HK_STORE_DONE_STRING;
     case (14309):
       return DUMP_CFDP_STORE_DONE_STRING;
+    case (14310):
+      return DUMP_OK_CANCELLED_STRING;
+    case (14311):
+      return DUMP_NOK_CANCELLED_STRING;
+    case (14312):
+      return DUMP_MISC_CANCELLED_STRING;
+    case (14313):
+      return DUMP_HK_CANCELLED_STRING;
+    case (14314):
+      return DUMP_CFDP_CANCELLED_STRING;
     default:
       return "UNKNOWN_EVENT";
   }

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-26 16:40:57
+ * Generated on: 2023-03-28 21:50:28
  */
 #include "translateObjects.h"
 

linux/ipcore/PapbVcInterface.cpp

@@ -2,6 +2,8 @@
 #include <linux/ipcore/PapbVcInterface.h>
 #include <unistd.h>
 
+#include <ctime>
+
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
 PapbVcInterface::PapbVcInterface(LinuxLibgpioIF* gpioComIF, gpioId_t papbBusyId,
@@ -26,20 +28,27 @@ ReturnValue_t PapbVcInterface::initialize() {
 }
 
 ReturnValue_t PapbVcInterface::write(const uint8_t* data, size_t size) {
-  if (pollPapbBusySignal(0, 0) == returnvalue::OK) {
+  if (pollPapbBusySignal(0) == returnvalue::OK) {
     startPacketTransfer();
   } else {
     return DirectTmSinkIF::IS_BUSY;
   }
   for (size_t idx = 0; idx < size; idx++) {
-    if (pollPapbBusySignal(10, 10) == returnvalue::OK) {
+    // This delay is super-important, DO NOT REMOVE!
+    // Polling the GPIO too often can mess up the scheduler.
+    // TODO: Maybe this should not be done like this. It would be better if there was a custom
+    // FPGA module which can accept packets and then takes care of dumping that packet into
+    // the PTME. DMA would be an ideal solution for this.
+    nanosleep(&BETWEEN_POLL_DELAY, &remDelay);
+    if (pollPapbBusySignal(2) == returnvalue::OK) {
       *(vcBaseReg + DATA_REG_OFFSET) = static_cast<uint32_t>(data[idx]);
     } else {
       abortPacketTransfer();
       return returnvalue::FAILED;
     }
   }
-  if (pollPapbBusySignal(10, 10) == returnvalue::OK) {
+  nanosleep(&BETWEEN_POLL_DELAY, &remDelay);
+  if (pollPapbBusySignal(2) == returnvalue::OK) {
     completePacketTransfer();
   } else {
     abortPacketTransfer();
@@ -52,11 +61,11 @@ void PapbVcInterface::startPacketTransfer() { *vcBaseReg = CONFIG_START; }
 
 void PapbVcInterface::completePacketTransfer() { *vcBaseReg = CONFIG_END; }
 
-ReturnValue_t PapbVcInterface::pollPapbBusySignal(uint32_t maxPollRetries,
+ReturnValue_t PapbVcInterface::pollPapbBusySignal(uint32_t maxPollRetries) const {
-                                                  uint32_t retryDelayUs) const {
   gpio::Levels papbBusyState = gpio::Levels::LOW;
   ReturnValue_t result;
   uint32_t busyIdx = 0;
+  nextDelay.tv_nsec = 0;
 
   while (true) {
     /** Check if PAPB interface is ready to receive data */
@@ -75,7 +84,14 @@ ReturnValue_t PapbVcInterface::pollPapbBusySignal(uint32_t maxPollRetries,
       return PAPB_BUSY;
     }
 
-    usleep(retryDelayUs);
+    // Ignore signal handling here for now.
+    nanosleep(&nextDelay, &remDelay);
+    // Adaptive delay.
+    if (nextDelay.tv_nsec == 0) {
+      nextDelay.tv_nsec = FIRST_NON_NULL_DELAY_NS;
+    } else if (nextDelay.tv_nsec * 2 <= MAX_DELAY_PAPB_POLLING_NS) {
+      nextDelay.tv_nsec *= 2;
+    }
   }
   return returnvalue::OK;
 }
@@ -100,7 +116,7 @@ void PapbVcInterface::isVcInterfaceBufferEmpty() {
   return;
 }
 
-bool PapbVcInterface::isBusy() const { return pollPapbBusySignal(0, 0) == PAPB_BUSY; }
+bool PapbVcInterface::isBusy() const { return pollPapbBusySignal(0) == PAPB_BUSY; }
 
 void PapbVcInterface::cancelTransfer() { abortPacketTransfer(); }
 

linux/ipcore/PapbVcInterface.h

@@ -76,6 +76,9 @@ class PapbVcInterface : public VirtualChannelIF {
    */
   static const int DATA_REG_OFFSET = 256;
 
+  static constexpr long int FIRST_NON_NULL_DELAY_NS = 10;
+  static constexpr long int MAX_DELAY_PAPB_POLLING_NS = 40;
+
   LinuxLibgpioIF* gpioComIF = nullptr;
 
   /** Pulled to low when virtual channel not ready to receive data */
@@ -85,6 +88,9 @@ class PapbVcInterface : public VirtualChannelIF {
 
   std::string uioFile;
   int mapNum = 0;
+  mutable struct timespec nextDelay = {.tv_sec = 0, .tv_nsec = 0};
+  const struct timespec BETWEEN_POLL_DELAY = {.tv_sec = 0, .tv_nsec = 5};
+  mutable struct timespec remDelay;
 
   volatile uint32_t* vcBaseReg = nullptr;
 
@@ -111,7 +117,7 @@ class PapbVcInterface : public VirtualChannelIF {
    *
    * @return  returnvalue::OK when ready to receive data else PAPB_BUSY.
    */
-  ReturnValue_t pollPapbBusySignal(uint32_t maxPollRetries, uint32_t retryDelayUs) const;
+  inline ReturnValue_t pollPapbBusySignal(uint32_t maxPollRetries) const;
 
   /**
    * @brief   This function can be used for debugging to check whether there are packets in

mission/persistentTmStoreDefs.h

@@ -25,8 +25,6 @@ static constexpr Event POSSIBLE_FILE_CORRUPTION = event::makeEvent(SUBSYSTEM_ID,
 //! P2: Allowed file size
 static constexpr Event FILE_TOO_LARGE = event::makeEvent(SUBSYSTEM_ID, 1, severity::LOW);
 static constexpr Event BUSY_DUMPING_EVENT = event::makeEvent(SUBSYSTEM_ID, 2, severity::INFO);
-//! [EXPORT] : [COMMENT] Dump was cancelled. P1: Object ID of store.
-static constexpr Event DUMP_WAS_CANCELLED = event::makeEvent(SUBSYSTEM_ID, 3, severity::LOW);
 
 //! [EXPORT] : [COMMENT] P1: Number of dumped packets. P2: Total dumped bytes.
 static constexpr Event DUMP_OK_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 5, severity::INFO);
@@ -38,6 +36,17 @@ static constexpr Event DUMP_MISC_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 7,
 static constexpr Event DUMP_HK_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 8, severity::INFO);
 //! [EXPORT] : [COMMENT] P1: Number of dumped packets. P2: Total dumped bytes.
 static constexpr Event DUMP_CFDP_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 9, severity::INFO);
+
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets. P2: Total dumped bytes.
+static constexpr Event DUMP_OK_CANCELLED = event::makeEvent(SUBSYSTEM_ID, 10, severity::LOW);
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets. P2: Total dumped bytes.
+static constexpr Event DUMP_NOK_CANCELLED = event::makeEvent(SUBSYSTEM_ID, 11, severity::LOW);
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets. P2: Total dumped bytes.
+static constexpr Event DUMP_MISC_CANCELLED = event::makeEvent(SUBSYSTEM_ID, 12, severity::LOW);
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets. P2: Total dumped bytes.
+static constexpr Event DUMP_HK_CANCELLED = event::makeEvent(SUBSYSTEM_ID, 13, severity::LOW);
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets. P2: Total dumped bytes.
+static constexpr Event DUMP_CFDP_CANCELLED = event::makeEvent(SUBSYSTEM_ID, 14, severity::LOW);
 };  // namespace persTmStore
 
 #endif /* MISSION_PERSISTENTTMSTOREDEFS_H_ */

mission/tmtc/PersistentLogTmStoreTask.cpp

@@ -8,19 +8,23 @@ PersistentLogTmStoreTask::PersistentLogTmStoreTask(object_id_t objectId, Storage
                                                    SdCardMountedIF& sdcMan)
     : TmStoreTaskBase(objectId, ipcStore, channel, sdcMan),
       stores(stores),
-      okStoreContext(persTmStore::DUMP_OK_STORE_DONE),
+      okStoreContext(persTmStore::DUMP_OK_STORE_DONE, persTmStore::DUMP_OK_CANCELLED),
-      notOkStoreContext(persTmStore::DUMP_NOK_STORE_DONE),
+      notOkStoreContext(persTmStore::DUMP_NOK_STORE_DONE, persTmStore::DUMP_NOK_CANCELLED),
-      miscStoreContext(persTmStore::DUMP_MISC_STORE_DONE) {}
+      miscStoreContext(persTmStore::DUMP_MISC_STORE_DONE, persTmStore::DUMP_MISC_CANCELLED) {}
 
 ReturnValue_t PersistentLogTmStoreTask::performOperation(uint8_t opCode) {
   bool someonesBusy = false;
-  auto stateHandlingForStore = [&](bool storeIsBusy) {
+  bool vcBusyDuringDump = false;
+  auto stateHandlingForStore = [&](bool storeIsBusy, DumpContext& ctx) {
     if (storeIsBusy) {
       someonesBusy = true;
     }
     if (fileHasSwapped) {
       someFileWasSwapped = fileHasSwapped;
     }
+    if (ctx.vcBusyDuringDump) {
+      vcBusyDuringDump = true;
+    }
   };
   while (true) {
     if (not cyclicStoreCheck()) {
@@ -28,12 +32,14 @@ ReturnValue_t PersistentLogTmStoreTask::performOperation(uint8_t opCode) {
     }
     someonesBusy = false;
     someFileWasSwapped = false;
-    stateHandlingForStore(handleOneStore(stores.okStore, okStoreContext));
+    vcBusyDuringDump = false;
-    stateHandlingForStore(handleOneStore(stores.notOkStore, notOkStoreContext));
+    stateHandlingForStore(handleOneStore(stores.okStore, okStoreContext), okStoreContext);
-    stateHandlingForStore(handleOneStore(stores.miscStore, miscStoreContext));
+    stateHandlingForStore(handleOneStore(stores.notOkStore, notOkStoreContext), notOkStoreContext);
+    stateHandlingForStore(handleOneStore(stores.miscStore, miscStoreContext), miscStoreContext);
     if (not someonesBusy) {
       TaskFactory::delayTask(100);
-    } else if (someFileWasSwapped) {
+    } else if (vcBusyDuringDump) {
+      // TODO: Might not be necessary
       TaskFactory::delayTask(10);
     }
   }

mission/tmtc/PersistentLogTmStoreTask.h

@@ -35,7 +35,7 @@ class PersistentLogTmStoreTask : public TmStoreTaskBase, public ExecutableObject
   Countdown graceDelayDuringDumping = Countdown(200);
   bool someFileWasSwapped = false;
 
-  bool initStoresIfPossible();
+  bool initStoresIfPossible() override;
 };
 
 #endif /* MISSION_TMTC_PERSISTENTLOGTMSTORETASK_H_ */

mission/tmtc/PersistentSingleTmStoreTask.cpp

@@ -1,13 +1,14 @@
 #include <fsfw/tasks/TaskFactory.h>
 #include <fsfw/timemanager/Stopwatch.h>
 #include <mission/tmtc/PersistentSingleTmStoreTask.h>
+#include <unistd.h>
 
 PersistentSingleTmStoreTask::PersistentSingleTmStoreTask(
     object_id_t objectId, StorageManagerIF& ipcStore, PersistentTmStoreWithTmQueue& tmStore,
-    VirtualChannel& channel, Event eventIfDumpDone, SdCardMountedIF& sdcMan)
+    VirtualChannel& channel, Event eventIfDumpDone, Event eventIfCancelled, SdCardMountedIF& sdcMan)
     : TmStoreTaskBase(objectId, ipcStore, channel, sdcMan),
       storeWithQueue(tmStore),
-      dumpContext(eventIfDumpDone) {}
+      dumpContext(eventIfDumpDone, eventIfCancelled) {}
 
 ReturnValue_t PersistentSingleTmStoreTask::performOperation(uint8_t opCode) {
   while (true) {
@@ -18,7 +19,8 @@ ReturnValue_t PersistentSingleTmStoreTask::performOperation(uint8_t opCode) {
     bool busy = handleOneStore(storeWithQueue, dumpContext);
     if (not busy) {
       TaskFactory::delayTask(100);
-    } else if (fileHasSwapped) {
+    } else if (dumpContext.vcBusyDuringDump) {
+      // TODO: Might not be necessary
       TaskFactory::delayTask(10);
     }
   }

mission/tmtc/PersistentSingleTmStoreTask.h

@@ -11,7 +11,8 @@ class PersistentSingleTmStoreTask : public TmStoreTaskBase, public ExecutableObj
  public:
   PersistentSingleTmStoreTask(object_id_t objectId, StorageManagerIF& ipcStore,
                               PersistentTmStoreWithTmQueue& storeWithQueue, VirtualChannel& channel,
-                              Event eventIfDumpDone, SdCardMountedIF& sdcMan);
+                              Event eventIfDumpDone, Event eventIfCancelled,
+                              SdCardMountedIF& sdcMan);
 
   ReturnValue_t performOperation(uint8_t opCode) override;
 
@@ -21,7 +22,7 @@ class PersistentSingleTmStoreTask : public TmStoreTaskBase, public ExecutableObj
   Countdown tcHandlingCd = Countdown(400);
   Countdown graceDelayDuringDumping = Countdown(100);
 
-  bool initStoresIfPossible();
+  bool initStoresIfPossible() override;
 };
 
 #endif /* MISSION_TMTC_PERSISTENTSINGLETMSTORETASK_H_ */

mission/tmtc/PersistentTmStore.cpp

@@ -212,7 +212,7 @@ ReturnValue_t PersistentTmStore::loadNextDumpFile() {
       sif::error << "PersistentTmStore: Could not retrieve file size: " << e.message() << std::endl;
       continue;
     }
-    sif::debug << "Path: " << dumpParams.dirEntry.path() << std::endl;
+    // sif::debug << "Path: " << dumpParams.dirEntry.path() << std::endl;
 
     // File empty or can't even read CCSDS header.
     if (dumpParams.fileSize <= 6) {

mission/tmtc/TmStoreTaskBase.cpp

@@ -16,7 +16,11 @@ bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store,
   ReturnValue_t result;
   bool tmToStoreReceived = false;
   bool tcRequestReceived = false;
-  bool dumpsPerformed = false;
+  bool dumpPerformed = false;
+  fileHasSwapped = false;
+  dumpContext.packetWasDumped = false;
+  dumpContext.vcBusyDuringDump = false;
+
   // Store TM persistently
   result = store.handleNextTm();
   if (result == returnvalue::OK) {
@@ -24,38 +28,8 @@ bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store,
   }
   // Dump TMs when applicable
   if (store.getState() == PersistentTmStore::State::DUMPING) {
-    size_t dumpedLen = 0;
+    if (handleOneDump(store, dumpContext, dumpPerformed) != returnvalue::OK) {
-    if (not channel.isBusy()) {
+      return result;
-      tmSinkBusyCd.resetTimer();
-      result = store.dumpNextPacket(channel, dumpedLen, fileHasSwapped);
-      if (result == DirectTmSinkIF::IS_BUSY) {
-        sif::warning << "Unexpected PAPB busy" << std::endl;
-      }
-      if ((result == PersistentTmStore::DUMP_DONE or result == returnvalue::OK) and dumpedLen > 0) {
-        dumpContext.dumpedBytes += dumpedLen;
-        dumpContext.numberOfDumpedPackets += 1;
-      }
-      if (result == PersistentTmStore::DUMP_DONE) {
-        uint32_t startTime;
-        uint32_t endTime;
-        store.getStartAndEndTimeCurrentOrLastDump(startTime, endTime);
-        triggerEvent(dumpContext.eventIfDone, dumpContext.numberOfDumpedPackets,
-                     dumpContext.dumpedBytes);
-        dumpsPerformed = true;
-      } else if (result == returnvalue::OK) {
-        dumpsPerformed = true;
-      }
-    } else {
-      dumpContext.ptmeBusyCounter++;
-      if (dumpContext.ptmeBusyCounter == 50) {
-        sif::warning << "PTME busy for longer period. Dumped length so far: "
-                     << dumpContext.dumpedBytes << std::endl;
-        dumpContext.ptmeBusyCounter = 0;
-      }
-    }
-    if (cancelDumpCd.hasTimedOut() or tmSinkBusyCd.hasTimedOut()) {
-      triggerEvent(persTmStore::DUMP_WAS_CANCELLED, store.getObjectId());
-      store.cancelDump();
     }
   } else {
     Command_t execCmd;
@@ -70,7 +44,7 @@ bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store,
       tcRequestReceived = true;
     }
   }
-  if (tcRequestReceived or tmToStoreReceived or dumpsPerformed) {
+  if (tcRequestReceived or tmToStoreReceived or dumpPerformed) {
     return true;
   }
   return false;
@@ -94,3 +68,64 @@ bool TmStoreTaskBase::cyclicStoreCheck() {
   }
   return true;
 }
+
+void TmStoreTaskBase::cancelDump(DumpContext& ctx, PersistentTmStore& store, bool isTxOn) {
+  triggerEvent(ctx.eventIfCancelled, ctx.numberOfDumpedPackets, ctx.dumpedBytes);
+  ctx.reset();
+  store.cancelDump();
+  if (isTxOn) {
+    channel.cancelTransfer();
+  }
+}
+
+ReturnValue_t TmStoreTaskBase::handleOneDump(PersistentTmStoreWithTmQueue& store,
+                                             DumpContext& dumpContext, bool& dumpPerformed) {
+  ReturnValue_t result = returnvalue::OK;
+  // The PTME might have been reset an transmitter state change, so there is no point in continuing
+  // the dump.
+  if (not channel.isTxOn()) {
+    cancelDump(dumpContext, store, false);
+    return returnvalue::FAILED;
+  }
+  size_t dumpedLen = 0;
+  if (not channel.isBusy()) {
+    // Dump the next packet into the PTME.
+    dumpContext.ptmeBusyCounter = 0;
+    tmSinkBusyCd.resetTimer();
+    result = store.dumpNextPacket(channel, dumpedLen, fileHasSwapped);
+    if (result == DirectTmSinkIF::IS_BUSY) {
+      sif::warning << "Unexpected PAPB busy" << std::endl;
+    }
+    if ((result == PersistentTmStore::DUMP_DONE or result == returnvalue::OK)) {
+      dumpPerformed = true;
+      if (dumpedLen > 0) {
+        dumpContext.dumpedBytes += dumpedLen;
+        dumpContext.numberOfDumpedPackets += 1;
+        dumpContext.packetWasDumped = true;
+      }
+    }
+    if (result == PersistentTmStore::DUMP_DONE) {
+      uint32_t startTime;
+      uint32_t endTime;
+      store.getStartAndEndTimeCurrentOrLastDump(startTime, endTime);
+      triggerEvent(dumpContext.eventIfDone, dumpContext.numberOfDumpedPackets,
+                   dumpContext.dumpedBytes);
+      dumpContext.reset();
+    }
+  } else {
+    // The PTME might be at full load, so it might sense to delay for a bit to let it do
+    // its work until some more bandwidth is available. Set a flag here so the upper layer can
+    // do ths.
+    dumpContext.vcBusyDuringDump = true;
+    dumpContext.ptmeBusyCounter++;
+    if (dumpContext.ptmeBusyCounter == 100) {
+      // If this happens, something is probably wrong.
+      sif::warning << "PTME busy for longer period. Cancelling dump" << std::endl;
+      cancelDump(dumpContext, store, channel.isTxOn());
+    }
+  }
+  if (cancelDumpCd.hasTimedOut() or tmSinkBusyCd.hasTimedOut()) {
+    cancelDump(dumpContext, store, channel.isTxOn());
+  }
+  return result;
+}

mission/tmtc/TmStoreTaskBase.h

@@ -5,38 +5,37 @@
 #include <mission/tmtc/PersistentTmStoreWithTmQueue.h>
 #include <mission/tmtc/VirtualChannel.h>
 
+/**
+ * Generic class which composes a Virtual Channel and a persistent TM stores. This allows dumping
+ * the TM store into the virtual channel directly.
+ */
 class TmStoreTaskBase : public SystemObject {
  public:
   struct DumpContext {
-    DumpContext(Event eventIfDone) : eventIfDone(eventIfDone) {}
+    DumpContext(Event eventIfDone, Event eventIfCancelled)
+        : eventIfDone(eventIfDone), eventIfCancelled(eventIfCancelled) {}
     void reset() {
       numberOfDumpedPackets = 0;
       dumpedBytes = 0;
+      vcBusyDuringDump = false;
+      packetWasDumped = false;
+      bytesDumpedAtLastDelay = 0;
+      ptmeBusyCounter = 0;
     }
     const Event eventIfDone;
-    uint32_t numberOfDumpedPackets = 0;
+    const Event eventIfCancelled;
-    uint32_t dumpedBytes = 0;
+    size_t numberOfDumpedPackets = 0;
+    size_t bytesDumpedAtLastDelay = 0;
+    size_t dumpedBytes = 0;
     uint32_t ptmeBusyCounter = 0;
+    bool packetWasDumped = false;
+    bool vcBusyDuringDump = false;
   };
 
   TmStoreTaskBase(object_id_t objectId, StorageManagerIF& ipcStore, VirtualChannel& channel,
                   SdCardMountedIF& sdcMan);
 
  protected:
-  /**
-   * Handling for one store. Returns if anything was done.
-   * @param store
-   * @return
-   */
-  bool handleOneStore(PersistentTmStoreWithTmQueue& store, DumpContext& dumpContext);
-
-  /**
-   * Occasionally check whether SD card is okay to be used. If not, poll whether it is ready to
-   * be used again and re-initialize stores. Returns whether store is okay to be used.
-   */
-  bool cyclicStoreCheck();
-
-  virtual bool initStoresIfPossible() = 0;
 
   StorageManagerIF& ipcStore;
   Countdown sdCardCheckCd = Countdown(800);
@@ -48,6 +47,26 @@ class TmStoreTaskBase : public SystemObject {
   bool storesInitialized = false;
   bool fileHasSwapped = false;
   SdCardMountedIF& sdcMan;
+
+  void cancelDump(DumpContext& ctx, PersistentTmStore& store, bool isTxOn);
+  /**
+   *
+   * Handling for one store. Returns if anything was done.
+   * @param store
+   * @return
+   */
+  bool handleOneStore(PersistentTmStoreWithTmQueue& store, DumpContext& dumpContext);
+
+  ReturnValue_t handleOneDump(PersistentTmStoreWithTmQueue& store, DumpContext& dumpContext,
+                              bool& dumpPerformed);
+
+  /**
+   * Occasionally check whether SD card is okay to be used. If not, poll whether it is ready to
+   * be used again and re-initialize stores. Returns whether store is okay to be used.
+   */
+  bool cyclicStoreCheck();
+
+  virtual bool initStoresIfPossible() = 0;
 };
 
 #endif /* MISSION_TMTC_TMSTORETASKBASE_H_ */

mission/tmtc/VirtualChannel.cpp

@@ -1,12 +1,8 @@
 #include "VirtualChannel.h"
 
 VirtualChannel::VirtualChannel(object_id_t objectId, uint8_t vcId, const char* vcName, PtmeIF& ptme,
-                               const std::atomic_bool& linkStateProvider)
+                               const std::atomic_bool& txOn)
-    : SystemObject(objectId),
+    : SystemObject(objectId), ptme(ptme), vcId(vcId), vcName(vcName), txOn(txOn) {}
-      ptme(ptme),
-      vcId(vcId),
-      vcName(vcName),
-      linkStateProvider(linkStateProvider) {}
 
 ReturnValue_t VirtualChannel::initialize() { return returnvalue::OK; }
 
@@ -15,7 +11,7 @@ ReturnValue_t VirtualChannel::sendNextTm(const uint8_t* data, size_t size) {
 }
 
 ReturnValue_t VirtualChannel::write(const uint8_t* data, size_t size) {
-  if (linkStateProvider.load()) {
+  if (txOn) {
     return ptme.writeToVc(vcId, data, size);
   }
   return returnvalue::OK;
@@ -27,10 +23,12 @@ const char* VirtualChannel::getName() const { return vcName.c_str(); }
 
 bool VirtualChannel::isBusy() const {
   // Data is discarded, so channel is not busy.
-  if (linkStateProvider.load()) {
+  if (not txOn) {
     return false;
   }
   return ptme.isBusy(vcId);
 }
 
 void VirtualChannel::cancelTransfer() { ptme.cancelTransfer(vcId); }
+
+bool VirtualChannel::isTxOn() const { return txOn; }

mission/tmtc/VirtualChannel.h

@@ -30,6 +30,7 @@ class VirtualChannel : public SystemObject, public VirtualChannelIF {
   ReturnValue_t write(const uint8_t* data, size_t size) override;
   void cancelTransfer() override;
   uint8_t getVcid() const;
+  bool isTxOn() const;
 
   const char* getName() const;
 
@@ -37,5 +38,5 @@ class VirtualChannel : public SystemObject, public VirtualChannelIF {
   PtmeIF& ptme;
   uint8_t vcId = 0;
   std::string vcName;
-  const std::atomic_bool& linkStateProvider;
+  const std::atomic_bool& txOn;
 };

mission/tmtc/VirtualChannelWithQueue.cpp

@@ -37,15 +37,11 @@ ReturnValue_t VirtualChannelWithQueue::sendNextTm() {
   }
 
   result = write(data, size);
-  if (result != returnvalue::OK) {
+  // Try delete in any case, ignore failures (which should not happen), it is more important to
-    return result;
+  // propagate write errors.
-  }
   tmStore.deleteData(storeId);
-  if (result != returnvalue::OK) {
   return result;
 }
-  return returnvalue::OK;
-}
 
 MessageQueueId_t VirtualChannelWithQueue::getReportReceptionQueue(uint8_t virtualChannel) const {
   return tmQueue->getId();

tmtc

@@ -1 +1 @@
-Subproject commit 3f3523465a141bc2a2c36cbc9cbbf6ab7b3a9d70
+Subproject commit e0a31cb992bbf0884d4b2b10ffcdca30b0ec9351