Marius Eggert 895d03a35c Merge branch 'develop' into eggert/acs ... # Conflicts: # dummies/CMakeLists.txt # mission/controller/AcsController.cpp # mission/controller/AcsController.h		2022-11-04 14:19:43 +01:00
..
AcsControllerDefinitions.h	add IDLE charge mode	2022-04-25 10:30:47 +02:00
AcsCtrlDefinitions.h	added event for SAFE to DETUMBLE transition. changed actuator input from double to int	2022-11-03 14:24:09 +01:00
ThermalControllerDefinitions.h	run auto-formatter	2022-06-17 08:31:36 +02:00