Robin Mueller da166c7bc3

resolve merge conflicts

2023-02-08 13:40:03 +01:00

..

acs

Merge branch 'develop' into eggert/acs

2023-02-08 13:21:49 +01:00

controllerdefinitions

Merge branch 'develop' into eggert/acs

2023-02-07 10:08:20 +01:00

AcsController.cpp

resolve merge conflicts

2023-02-08 13:40:03 +01:00

AcsController.h

merge aftermath:

2023-02-07 13:09:42 +01:00

CMakeLists.txt

afmt

2022-12-01 15:56:55 +01:00

ThermalController.cpp

com subsystem

2023-01-27 14:44:40 +01:00

ThermalController.h

disabled damaged PL PCDU1 TMP1075

2023-01-09 11:57:48 +01:00