From 6effbaa85ed7c317f3fea5b89c5a53ba31f655a3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 20 Oct 2022 18:03:37 +0200
Subject: [PATCH] EM installer updates

---
 CMakeLists.txt                |  2 +-
 q7s-env-em.sh                 |  2 +-
 scripts/install-obsw-yocto.sh | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6a73014..43336bdd 100644
--- a/CMakeLists.txt
+++ b/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}
diff --git a/q7s-env-em.sh b/q7s-env-em.sh
index e8be1467..86737627 100755
--- a/q7s-env-em.sh
+++ b/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
diff --git a/scripts/install-obsw-yocto.sh b/scripts/install-obsw-yocto.sh
index c7880d2f..d9d94818 100755
--- a/scripts/install-obsw-yocto.sh
+++ b/scripts/install-obsw-yocto.sh
@@ -2,13 +2,10 @@
 # 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} ]; then
-  if [[ "${1}" == "em" ]]; then
-    echo "-I- Installing EM binaries"
-    em_install="1"
-    build_dir=cmake-build-release-q7s-em
-  fi
+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
 fi
 
 init_dir=$(pwd)