fixed merge conflicts

2021-04-26 17:50:36 +02:00
parent ebdc492ed1 ec76222907
commit d63c825c7f
17 changed files with 929 additions and 23 deletions
--- a/mission/devices/IMTQHandler.cpp
+++ b/mission/devices/IMTQHandler.cpp
@ -21,7 +21,7 @@ void IMTQHandler::doStartUp(){
 	if(mode == _MODE_START_UP){
 	    //TODO: Set to MODE_ON again
 		setMode(MODE_NORMAL);
-		communicationStep = CommunicationStep::SELT_TEST;
+		communicationStep = CommunicationStep::SELF_TEST;
 	}
 }