KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

resolved merge conflicts

Browse Source
This commit is contained in:
Robin Müller 2020-12-10 16:57:43 +01:00
parent b1012b7cef
commit 50ad2c0380
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
power/Fuse.h
View File

@ -1,21 +1,11 @@
#ifndef FSFW_POWER_FUSE_H_ #ifndef FSFW_POWER_FUSE_H_
#define FSFW_POWER_FUSE_H_ #define FSFW_POWER_FUSE_H_
<<<<<<< HEAD
#include "PowerComponentIF.h" #include "PowerComponentIF.h"
#include "PowerSwitchIF.h" #include "PowerSwitchIF.h"
#include "../devicehandlers/HealthDevice.h" #include "../devicehandlers/HealthDevice.h"
#include "../monitoring/AbsLimitMonitor.h" #include "../monitoring/AbsLimitMonitor.h"
=======
#include "../datapoolglob/GlobalDataSet.h"
#include "../datapoolglob/GlobalPoolVariable.h"
#include "../datapoolglob/PIDReader.h"
#include "../devicehandlers/HealthDevice.h"
#include "../monitoring/AbsLimitMonitor.h"
#include "../power/PowerComponentIF.h"
#include "../power/PowerSwitchIF.h"
>>>>>>> upstream/development
#include "../returnvalues/HasReturnvaluesIF.h" #include "../returnvalues/HasReturnvaluesIF.h"
#include "../parameters/ParameterHelper.h" #include "../parameters/ParameterHelper.h"
#include <list> #include <list>
@ -94,26 +84,14 @@ private:
}; };
PowerMonitor powerMonitor; PowerMonitor powerMonitor;
<<<<<<< HEAD
StaticLocalDataSet<3> set; StaticLocalDataSet<3> set;
//LocalPoolDataSetBase* set = nullptr;
//PIDReader<float> voltage;
//PIDReader<float> current;
//PIDReader<uint8_t> state;
lp_var_t<float> voltage; lp_var_t<float> voltage;
lp_var_t<float> current; lp_var_t<float> current;
lp_var_t<uint8_t> state; lp_var_t<uint8_t> state;
lp_var_t<float> power; lp_var_t<float> power;
MessageQueueIF* commandQueue = nullptr; MessageQueueIF* commandQueue = nullptr;
=======
GlobDataSet set;
PIDReader<float> voltage;
PIDReader<float> current;
PIDReader<uint8_t> state;
gp_float_t power;
MessageQueueIF* commandQueue;
>>>>>>> upstream/development
ParameterHelper parameterHelper; ParameterHelper parameterHelper;
HealthHelper healthHelper; HealthHelper healthHelper;
static object_id_t powerSwitchId; static object_id_t powerSwitchId;