Merge branch 'master' into mueller/master

bsp_linux/main.cpp

@@ -2,20 +2,14 @@
 #include <boardconfig/gcov.h>
 #endif
 
+#include <mission/core/InitMission.h>
+#include <fsfw/tasks/TaskFactory.h>
+
 #include <iostream>
 #include <version.h>
 #include <unistd.h>
 
-// This will be the entry to the mission specific code
-void initMission();
 
-#ifndef SW_VERSION
-#define SW_VERSION 0
-#endif
-
-#ifndef SW_SUBVERSION
-#define SW_SUBVERSION 0
-#endif
 
 /**
  * @brief 	This is the main program for the hosted build. It can be run for
@@ -29,10 +23,12 @@ int main(void)
     std::cout << "-- Software version v" << SW_VERSION << "." << SW_SUBVERSION
             << " -- " << std::endl;
     std::cout << "-- " <<  __DATE__ << " " << __TIME__ << " --" << std::endl;
-	initMission();
+
+	InitMission::initMission();
+
 	for(;;) {
 		// suspend main thread by sleeping it.
-		sleep(5);
+		TaskFactory::delayTask(5000);
 	}
 }