Merge pull request 'unfassbar' (#513) from unfassbar into develop

Reviewed-on: #513

CHANGELOG.md

@@ -16,6 +16,14 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v1.39.1] 2023-03-22
+
+## Fixed
+
+- Bugfix for STR: Some action commands wrongfully declined.
+- STR: No normal command handling while a special request like an image upload is active.
+- RS485 data line was not enabled when the transmitter was switched on.
+
 # [v1.39.0] 2023-03-21
 
 Requires firmware update for new FPGA design where reset line is routed into the software.
@@ -23,6 +31,8 @@ Requires firmware update for new FPGA design where reset line is routed into the
  - https://egit.irs.uni-stuttgart.de/eive/q7s-vivado/pulls/53
  - https://egit.irs.uni-stuttgart.de/eive/q7s-vivado/pulls/54
 
+eive-tmtc: v2.19.3
+
 ## Added
 
 - Added NaN and Inf check for the `MEKF`. If these are detected, the `AcsController` will reset

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 1)
 set(OBSW_VERSION_MINOR 39)
-set(OBSW_VERSION_REVISION 0)
+set(OBSW_VERSION_REVISION 1)
 
 # set(CMAKE_VERBOSE TRUE)
 

bsp_hosted/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 279 translations.
  * @details
- * Generated on: 2023-03-21 23:34:22
+ * Generated on: 2023-03-21 23:59:36
  */
 #include "translateEvents.h"
 

bsp_hosted/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 169 translations.
- * Generated on: 2023-03-21 23:34:22
+ * Generated on: 2023-03-21 23:59:36
  */
 #include "translateObjects.h"
 

bsp_q7s/core/CoreController.h

@@ -6,6 +6,7 @@
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
 #include <libxiphos.h>
 
+#include <atomic>
 #include <cstddef>
 
 #include "CoreDefinitions.h"
@@ -15,7 +16,6 @@
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"
 #include "mission/trace.h"
-#include <atomic>
 
 class Timer;
 class SdCardManager;
