various improvements

linux/fsfwconfig/OBSWConfig.h.in

@@ -11,11 +11,6 @@
 #cmakedefine BEAGLEBONEBLACK
 #cmakedefine EGSE
 
-#ifdef RASPBERRY_PI
-#include "rpiConfig.h"
-#elif defined(XIPHOS_Q7S)
-#include "q7sConfig.h"
-#endif
 #include "commonConfig.h"
 #include "OBSWVersion.h"
 
@@ -45,7 +40,7 @@ debugging. */
 #define OBSW_ENABLE_TIMERS                          1
 #define OBSW_ADD_MGT                                1
 #define OBSW_ADD_BPX_BATTERY_HANDLER                1
-#define OBSW_ADD_STAR_TRACKER                       0
+#define OBSW_ADD_STAR_TRACKER                       @OBSW_ADD_STAR_TRACKER@
 #define OBSW_ADD_PLOC_SUPERVISOR                    0
 #define OBSW_ADD_PLOC_MPSOC                         0
 #define OBSW_ADD_SUN_SENSORS                        1
@@ -68,11 +63,7 @@ debugging. */
 // at the wrong place. The system component might command all the Switches accordingly anyway
 #define OBSW_INITIALIZE_SWITCHES                    0
 
-#endif
-
-#ifdef EGSE
-#define OBSW_ADD_STAR_TRACKER                      1
-#endif
+#endif // XIPHOS_Q7S
 
 /*******************************************************************/
 /** All of the following flags should be disabled for mission code */
@@ -126,12 +117,7 @@ debugging. */
 #define OBSW_DEBUG_PLOC_MPSOC                       0
 #define OBSW_DEBUG_PLOC_SUPERVISOR                  0
 #define OBSW_DEBUG_PDEC_HANDLER	                    0
-
-#ifdef EGSE
-#define OBSW_DEBUG_STARTRACKER                      1
-#else
-#define OBSW_DEBUG_STARTRACKER                      0
-#endif
+#define OBSW_DEBUG_STARTRACKER                      @OBSW_DEBUG_STARTRACKER@
 
 #ifdef RASPBERRY_PI
 
@@ -149,14 +135,15 @@ debugging. */
 #define OBSW_ADD_RAD_SENSORS                        0
 #define OBSW_ADD_SYRLINKS                           0
 
-#endif
+#endif // RASPBERRY_PI
 
-/*******************************************************************/
-/** CMake Defines                                                  */
-/*******************************************************************/
 #cmakedefine EIVE_BUILD_GPSD_GPS_HANDLER
 
-#include "OBSWVersion.h"
+#ifdef RASPBERRY_PI
+#include "rpiConfig.h"
+#elif defined(XIPHOS_Q7S)
+#include "q7sConfig.h"
+#endif
 
 #ifdef __cplusplus
 
@@ -167,13 +154,6 @@ debugging. */
 namespace config {
 #endif
 
-/* Add mission configuration flags here */
-static constexpr uint32_t OBSW_FILESYSTEM_HANDLER_QUEUE_SIZE = 50;
-static constexpr uint32_t PLOC_UPDATER_QUEUE_SIZE = 50;
-static constexpr uint32_t STR_IMG_HELPER_QUEUE_SIZE = 50;
-
-static constexpr uint8_t LIVE_TM = 0;
-
 #ifdef __cplusplus
 }
 #endif