esbo_ds/testArduino
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Errors fixed in both controller and device handler. Data are now read correctly in the test code but not here in the framework. Problem in reading one variable from datapool for the controller. General cleaning of the code and documentation.

Browse Source
This commit is contained in:
mmode
2021-09-15 17:31:20 +02:00
parent 04cfb85311
commit 510949b54d
25 changed files with 90 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mission/Controller/TCS_ThermalComponent.cpp
View File

@ -23,18 +23,8 @@ TCS_ThermalComponent::TCS_ThermalComponent(object_id_t reportingObjectId,
parameters.heaterSwitchoff }, priority,
ThermalComponentIF::STATE_REQUEST_NON_OPERATIONAL),
Heater(Heater), RedundantHeater(RedundantHeater),
nopParameters({ parameters.lowerNopLimit, parameters.upperNopLimit }) {
//Set thermal state once, then leave to operator.
/*DataSet mySet;
PoolVariable<int8_t> writableTargetState(targetStatePoolId, &mySet, PoolVariableIF::VAR_WRITE);
writableTargetState = ThermalComponentIF::STATE_REQUEST_NON_OPERATIONAL;
mySet.commit(PoolVariableIF::VALID);*/
}
TCS_ThermalComponent::~TCS_ThermalComponent() {
}
nopParameters({ parameters.lowerNopLimit, parameters.upperNopLimit }) {}
TCS_ThermalComponent::~TCS_ThermalComponent() {}
ThermalComponentIF::HeaterRequest TCS_ThermalComponent::performOperation(uint8_t opCode, bool redundancy, bool dual) {

3
mission/Controller/TCS_ThermalComponent.h
View File

@ -5,7 +5,6 @@
#include <fsfw/thermal/ThermalModuleIF.h>
#include <mission/Controller/ArduinoTCSTemperatureSensor.h>
#include <mission/Controller/TCS_Heater.h>
//#include <fsfw/thermal/Heater.h>
class TCS_ThermalComponent: public CoreComponent {
public:
@ -29,7 +28,7 @@ public:
ArduinoTCSTemperatureSensor *secondRedundantSensor,
TCS_Heater *Heater, TCS_Heater *RedundantHeater,
ThermalModuleIF *thermalModule, Parameters parameters,
Priority priority);
Priority priority);
virtual ~TCS_ThermalComponent();

5
mission/Controller/ThermalController.cpp
View File

@ -122,11 +122,6 @@ ReturnValue_t ThermalController::performOperation(uint8_t opCode) {
return HasReturnvaluesIF::RETURN_OK;
}
/*MessageQueueId_t ThermalController::getCommandQueue() const {
return commandQueue.getId();
}*/
void ThermalController::performControlOperation() {
//Done by overwritten performOperation!
}

26
mission/Controller/ThermalController.h
View File

@ -15,7 +15,6 @@
#include <mission/Controller/ArduinoTCSTemperatureSensor.h>
#include <mission/Controller/TCS_ThermalComponent.h>
#include <mission/Controller/TCS_Heater.h>
//#include <fsfw/thermal/ThermalModule.h>
#include <bsp_linux/fsfwconfig/objects/systemObjectList.h>
#include <bsp_linux/fsfwconfig/datapool/dataPoolInit.h>
@ -23,24 +22,15 @@
class ThermalController: public ControllerBase {
public:
//static const Mode_t MODE_ON = 1;
//static const Mode_t MODE_OFF = 2;
static const Submode_t NO_REDUNDANCY = 1;
static const Submode_t HEATER_REDUNDANCY = 2;
static const uint8_t COMPONENT_DOMAIN_ID = 1; //!< First number n of component domain IDs
//static const Event TCS_CONTROL_STRATEGY = MAKE_EVENT(0, SEVERITY::INFO); //!< Announcement mode for the TCS controller strategy, strategy is in p1
//static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ARDUINO_TCS;
//static const uint8_t INTERFACE_ID = CLASS_ID::THERMAL_CONTROLLER;
ThermalController(object_id_t objectId, object_id_t powerSwitcher, size_t commandQueueDepth);
virtual~ ThermalController();
ReturnValue_t initialize() override;
ReturnValue_t performOperation(uint8_t opCode) override;
//virtual MessageQueueId_t getCommandQueue() const;
private:
@ -71,31 +61,15 @@ private:
TCS_Heater REDUNDANT_HEATER_2;
std::list<TCS_Heater> heaters;
std::list<TCS_Heater> redundant_heaters;
/*--------------------------------------------------------------------------------*/
/*const float T_min = -50 + 273.15; // [K]
const float T_max = 50 + 273.15; // [K]
static const uint8_t margin = 5; // ESA qualification margin [K]
static const uint8_t DT_heater = 10; // margin of heater activation [K]
static const uint8_t DT_redundancy = 5; // margin of redundancy activation [K]*/
// Start of the clock when heater is turned-on (one clock defined for each heater), reset when heater turned-off
// const float Dt[36] = {0.0}; // time interval for check of heater activation [s]
//ThermalComponentIF* findComponentByObjectId(object_id_t id);
protected:
//Mode_t mode;
//Submode_t submode;
/* Extended Controller Base overrides */
ReturnValue_t handleCommandMessage(CommandMessage *message) override;
void performControlOperation() override;
ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, uint32_t *msToReachTheMode) override;
void startTransition(Mode_t mode, Submode_t submode) override;
//void calculateStrategy(bool announce, bool redundancy);
//void modeChanged(Mode_t mode, Submode_t submode) override;
//void getMode(Mode_t *mode, Submode_t *submode) override;
//void changeHK(Mode_t mode, Submode_t submode, bool enable) override;