EM installer updates

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}

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,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)