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

CMakeLists.txt

@@ -105,7 +105,7 @@ set(OBSW_ADD_ACS_CTRL
     ${INIT_VAL}
     CACHE STRING "Add ACS controller")
 set(OBSW_ADD_RTD_DEVICES
-    1
+    ${INIT_VAL}
     CACHE STRING "Add RTD devices")
 set(OBSW_ADD_RAD_SENSORS
     ${INIT_VAL}

bsp_q7s/em/emObjectFactory.cpp

@@ -43,13 +43,14 @@ void ObjectFactory::produce(void* args) {
   // createSunSensorComponents(gpioComIF, spiMainComIF, pwrSwitcher, q7s::SPI_DEFAULT_DEV);
   // createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher, spiMainComIF);
   // createTmpComponents();
+  // createSolarArrayDeploymentComponents();
   createRadSensorComponent(gpioComIF);
 
 #if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
 #endif
   createHeaterComponents(gpioComIF, pwrSwitcher, healthTable);
-  createSolarArrayDeploymentComponents();
+
   createPayloadComponents(gpioComIF);
 
 #if OBSW_ADD_MGT == 1
@@ -71,6 +72,9 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_TEST_CODE == 1
   createTestComponents(gpioComIF);
 #endif /* OBSW_ADD_TEST_CODE == 1 */
+#if OBSW_ADD_SCEX_DEVICE == 1
+  createScexComponents(q7s::UART_SCEX_DEV, pwrSwitcher, *SdCardManager::instance(), true, std::nullopt);
+#endif
 
   createMiscComponents();
   createAcsController();

dummies/CMakeLists.txt

@@ -12,6 +12,7 @@ target_sources(
          AcuDummy.cpp
          PduDummy.cpp
          P60DockDummy.cpp
+         SaDeploymentDummy.cpp
          GyroAdisDummy.cpp
          GyroL3GD20Dummy.cpp
          MgmLIS3MDLDummy.cpp

dummies/SaDeploymentDummy.cpp

@@ -0,0 +1,10 @@
+#include "SaDeploymentDummy.h"
+
+SaDeplDummy::SaDeplDummy(object_id_t objectId): SystemObject(objectId) {
+}
+
+SaDeplDummy::~SaDeplDummy() = default;
+
+ReturnValue_t SaDeplDummy::performOperation(uint8_t opCode) {
+	return returnvalue::OK;
+}

dummies/SaDeploymentDummy.h

@@ -0,0 +1,19 @@
+
+#ifndef DUMMIES_SADEPLOYMENT_H_
+#define DUMMIES_SADEPLOYMENT_H_
+
+#include "SaDeploymentDummy.h"
+#include <fsfw/devicehandlers/DeviceHandlerBase.h>
+
+class SaDeplDummy : public SystemObject, public ExecutableObjectIF {
+ public:
+
+  SaDeplDummy(object_id_t objectId);
+  virtual ~SaDeplDummy();
+
+  ReturnValue_t performOperation(uint8_t opCode) override;
+
+ protected:
+};
+
+#endif /* DUMMIES_SADEPLOYMENT_H_ */

dummies/helpers.cpp

@@ -14,6 +14,7 @@
 #include <dummies/PduDummy.h>
 #include <dummies/PlPcduDummy.h>
 #include <dummies/RwDummy.h>
+#include <dummies/SaDeploymentDummy.h>
 #include <dummies/StarTrackerDummy.h>
 #include <dummies/SusDummy.h>
 #include <dummies/SyrlinksDummy.h>
@@ -35,6 +36,7 @@ void dummy::createDummies(DummyCfg cfg) {
   new RwDummy(objects::RW2, objects::DUMMY_COM_IF, comCookieDummy);
   new RwDummy(objects::RW3, objects::DUMMY_COM_IF, comCookieDummy);
   new RwDummy(objects::RW4, objects::DUMMY_COM_IF, comCookieDummy);
+  new SaDeplDummy(objects::SOLAR_ARRAY_DEPL_HANDLER);
   new StarTrackerDummy(objects::STAR_TRACKER, objects::DUMMY_COM_IF, comCookieDummy);
   new SyrlinksDummy(objects::SYRLINKS_HK_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
   new ImtqDummy(objects::IMTQ_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);

q7s-env-em.sh

@@ -19,5 +19,5 @@ if [[ -d "eive-obsw" ]]; then
 	export PATH=$PATH:"$(pwd)/eive-obsw/scripts"
 	cd "eive-obsw"
 fi
-export CONSOLE_PREFIX="[Q7S ENV]"
+export CONSOLE_PREFIX="[Q7S ENV EM]"
 /bin/bash

scripts/install-obsw-yocto.sh

@@ -2,14 +2,11 @@
 # 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
-em_install="0"
+if [ ! -z ${1} && "${1}" == "em" ] || [[ ${EIVE_Q7S_EM} == "1" ]]; then
-if [ ! -z ${1} ]; then
-  if [[ "${1}" == "em" ]]; then
   echo "-I- Installing EM binaries"
   em_install="1"
   build_dir=cmake-build-release-q7s-em
 fi
-fi
 
 init_dir=$(pwd)
 
@@ -84,17 +81,17 @@ else
   echo "-I- Installed EIVE OBSW into yocto repository successfully"
 fi
 
-if [ ! -f ${build_dir}/${watchdog_bin_name} ]; then
+#if [ ! -f ${build_dir}/${watchdog_bin_name} ]; then
-  echo "-W- No EIVE Watchdog found to intall to yocto"
+#  echo "-W- No EIVE Watchdog found to intall to yocto"
-else
+#else
-  cp_cmd="cp $(pwd)/${build_dir}/${watchdog_bin_name} ${yocto_root}/${yocto_watchdog_path}/${watchdog_target_name}"
+#  cp_cmd="cp $(pwd)/${build_dir}/${watchdog_bin_name} ${yocto_root}/${yocto_watchdog_path}/${watchdog_target_name}"
-  echo "-I- Executing: ${cp_cmd}"
+#  echo "-I- Executing: ${cp_cmd}"
-  eval ${cp_cmd}
+#  eval ${cp_cmd}
-  cp_ver_cmd="cp $(pwd)/${obsw_version_filename} ${yocto_root}/${yocto_watchdog_path}"
+#  cp_ver_cmd="cp $(pwd)/${obsw_version_filename} ${yocto_root}/${yocto_watchdog_path}"
-  echo "-I- Executing: ${cp_ver_cmd}"
+#  echo "-I- Executing: ${cp_ver_cmd}"
-  eval ${cp_ver_cmd}
+#  eval ${cp_ver_cmd}
-  echo "-I- Installed EIVE watchdog into yocto repository successfully"
+#  echo "-I- Installed EIVE watchdog into yocto repository successfully"
-fi
+#fi
 
 if [ -f $(pwd)/${obsw_version_filename} ]; then
   rm $(pwd)/${obsw_version_filename}