Jakob Meier 8d70560968 fixed conflicts

2022-03-17 19:52:37 +01:00

..

CMakeLists.txt

reworked cmake, unfortunately a big one due to interdependence

2022-02-09 21:38:56 +01:00

CoreController.cpp

update FSFW and related version handling

2022-03-14 17:52:31 +01:00

CoreController.h

update FSFW and related version handling

2022-03-14 17:52:31 +01:00

CoreDefinitions.h

update FSFW and related version handling

2022-03-14 17:52:31 +01:00

InitMission.cpp

added ploc helper objects

2022-03-16 17:00:07 +01:00

InitMission.h

applied formatting

2022-01-17 15:58:27 +01:00

ObjectFactory.cpp

fixed conflicts

2022-03-17 19:52:37 +01:00

ObjectFactory.h

use develop Object Factory

2022-03-14 17:55:02 +01:00

obsw.cpp

update obsw.cpp file

2022-03-14 17:53:48 +01:00

obsw.h

simple mode implemented

2021-06-30 15:18:41 +02:00

ParameterHandler.cpp

applied formatting

2022-01-17 15:58:27 +01:00

ParameterHandler.h

applied formatting

2022-01-17 15:58:27 +01:00