eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

WIP: SCEX Init #272

Closed
muellerr wants to merge 62 commits from irini into develop
pull from: irini
merge into: eive:develop
Conversation 1 Commits 62 Files Changed 40 +17 -12
7 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd40af34c8 - Show all commits

4
bsp_q7s/core/ObjectFactory.cpp
View File

@ -478,10 +478,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
acsBoardHelper, gpioComIF); acsBoardHelper, gpioComIF);
static_cast<void>(acsAss); static_cast<void>(acsAss);
#endif /* OBSW_ADD_ACS_HANDLERS == 1 */ #endif /* OBSW_ADD_ACS_HANDLERS == 1 */
#if OBSW_USE_CCSDS_IP_CORE == 1
createCcsdsComponents(gpioComIF);
#endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
} }
void ObjectFactory::createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher, void ObjectFactory::createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher,

2
generators/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 210 translations. * @brief Auto-generated event translation file. Contains 210 translations.
* @details * @details
* Generated on: 2022-07-08 16:45:10 * Generated on: 2022-08-08 17:10:35
*/ */
#include "translateEvents.h" #include "translateEvents.h"

2
generators/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file. * @brief Auto-generated object translation file.
* @details * @details
* Contains 134 translations. * Contains 134 translations.
* Generated on: 2022-07-08 16:45:09 * Generated on: 2022-08-08 17:10:35
*/ */
#include "translateObjects.h" #include "translateObjects.h"

2
linux/fsfwconfig/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 210 translations. * @brief Auto-generated event translation file. Contains 210 translations.
* @details * @details
* Generated on: 2022-07-08 16:45:10 * Generated on: 2022-08-08 17:10:35
*/ */
#include "translateEvents.h" #include "translateEvents.h"

2
linux/fsfwconfig/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file. * @brief Auto-generated object translation file.
* @details * @details
* Contains 134 translations. * Contains 134 translations.
* Generated on: 2022-07-08 16:45:09 * Generated on: 2022-08-08 17:10:35
*/ */
#include "translateObjects.h" #include "translateObjects.h"

15
scripts/install-obsw-yocto.sh
View File

@ -2,9 +2,11 @@
# This is a helper script to install the compiles EIVE OBSW files # This is a helper script to install the compiles EIVE OBSW files
# into the yocto repository to re-generate the mission root filesystem # into the yocto repository to re-generate the mission root filesystem
build_dir=cmake-build-release-q7s build_dir=cmake-build-release-q7s
em_install="0"
if [ ! -z ${1} ]; then if [ ! -z ${1} ]; then
if [[ "${1}" == "em" ]]; then if [[ "${1}" == "em" ]]; then
echo "-I- Installing EM binaries" echo "-I- Installing EM binaries"
em_install="1"
build_dir=cmake-build-release-q7s-em build_dir=cmake-build-release-q7s-em
fi fi
fi fi
@ -17,6 +19,13 @@ q7s_package_path="q7s-package/${q7s_yocto_dir}"
obsw_version_filename="obsw_version.txt" obsw_version_filename="obsw_version.txt"
yocto_obsw_path="yocto/meta-eive/recipes-core/eive-obsw/files" yocto_obsw_path="yocto/meta-eive/recipes-core/eive-obsw/files"
variant_specific_path=""
if [ ${em_install} == "1" ]; then
variant_specific_path="${yocto_obsw_path}/em"
else
variant_specific_path="${yocto_obsw_path}/fm"
fi
yocto_watchdog_path="yocto/meta-eive/recipes-support/eive-obsw-watchdog/files" yocto_watchdog_path="yocto/meta-eive/recipes-support/eive-obsw-watchdog/files"
obsw_bin_name="eive-obsw" obsw_bin_name="eive-obsw"
watchdog_bin_name="eive-watchdog" watchdog_bin_name="eive-watchdog"
@ -27,7 +36,7 @@ if [ ! -z ${EIVE_OBSW_ROOT} ]; then
cd ${EIVE_OBSW_ROOT} cd ${EIVE_OBSW_ROOT}
obsw_root=$(pwd) obsw_root=$(pwd)
elif [ -d ${build_dir} ]; then elif [ -d ${build_dir} ]; then
obsw_root=${build_dir} obsw_root=$(pwd)
: :
elif [ -d ../${build_dir} ]; then elif [ -d ../${build_dir} ]; then
cd .. cd ..
@ -66,10 +75,10 @@ fi
if [ ! -f ${build_dir}/${obsw_bin_name} ]; then if [ ! -f ${build_dir}/${obsw_bin_name} ]; then
echo "-W- No EIVE OBSW binary found to intall to yocto" echo "-W- No EIVE OBSW binary found to intall to yocto"
else else
cp_cmd="cp $(pwd)/${build_dir}/${obsw_bin_name} ${yocto_root}/${yocto_obsw_path}/${obsw_target_name}" cp_cmd="cp $(pwd)/${build_dir}/${obsw_bin_name} ${yocto_root}/${variant_specific_path}/${obsw_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_obsw_path}" cp_ver_cmd="cp $(pwd)/${obsw_version_filename} ${yocto_root}/${variant_specific_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 OBSW into yocto repository successfully" echo "-I- Installed EIVE OBSW into yocto repository successfully"

2
tmtc

@ -1 +1 @@
Subproject commit 937eb4829883b17e3a7a842528675c3609e24768 Subproject commit 6cb629c3c3ef0b109bc973e4b5b89ad176d373b3