mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/development' into mueller/thermal-update

Browse Source
This commit is contained in:
Robin Müller
2020-12-10 16:30:21 +01:00
parent 50a1ee5691 4fbebcb019
commit 14e254141c
156 changed files with 6746 additions and 2519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
thermal/ThermalModule.h
View File

@ -5,8 +5,6 @@
#include "tcsDefinitions.h"
#include "RedundantHeater.h"
//#include "../datapoolglob/GlobalDataSet.h"
//#include "../datapoolglob/GlobalPoolVariable.h"
#include "../datapoollocal/LocalPoolDataSetBase.h"
#include "../datapoollocal/LocalPoolVariable.h"
#include "../devicehandlers/HealthDevice.h"
@ -78,7 +76,6 @@ protected:
Parameters parameters;
lp_var_t<float> moduleTemperature;
//gp_float_t moduleTemperature;
RedundantHeater *heater = nullptr;