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

v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Conversation 0 Commits 107 Files Changed 81 +6 -9
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6effbaa85e - Show all commits

2
CMakeLists.txt
View File

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

2
q7s-env-em.sh
View File

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

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

@ -2,13 +2,10 @@
# 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} && "${1}" == "em" ] || [[ ${EIVE_Q7S_EM} == "1" ]]; then
if [ ! -z ${1} ]; then echo "-I- Installing EM binaries"
if [[ "${1}" == "em" ]]; then em_install="1"
echo "-I- Installing EM binaries" build_dir=cmake-build-release-q7s-em
em_install="1"
build_dir=cmake-build-release-q7s-em
fi
fi fi
init_dir=$(pwd) init_dir=$(pwd)