v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
5 changed files with 47 additions and 3 deletions
Showing only changes of commit ca1e8f3dc1 - Show all commits

View File

@ -84,6 +84,7 @@ static constexpr char RS485_EN_TX_DATA[] = "tx_data_enable_ltc2872";
static constexpr char RS485_EN_RX_CLOCK[] = "rx_clock_enable_ltc2872"; static constexpr char RS485_EN_RX_CLOCK[] = "rx_clock_enable_ltc2872";
static constexpr char RS485_EN_RX_DATA[] = "rx_data_enable_ltc2872"; static constexpr char RS485_EN_RX_DATA[] = "rx_data_enable_ltc2872";
static constexpr char PDEC_RESET[] = "pdec_reset"; static constexpr char PDEC_RESET[] = "pdec_reset";
static constexpr char SYRLINKS_FAULT[] = "syrlinks_fault";
static constexpr char PL_PCDU_ENABLE_VBAT0[] = "enable_plpcdu_vbat0"; static constexpr char PL_PCDU_ENABLE_VBAT0[] = "enable_plpcdu_vbat0";
static constexpr char PL_PCDU_ENABLE_VBAT1[] = "enable_plpcdu_vbat1"; static constexpr char PL_PCDU_ENABLE_VBAT1[] = "enable_plpcdu_vbat1";

View File

@ -0,0 +1,16 @@
/*
* SyrlinksFaultFlagMonitoring.cpp
*
* Created on: 01.04.2022
* Author: jakob
*/
#include "SyrlinksFaultFlagMonitoring.h"
SyrlinksFaultFlagMonitoring::SyrlinksFaultFlagMonitoring() {
// TODO Auto-generated constructor stub
}
SyrlinksFaultFlagMonitoring::~SyrlinksFaultFlagMonitoring() {
// TODO Auto-generated destructor stub
}

View File

@ -0,0 +1,17 @@
/*
* SyrlinksFaultFlagMonitoring.h
*
* Created on: 01.04.2022
* Author: jakob
*/
#ifndef MISSION_DEVICES_SYRLINKSFAULTFLAGMONITORING_H_
#define MISSION_DEVICES_SYRLINKSFAULTFLAGMONITORING_H_
class SyrlinksFaultFlagMonitoring : public ExecutableObjectIF {
public:
SyrlinksFaultFlagMonitoring();
virtual ~SyrlinksFaultFlagMonitoring();
};
#endif /* MISSION_DEVICES_SYRLINKSFAULTFLAGMONITORING_H_ */

View File

@ -5,12 +5,13 @@
#include "OBSWConfig.h" #include "OBSWConfig.h"
SyrlinksHkHandler::SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie, SyrlinksHkHandler::SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
power::Switch_t powerSwitch) power::Switch_t powerSwitch, Gpio fault)
: DeviceHandlerBase(objectId, comIF, comCookie), : DeviceHandlerBase(objectId, comIF, comCookie),
rxDataset(this), rxDataset(this),
txDataset(this), txDataset(this),
temperatureSet(this), temperatureSet(this),
powerSwitch(powerSwitch) { powerSwitch(powerSwitch),
fault(fault){
if (comCookie == NULL) { if (comCookie == NULL) {
sif::warning << "SyrlinksHkHandler: Invalid com cookie" << std::endl; sif::warning << "SyrlinksHkHandler: Invalid com cookie" << std::endl;
} }
@ -442,6 +443,10 @@ LocalPoolDataSetBase* SyrlinksHkHandler::getDataSetHandle(sid_t sid) {
} }
} }
void SyrlinksHkHandler::performOperationHook() {
}
std::string SyrlinksHkHandler::convertUint16ToHexString(uint16_t intValue) { std::string SyrlinksHkHandler::convertUint16ToHexString(uint16_t intValue) {
std::stringstream stream; std::stringstream stream;
stream << std::setfill('0') << std::setw(4) << std::hex << std::uppercase << intValue; stream << std::setfill('0') << std::setw(4) << std::hex << std::uppercase << intValue;

View File

@ -4,6 +4,8 @@
#include "devices/powerSwitcherList.h" #include "devices/powerSwitcherList.h"
#include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h" #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
#include "fsfw_hal/linux/gpio/Gpio.h"
#include "fsfw/timemanager/Countdown.h"
#include <string.h> #include <string.h>
/** /**
@ -17,7 +19,7 @@
class SyrlinksHkHandler : public DeviceHandlerBase { class SyrlinksHkHandler : public DeviceHandlerBase {
public: public:
SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie, SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
power::Switch_t powerSwitch); power::Switch_t powerSwitch, Gpio fault);
virtual ~SyrlinksHkHandler(); virtual ~SyrlinksHkHandler();
/** /**
@ -42,6 +44,7 @@ class SyrlinksHkHandler : public DeviceHandlerBase {
ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap, ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
LocalDataPoolManager& poolManager) override; LocalDataPoolManager& poolManager) override;
LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override; LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
void performOperationHook();
private: private:
static const uint8_t INTERFACE_ID = CLASS_ID::SYRLINKS_HANDLER; static const uint8_t INTERFACE_ID = CLASS_ID::SYRLINKS_HANDLER;
@ -88,6 +91,8 @@ class SyrlinksHkHandler : public DeviceHandlerBase {
const power::Switch_t powerSwitch = power::NO_SWITCH; const power::Switch_t powerSwitch = power::NO_SWITCH;
Gpio fault;
uint8_t agcValueHighByte = 0; uint8_t agcValueHighByte = 0;
uint16_t rawTempPowerAmplifier = 0; uint16_t rawTempPowerAmplifier = 0;
uint16_t rawTempBasebandBoard = 0; uint16_t rawTempBasebandBoard = 0;