Merge remote-tracking branch 'origin/develop' into heater_handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit

This commit is contained in:
2023-02-03 11:47:16 +01:00
51 changed files with 1415 additions and 534 deletions

View File

@ -35,6 +35,4 @@ AcsController* createAcsController(bool connectSubsystem);
void addTmtcIpCoresToFunnels(CcsdsIpCoreHandler& ipCoreHandler, PusTmFunnel& pusFunnel,
CfdpTmFunnel& cfdpFunnel);
void createThermalController(HeaterHandler& heaterHandler);
} // namespace ObjectFactory