Robin Mueller 3159574cfa

resolve more merge conflicts

2023-02-08 21:41:19 +01:00

..

acs

replaced all chained locks

2023-02-08 17:02:59 +01:00

controllerdefinitions

Merge remote-tracking branch 'origin/develop' into add_heater_info_set

2023-02-08 21:39:27 +01:00

AcsController.cpp

removed sensorValues inits

2023-02-08 17:02:22 +01:00

AcsController.h

removed sensorValues inits

2023-02-08 17:02:22 +01:00

CMakeLists.txt

afmt

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

ThermalController.cpp

resolve more merge conflicts

2023-02-08 21:41:19 +01:00

ThermalController.h

Merge remote-tracking branch 'origin/develop' into add_heater_info_set

2023-02-08 21:39:27 +01:00