eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

first bits of cleanup
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
Details

Browse Source
This commit is contained in:
Marius Eggert
2023-07-28 11:36:20 +02:00
parent 88a8969142
commit a0025030f1
4 changed files with 99 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mission/controller/controllerdefinitions/PowerCtrlDefinitions.h
View File

@ -1,27 +1,31 @@
#ifndef MISSION_CONTROLLER_CONTROLLERDEFINITIONS_POWERCTRLDEFINITIONS_H_
#define MISSION_CONTROLLER_CONTROLLERDEFINITIONS_POWERCTRLDEFINITIONS_H_
#include <fsfw/datapool/PoolReadGuard.h>
#include <fsfw/datapoollocal/StaticLocalDataSet.h>
#include <fsfw/datapoollocal/localPoolDefinitions.h>
#include <mission/power/defs.h>
#include <cstdint>
namespace pwrctrl {
enum SetIds : uint32_t { STATE_OF_CHARGE_DATA };
enum SetIds : uint32_t { CORE_HK };
enum PoolIds : lp_id_t {
TOTAL_BATTERY_CURRENT,
OPEN_CIRCUIT_VOLTAGE_CHARGE,
COULOMB_COUNTER_CHARGE,
};
static constexpr uint8_t STATE_OF_CHARGE_ENTRIES = 2;
static constexpr uint8_t CORE_HK_ENTRIES = 3;
class StateOfChargedData : public StaticLocalDataSet<STATE_OF_CHARGE_ENTRIES> {
class CoreHk : public StaticLocalDataSet<CORE_HK_ENTRIES> {
public:
StateOfChargedData(HasLocalDataPoolIF* hkOwner)
: StaticLocalDataSet(hkOwner, STATE_OF_CHARGE_DATA) {}
CoreHk(HasLocalDataPoolIF* hkOwner) : StaticLocalDataSet(hkOwner, CORE_HK) {}
lp_var_t<int16_t> totalBatteryCurrent =
lp_var_t<int16_t>(sid.objectId, TOTAL_BATTERY_CURRENT, this);
lp_var_t<float> openCircuitVoltageCharge =
lp_var_t<float>(sid.objectId, OPEN_CIRCUIT_VOLTAGE_CHARGE, this);
lp_var_t<float> coulombCounterCharge =