@@ -132,7 +132,8 @@ class CoreController : public ExtendedControllerBase {
   //! P1: First 16 bits boot count of image 0 0, last 16 bits boot count of image 0 1.
   //! P2: First 16 bits boot count of image 1 0, last 16 bits boot count of image 1 1.
   static constexpr Event INDIVIDUAL_BOOT_COUNTS = event::makeEvent(SUBSYSTEM_ID, 8, severity::INFO);
-  static constexpr Event I2C_UNAVAILABLE_REBOOT = event::makeEvent(SUBSYSTEM_ID, 10, severity::MEDIUM);
+  static constexpr Event I2C_UNAVAILABLE_REBOOT =
+      event::makeEvent(SUBSYSTEM_ID, 10, severity::MEDIUM);
 
   CoreController(object_id_t objectId, const std::atomic_uint16_t& i2cErrors);
   virtual ~CoreController();

bsp_q7s/core/ObjectFactory.cpp

@@ -748,10 +748,13 @@ ReturnValue_t ObjectFactory::createCcsdsComponents(CcsdsComponentArgs& args) {
   gpioCookiePtmeIp->addGpio(gpioIds::VC3_PAPB_BUSY, gpio);
   gpio = new GpiodRegularByLineName(q7s::gpioNames::PAPB_EMPTY_SIGNAL_VC3, "PAPB VC3");
   gpioCookiePtmeIp->addGpio(gpioIds::VC3_PAPB_EMPTY, gpio);
+  // Initialise to low and then pull high to do a PTME reset, which puts the PTME in reset
+  // state. It will be put out of reset in the CCSDS handler initialize function.
   gpio = new GpiodRegularByLineName(q7s::gpioNames::PTME_RESETN, "PTME RESETN",
-                                    gpio::Direction::OUT, gpio::Levels::HIGH);
+                                    gpio::Direction::OUT, gpio::Levels::LOW);
   gpioCookiePtmeIp->addGpio(gpioIds::PTME_RESETN, gpio);
   gpioChecker(args.gpioComIF.addGpios(gpioCookiePtmeIp), "PTME PAPB VCs");
+
   // Creating virtual channel interfaces
   VirtualChannelIF* vc0 =
       new PapbVcInterface(&args.gpioComIF, gpioIds::VC0_PAPB_BUSY, gpioIds::VC0_PAPB_EMPTY,
@@ -777,7 +780,7 @@ ReturnValue_t ObjectFactory::createCcsdsComponents(CcsdsComponentArgs& args) {
 
   PtmeGpios gpios;
   gpios.enableTxClock = gpioIds::RS485_EN_TX_CLOCK;
-  gpios.enableTxData = gpioIds::RS485_EN_TX_CLOCK;
+  gpios.enableTxData = gpioIds::RS485_EN_TX_DATA;
   gpios.ptmeResetn = gpioIds::PTME_RESETN;
 
   *args.ipCoreHandler =

bsp_q7s/core/ObjectFactory.h

@@ -11,8 +11,8 @@
 #include <mission/tmtc/PersistentLogTmStoreTask.h>
 #include <mission/tmtc/PusTmFunnel.h>
 
-#include <string>
 #include <atomic>
+#include <string>
 
 class LinuxLibgpioIF;
 class SerialComIF;

generators/bsp_q7s_returnvalues.csv

@@ -471,8 +471,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x53b4;STRH_CrcFailure;Received reply with invalid CRC;180;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
 0x53b5;STRH_StrHelperExecuting;Star tracker handler currently executing a command and using the communication interface;181;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
 0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
-0x53b7;STRH_StartrackerRunningFirmware;Star tracker is in firmware mode but must be in bootloader mode to execute this command;183;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
+0x53b7;STRH_StartrackerNotRunningFirmware;Star tracker must be in firmware mode to run this command;183;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
-0x53b8;STRH_StartrackerRunningBootloader;Star tracker is in bootloader mode but must be in firmware mode to execute this command;184;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
+0x53b8;STRH_StartrackerNotRunningBootloader;Star tracker must be in bootloader mode to run this command;184;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
 0x5400;DWLPWRON_NoReplyAvailable;No description;0;DWLPWRON_CMD;linux/devices/ImtqPollingTask.h
 0x5402;DWLPWRON_InvalidCrc;No description;2;DWLPWRON_CMD;linux/devices/ScexHelper.h
 0x54e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);224;DWLPWRON_CMD;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 279 translations.
  * @details
- * Generated on: 2023-03-21 23:34:22
+ * Generated on: 2023-03-21 23:59:36
  */
 #include "translateEvents.h"
 

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-21 23:34:22
+ * Generated on: 2023-03-21 23:59:36
  */
 #include "translateObjects.h"
 

linux/devices/ImtqPollingTask.cpp

@@ -10,9 +10,8 @@
 
 #include "fsfw/FSFW.h"
 
-ImtqPollingTask::ImtqPollingTask(object_id_t imtqPollingTask,
+ImtqPollingTask::ImtqPollingTask(object_id_t imtqPollingTask, std::atomic_uint16_t& i2cFatalErrors)
-    std::atomic_uint16_t& i2cFatalErrors): SystemObject(imtqPollingTask),
+    : SystemObject(imtqPollingTask), i2cFatalErrors(i2cFatalErrors) {
-    i2cFatalErrors(i2cFatalErrors) {
   semaphore = SemaphoreFactory::instance()->createBinarySemaphore();
   semaphore->acquire();
   ipcLock = MutexFactory::instance()->createMutex();

linux/devices/ImtqPollingTask.h

@@ -4,11 +4,12 @@
 #include <fsfw/tasks/SemaphoreIF.h>
 #include <fsfw_hal/linux/i2c/I2cCookie.h>
 
+#include <atomic>
+
 #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "mission/devices/devicedefinitions/imtqHelpers.h"
-#include <atomic>
 
 class ImtqPollingTask : public SystemObject,
                         public ExecutableObjectIF,

linux/devices/startracker/StarTrackerHandler.cpp

@@ -129,7 +129,7 @@ ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueu
       break;
   }
 
-  if (strHelperExecuting == true) {
+  if (strHelperHandlingSpecialRequest == true) {
     return STR_HELPER_EXECUTING;
   }
 
@@ -157,7 +157,7 @@ ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueu
       if (result != returnvalue::OK) {
         return result;
       }
-      strHelperExecuting = true;
+      strHelperHandlingSpecialRequest = true;
       return EXECUTION_FINISHED;
     }
     case (startracker::DOWNLOAD_IMAGE): {
@@ -173,7 +173,7 @@ ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueu
       if (result != returnvalue::OK) {
         return result;
       }
-      strHelperExecuting = true;
+      strHelperHandlingSpecialRequest = true;
       return EXECUTION_FINISHED;
     }
     case (startracker::FLASH_READ): {
@@ -185,7 +185,7 @@ ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueu
       if (result != returnvalue::OK) {
         return result;
       }
-      strHelperExecuting = true;
+      strHelperHandlingSpecialRequest = true;
       return EXECUTION_FINISHED;
     }
     case (startracker::CHANGE_IMAGE_DOWNLOAD_FILE): {
@@ -215,7 +215,7 @@ ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueu
       if (result != returnvalue::OK) {
         return result;
       }
-      strHelperExecuting = true;
+      strHelperHandlingSpecialRequest = true;
       return EXECUTION_FINISHED;
     }
     default:
@@ -283,6 +283,9 @@ void StarTrackerHandler::doShutDown() {
 }
 
 ReturnValue_t StarTrackerHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
+  if (strHelperHandlingSpecialRequest) {
+    return NOTHING_TO_SEND;
+  }
   switch (normalState) {
     case NormalState::TEMPERATURE_REQUEST:
       *id = startracker::REQ_TEMPERATURE;
@@ -1296,7 +1299,7 @@ size_t StarTrackerHandler::getNextReplyLength(DeviceCommandId_t commandId) {
 
 ReturnValue_t StarTrackerHandler::doSendReadHook() {
   // Prevent DHB from polling UART during commands executed by the image loader task
-  if (strHelperExecuting) {
+  if (strHelperHandlingSpecialRequest) {
     return returnvalue::FAILED;
   }
   return returnvalue::OK;
@@ -1538,7 +1541,7 @@ void StarTrackerHandler::handleEvent(EventMessage* eventMessage) {
     case objects::STR_HELPER: {
       // All events from image loader signal either that the operation was successful or that it
       // failed
-      strHelperExecuting = false;
+      strHelperHandlingSpecialRequest = false;
       break;
     }
     default:
@@ -2147,14 +2150,14 @@ ReturnValue_t StarTrackerHandler::checkCommand(ActionId_t actionId) {
     case startracker::REQ_SUBSCRIPTION:
     case startracker::REQ_LOG_SUBSCRIPTION:
     case startracker::REQ_DEBUG_CAMERA:
-      if (not(getMode() == MODE_ON && getSubmode() == startracker::Program::FIRMWARE)) {
+      if (getMode() == MODE_ON and getSubmode() != startracker::Program::FIRMWARE) {
-        return STARTRACKER_RUNNING_BOOTLOADER;
+        return STARTRACKER_NOT_RUNNING_FIRMWARE;
       }
       break;
     case startracker::FIRMWARE_UPDATE:
     case startracker::FLASH_READ:
-      if (not(getMode() == MODE_ON && getSubmode() == startracker::Program::BOOTLOADER)) {
+      if (getMode() != MODE_ON or getSubmode() != startracker::Program::BOOTLOADER) {
-        return STARTRACKER_RUNNING_FIRMWARE;
+        return STARTRACKER_NOT_RUNNING_BOOTLOADER;
       }
       break;
     default:

linux/devices/startracker/StarTrackerHandler.h

@@ -132,12 +132,10 @@ class StarTrackerHandler : public DeviceHandlerBase {
   static const ReturnValue_t STR_HELPER_EXECUTING = MAKE_RETURN_CODE(0xB5);
   //! [EXPORT] : [COMMENT] Star tracker is already in firmware mode
   static const ReturnValue_t STARTRACKER_ALREADY_BOOTED = MAKE_RETURN_CODE(0xB6);
-  //! [EXPORT] : [COMMENT] Star tracker is in firmware mode but must be in bootloader mode to
+  //! [EXPORT] : [COMMENT] Star tracker must be in firmware mode to run this command
-  //! execute this command
+  static const ReturnValue_t STARTRACKER_NOT_RUNNING_FIRMWARE = MAKE_RETURN_CODE(0xB7);
-  static const ReturnValue_t STARTRACKER_RUNNING_FIRMWARE = MAKE_RETURN_CODE(0xB7);
+  //! [EXPORT] : [COMMENT] Star tracker must be in bootloader mode to run this command
-  //! [EXPORT] : [COMMENT] Star tracker is in bootloader mode but must be in firmware mode to
+  static const ReturnValue_t STARTRACKER_NOT_RUNNING_BOOTLOADER = MAKE_RETURN_CODE(0xB8);
-  //! execute this command
-  static const ReturnValue_t STARTRACKER_RUNNING_BOOTLOADER = MAKE_RETURN_CODE(0xB8);
 
   static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::STR_HANDLER;
 
@@ -291,7 +289,7 @@ class StarTrackerHandler : public DeviceHandlerBase {
 
   InternalState internalState = InternalState::IDLE;
 
-  bool strHelperExecuting = false;
+  bool strHelperHandlingSpecialRequest = false;
 
   const power::Switch_t powerSwitch = power::NO_SWITCH;
 

linux/devices/startracker/StrHelper.cpp

@@ -263,6 +263,10 @@ ReturnValue_t StrHelper::performImageUpload() {
     return returnvalue::FAILED;
   }
   std::ifstream file(uploadImage.uploadFile, std::ifstream::binary);
+  if (file.bad()) {
+    return HasFileSystemIF::GENERIC_FILE_ERROR;
+  }
+
   // Set position of next character to end of file input stream
   file.seekg(0, file.end);
   // tellg returns position of character in input stream

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 279 translations.
  * @details
- * Generated on: 2023-03-21 23:34:22
+ * Generated on: 2023-03-21 23:59:36
  */
 #include "translateEvents.h"
 

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 173 translations.
- * Generated on: 2023-03-21 23:34:22
+ * Generated on: 2023-03-21 23:59:36
  */
 #include "translateObjects.h"
 

mission/tmtc/CcsdsIpCoreHandler.cpp

@@ -3,6 +3,7 @@
 #include <fsfw/subsystem/helper.h>
 #include <linux/ipcore/PtmeConfig.h>
 #include <mission/config/comCfg.h>
+#include <unistd.h>
 
 #include "eive/definitions.h"
 #include "fsfw/ipc/QueueFactory.h"
@@ -38,7 +39,7 @@ ReturnValue_t CcsdsIpCoreHandler::performOperation(uint8_t operationCode) {
 }
 
 ReturnValue_t CcsdsIpCoreHandler::initialize() {
-  ReturnValue_t result = returnvalue::OK;
+
   AcceptsTelecommandsIF* tcDistributor =
       ObjectManager::instance()->get<AcceptsTelecommandsIF>(tcDestination);
   if (tcDistributor == nullptr) {
@@ -50,7 +51,7 @@ ReturnValue_t CcsdsIpCoreHandler::initialize() {
 
   tcDistributorQueueId = tcDistributor->getRequestQueue();
 
-  result = parameterHelper.initialize();
+  ReturnValue_t result = parameterHelper.initialize();
   if (result != returnvalue::OK) {
     return result;
   }
@@ -70,6 +71,7 @@ ReturnValue_t CcsdsIpCoreHandler::initialize() {
     return ObjectManagerIF::CHILD_INIT_FAILED;
   }
 
+  // This also pulls the PTME out of reset state.
   if (batPriorityParam == 0) {
     disablePrioritySelectMode();
   } else {
@@ -266,7 +268,6 @@ void CcsdsIpCoreHandler::startTransition(Mode_t mode, Submode_t submode) {
 void CcsdsIpCoreHandler::announceMode(bool recursive) { triggerEvent(MODE_INFO, mode, submode); }
 
 void CcsdsIpCoreHandler::disableTransmit() {
-  ptmeConfig.enableBatPriorityBit(false);
 #ifndef TE0720_1CFA
   gpioIF->pullLow(ptmeGpios.enableTxClock);
   gpioIF->pullLow(ptmeGpios.enableTxData);
@@ -296,6 +297,7 @@ void CcsdsIpCoreHandler::enablePrioritySelectMode() {
   ptmeConfig.enableBatPriorityBit(true);
   // Reset the PTME
   gpioIF->pullLow(ptmeGpios.ptmeResetn);
+  usleep(10);
   gpioIF->pullHigh(ptmeGpios.ptmeResetn);
 }
 
@@ -303,6 +305,7 @@ void CcsdsIpCoreHandler::disablePrioritySelectMode() {
   ptmeConfig.enableBatPriorityBit(false);
   // Reset the PTME
   gpioIF->pullLow(ptmeGpios.ptmeResetn);
+  usleep(10);
   gpioIF->pullHigh(ptmeGpios.ptmeResetn);
 }