Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init

CMakeLists.txt

@@ -149,6 +149,9 @@ set(OBSW_ADD_RW
 set(OBSW_ADD_SCEX_DEVICE
     ${INIT_VAL}
     CACHE STRING "Add Solar Cell Experiment module")
+set(OBSW_SYRLINKS_SIMULATED
+    ${OBSW_Q7S_EM}
+    CACHE STRING "Syrlinks is simulated")
 
 # ##############################################################################
 # Pre-Sources preparation

bsp_q7s/OBSWConfig.h.in

@@ -60,12 +60,12 @@
 /*******************************************************************/
 
 // Can be used to switch device to NORMAL mode immediately
-#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1
+#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    0
 #define OBSW_PRINT_MISSED_DEADLINES                 1
 
 #define OBSW_MPSOC_JTAG_BOOT                        0
 #define OBSW_STAR_TRACKER_GROUND_CONFIG             1
-#define OBSW_SYRLINKS_SIMULATED                     1
+#define OBSW_SYRLINKS_SIMULATED                     @OBSW_SYRLINKS_SIMULATED@
 #define OBSW_ADD_TEST_CODE                          0
 #define OBSW_ADD_TEST_TASK                          0
 #define OBSW_ADD_TEST_PST                           0

bsp_q7s/boardconfig/busConf.h

@@ -20,7 +20,7 @@ static constexpr char UART_SCEX_DEV[] = "/dev/scex";
 static constexpr char UIO_PDEC_REGISTERS[] = "/dev/uio_pdec_regs";
 static constexpr char UIO_PTME[] = "/dev/uio_ptme";
 static constexpr char UIO_PDEC_CONFIG_MEMORY[] = "/dev/uio_pdec_cfg_mem";
-static constexpr char UIO_PDEC_RAM[] = "/dev/pdec_ram";
+static constexpr char UIO_PDEC_RAM[] = "/dev/uio_pdec_ram";
 static constexpr int MAP_ID_PTME_CONFIG = 3;
 
 namespace uiomapids {

bsp_q7s/core/ObjectFactory.cpp

@@ -705,7 +705,7 @@ void ObjectFactory::createReactionWheelComponents(LinuxLibgpioIF* gpioComIF,
 #endif /* OBSW_ADD_RW == 1 */
 }
 
-void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
+ReturnValue_t ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
   using namespace gpio;
   // GPIO definitions of signals connected to the virtual channel interfaces of the PTME IP Core
   GpioCookie* gpioCookiePtmeIp = new GpioCookie;
@@ -805,6 +805,7 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
                                     Direction::OUT, Levels::LOW);
   gpioRS485Chip->addGpio(gpioIds::RS485_EN_RX_DATA, gpio);
   gpioChecker(gpioComIF->addGpios(gpioRS485Chip), "RS485 Transceiver");
+  return returnvalue::OK;
 }
 
 void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,

bsp_q7s/core/ObjectFactory.h

@@ -37,7 +37,7 @@ void createSolarArrayDeploymentComponents(PowerSwitchIF& pwrSwitcher, GpioIF& gp
 void createSyrlinksComponents(PowerSwitchIF* pwrSwitcher);
 void createPayloadComponents(LinuxLibgpioIF* gpioComIF);
 void createReactionWheelComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher);
-void createCcsdsComponents(LinuxLibgpioIF* gpioComIF);
+ReturnValue_t createCcsdsComponents(LinuxLibgpioIF* gpioComIF);
 void createMiscComponents();
 
 void createTestComponents(LinuxLibgpioIF* gpioComIF);

common/config/devConf.h

@@ -55,7 +55,7 @@ namespace uart {
 
 static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024;
 static constexpr UartBaudRate SYRLINKS_BAUD = UartBaudRate::RATE_38400;
-static constexpr UartBaudRate SCEX_BAUD = UartBaudRate::RATE_38400;
+static constexpr UartBaudRate SCEX_BAUD = UartBaudRate::RATE_115200;
 static constexpr UartBaudRate GNSS_BAUD = UartBaudRate::RATE_9600;
 static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
 static constexpr UartBaudRate PLOC_SUPV_BAUD = UartBaudRate::RATE_115200;

fsfw

@@ -1 +1 @@
-Subproject commit fa01798ebb4fb35a88ddc1d632832b9ba3dc642e
+Subproject commit 852f27cec27fadfad1ff38aa1e7f01e91d4b2b36

linux/obc/AxiPtmeConfig.cpp

@@ -4,7 +4,7 @@
 #include "fsfw_hal/linux/uio/UioMapper.h"
 
 AxiPtmeConfig::AxiPtmeConfig(object_id_t objectId, std::string axiUio, int mapNum)
-    : SystemObject(objectId), axiUio(axiUio), mapNum(mapNum) {
+    : SystemObject(objectId), axiUio(std::move(axiUio)), mapNum(mapNum) {
   mutex = MutexFactory::instance()->createMutex();
   if (mutex == nullptr) {
     sif::warning << "Failed to create mutex" << std::endl;

linux/obc/PapbVcInterface.cpp

@@ -8,7 +8,7 @@ PapbVcInterface::PapbVcInterface(LinuxLibgpioIF* gpioComIF, gpioId_t papbBusyId,
     : gpioComIF(gpioComIF),
       papbBusyId(papbBusyId),
       papbEmptyId(papbEmptyId),
-      uioFile(uioFile),
+      uioFile(std::move(uioFile)),
       mapNum(mapNum) {}
 
 PapbVcInterface::~PapbVcInterface() {}

scripts/install-obsw-yocto.sh

@@ -2,7 +2,7 @@
 # This is a helper script to install the compiles EIVE OBSW files
 # into the yocto repository to re-generate the mission root filesystem
 build_dir=cmake-build-release-q7s
-if [ ! -z ${1} && "${1}" == "em" ] || [[ ${EIVE_Q7S_EM} == "1" ]]; then
+if [[ ! -z ${1} && "${1}" == "em" ]] || [[ ${EIVE_Q7S_EM} == "1" ]]; then
   echo "-I- Installing EM binaries"
   em_install="1"
   build_dir=cmake-build-release-q7s-em
@@ -17,7 +17,7 @@ q7s_package_path="q7s-package/${q7s_yocto_dir}"
 obsw_version_filename="obsw_version.txt"
 yocto_obsw_path="yocto/meta-eive/recipes-core/eive-obsw/files"
 variant_specific_path=""
-if [ ${em_install} == "1" ]; then
+if [[ ${em_install} == "1" ]]; then
   variant_specific_path="${yocto_obsw_path}/em"
 else
   variant_specific_path="${yocto_obsw_path}/fm"

tmtc

@@ -1 +1 @@
-Subproject commit 47ef66fcd17b67e3cb9fe5e7f08025a705a7d015
+Subproject commit 38385f7826c6a1002029ba3572035d12d0e5d0fa