meggert 4fdb2de510 Merge branch 'develop' into acs-safe-mode-failure ... # Conflicts: # CHANGELOG.md # mission/controller/AcsController.cpp # mission/controller/AcsController.h		2023-03-15 10:06:02 +01:00
..
acs	Merge branch 'develop' into acs-safe-mode-failure	2023-03-15 10:06:02 +01:00
controllerdefinitions	fixed gpsDataProcessed dataSet size	2023-03-07 11:25:06 +01:00
AcsController.cpp	Merge branch 'develop' into acs-safe-mode-failure	2023-03-15 10:06:02 +01:00
AcsController.h	Merge branch 'develop' into acs-safe-mode-failure	2023-03-15 10:06:02 +01:00
CMakeLists.txt	afmt	2022-12-01 15:56:55 +01:00
ThermalController.cpp	wörkz	2023-03-01 16:36:21 +01:00
ThermalController.h	rework SUS polling	2023-02-28 19:14:15 +01:00