v1.12.0 #269
@ -6,7 +6,6 @@
|
|||||||
#include "simple/simple.h"
|
#include "simple/simple.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -32,7 +32,6 @@ static const DeviceCommandId_t TM_CAM_CMD_RPT = 19;
|
|||||||
static const DeviceCommandId_t SET_UART_TX_TRISTATE = 20;
|
static const DeviceCommandId_t SET_UART_TX_TRISTATE = 20;
|
||||||
static const DeviceCommandId_t RELEASE_UART_TX = 21;
|
static const DeviceCommandId_t RELEASE_UART_TX = 21;
|
||||||
|
|
||||||
|
|
||||||
// Will reset the sequence count of the OBSW
|
// Will reset the sequence count of the OBSW
|
||||||
static const DeviceCommandId_t OBSW_RESET_SEQ_COUNT = 50;
|
static const DeviceCommandId_t OBSW_RESET_SEQ_COUNT = 50;
|
||||||
|
|
||||||
|
@ -1564,8 +1564,7 @@ class ExecutionReport : public VerificationReport {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case StatusCode::NOTHING_TODO: {
|
case StatusCode::NOTHING_TODO: {
|
||||||
sif::warning
|
sif::warning << STATUS_PRINTOUT_PREFIX << "Nothing todo, not an error but a warning"
|
||||||
<< STATUS_PRINTOUT_PREFIX << "Nothing todo, not an error but a warning"
|
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1578,8 +1577,7 @@ class ExecutionReport : public VerificationReport {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case StatusCode::OUT_OF_RANGE: {
|
case StatusCode::OUT_OF_RANGE: {
|
||||||
sif::warning
|
sif::warning << STATUS_PRINTOUT_PREFIX << "Out of range, lenght check of parameter failed"
|
||||||
<< STATUS_PRINTOUT_PREFIX << "Out of range, lenght check of parameter failed"
|
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -50,9 +50,11 @@ class SupvReturnValuesIF {
|
|||||||
static const ReturnValue_t FILENAME_TOO_LONG = MAKE_RETURN_CODE(0xB0);
|
static const ReturnValue_t FILENAME_TOO_LONG = MAKE_RETURN_CODE(0xB0);
|
||||||
//! [EXPORT] : [COMMENT] Received update status report with invalid packet length field
|
//! [EXPORT] : [COMMENT] Received update status report with invalid packet length field
|
||||||
static const ReturnValue_t UPDATE_STATUS_REPORT_INVALID_LENGTH = MAKE_RETURN_CODE(0xB1);
|
static const ReturnValue_t UPDATE_STATUS_REPORT_INVALID_LENGTH = MAKE_RETURN_CODE(0xB1);
|
||||||
//! [EXPORT] : [COMMENT] Update status report does not contain expected CRC. There might be a bit flip in the update memory region.
|
//! [EXPORT] : [COMMENT] Update status report does not contain expected CRC. There might be a bit
|
||||||
|
//! flip in the update memory region.
|
||||||
static const ReturnValue_t UPDATE_CRC_FAILURE = MAKE_RETURN_CODE(0xB2);
|
static const ReturnValue_t UPDATE_CRC_FAILURE = MAKE_RETURN_CODE(0xB2);
|
||||||
//! [EXPORT] : [COMMENT] Supervisor helper task ist currently executing a command (wait until helper tas has finished or interrupt by sending the terminate command)
|
//! [EXPORT] : [COMMENT] Supervisor helper task ist currently executing a command (wait until
|
||||||
|
//! helper tas has finished or interrupt by sending the terminate command)
|
||||||
static const ReturnValue_t SUPV_HELPER_EXECUTING = MAKE_RETURN_CODE(0xB3);
|
static const ReturnValue_t SUPV_HELPER_EXECUTING = MAKE_RETURN_CODE(0xB3);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ void PlocMPSoCHandler::performOperationHook() {
|
|||||||
ReturnValue_t PlocMPSoCHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
|
ReturnValue_t PlocMPSoCHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
|
||||||
const uint8_t* data, size_t size) {
|
const uint8_t* data, size_t size) {
|
||||||
ReturnValue_t result = RETURN_OK;
|
ReturnValue_t result = RETURN_OK;
|
||||||
switch(actionId) {
|
switch (actionId) {
|
||||||
case mpsoc::SET_UART_TX_TRISTATE: {
|
case mpsoc::SET_UART_TX_TRISTATE: {
|
||||||
uartIsolatorSwitch.pullLow();
|
uartIsolatorSwitch.pullLow();
|
||||||
return EXECUTION_FINISHED;
|
return EXECUTION_FINISHED;
|
||||||
@ -165,7 +165,7 @@ void PlocMPSoCHandler::doStartUp() {
|
|||||||
powerState = PowerState::ON;
|
powerState = PowerState::ON;
|
||||||
setMode(_MODE_TO_ON);
|
setMode(_MODE_TO_ON);
|
||||||
uartIsolatorSwitch.pullHigh();
|
uartIsolatorSwitch.pullHigh();
|
||||||
#endif/* not MSPOC_JTAG_BOOT == 1 */
|
#endif /* not MSPOC_JTAG_BOOT == 1 */
|
||||||
#else
|
#else
|
||||||
powerState = PowerState::ON;
|
powerState = PowerState::ON;
|
||||||
setMode(_MODE_TO_ON);
|
setMode(_MODE_TO_ON);
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
#define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
|
#define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
|
||||||
|
|
||||||
#include "OBSWConfig.h"
|
#include "OBSWConfig.h"
|
||||||
|
#include "PlocSupvHelper.h"
|
||||||
#include "bsp_q7s/memory/SdCardManager.h"
|
#include "bsp_q7s/memory/SdCardManager.h"
|
||||||
#include "devices/powerSwitcherList.h"
|
#include "devices/powerSwitcherList.h"
|
||||||
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
|
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
|
||||||
|
#include "fsfw/timemanager/Countdown.h"
|
||||||
#include "fsfw_hal/linux/gpio/Gpio.h"
|
#include "fsfw_hal/linux/gpio/Gpio.h"
|
||||||
#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
|
#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
|
||||||
#include "fsfw_hal/linux/uart/UartComIF.h"
|
#include "fsfw_hal/linux/uart/UartComIF.h"
|
||||||
#include "fsfw/timemanager/Countdown.h"
|
|
||||||
#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
|
#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
|
||||||
#include "linux/devices/devicedefinitions/SupvReturnValuesIF.h"
|
#include "linux/devices/devicedefinitions/SupvReturnValuesIF.h"
|
||||||
#include "PlocSupvHelper.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief This is the device handler for the supervisor of the PLOC which is programmed by
|
* @brief This is the device handler for the supervisor of the PLOC which is programmed by
|
||||||
@ -59,7 +59,6 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
|
|||||||
virtual ReturnValue_t doSendReadHook() override;
|
virtual ReturnValue_t doSendReadHook() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPERVISOR_HANDLER;
|
static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPERVISOR_HANDLER;
|
||||||
|
|
||||||
//! [EXPORT] : [COMMENT] PLOC supervisor crc failure in telemetry packet
|
//! [EXPORT] : [COMMENT] PLOC supervisor crc failure in telemetry packet
|
||||||
|
@ -64,13 +64,11 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha
|
|||||||
//! [EXPORT] : [COMMENT] Execution report failure
|
//! [EXPORT] : [COMMENT] Execution report failure
|
||||||
//! P1:
|
//! P1:
|
||||||
static const Event SUPV_EXE_FAILURE_REPORT = MAKE_EVENT(12, severity::LOW);
|
static const Event SUPV_EXE_FAILURE_REPORT = MAKE_EVENT(12, severity::LOW);
|
||||||
//! [EXPORT] : [COMMENT] Supervisor expected acknowledgment report but received space packet with other apid
|
//! [EXPORT] : [COMMENT] Supervisor expected acknowledgment report but received space packet with
|
||||||
//! P1: Apid of received space packet
|
//! other apid P1: Apid of received space packet P2: Internal state of supervisor helper
|
||||||
//! P2: Internal state of supervisor helper
|
|
||||||
static const Event SUPV_ACK_INVALID_APID = MAKE_EVENT(13, severity::LOW);
|
static const Event SUPV_ACK_INVALID_APID = MAKE_EVENT(13, severity::LOW);
|
||||||
//! [EXPORT] : [COMMENT] Supervisor helper expected execution report but received space packet with other apid
|
//! [EXPORT] : [COMMENT] Supervisor helper expected execution report but received space packet
|
||||||
//! P1: Apid of received space packet
|
//! with other apid P1: Apid of received space packet P2: Internal state of supervisor helper
|
||||||
//! P2: Internal state of supervisor helper
|
|
||||||
static const Event SUPV_EXE_INVALID_APID = MAKE_EVENT(14, severity::LOW);
|
static const Event SUPV_EXE_INVALID_APID = MAKE_EVENT(14, severity::LOW);
|
||||||
//! [EXPORT] : [COMMENT] Failed to receive acknowledgment report
|
//! [EXPORT] : [COMMENT] Failed to receive acknowledgment report
|
||||||
//! P1: Return value
|
//! P1: Return value
|
||||||
|
@ -6,9 +6,9 @@
|
|||||||
#include "OBSWConfig.h"
|
#include "OBSWConfig.h"
|
||||||
#include "fsfw/timemanager/Countdown.h"
|
#include "fsfw/timemanager/Countdown.h"
|
||||||
#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
|
#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
|
||||||
|
#include "mission/utility/Filenaming.h"
|
||||||
#include "mission/utility/ProgressPrinter.h"
|
#include "mission/utility/ProgressPrinter.h"
|
||||||
#include "mission/utility/Timestamp.h"
|
#include "mission/utility/Timestamp.h"
|
||||||
#include "mission/utility/Filenaming.h"
|
|
||||||
|
|
||||||
StrHelper::StrHelper(object_id_t objectId) : SystemObject(objectId) {}
|
StrHelper::StrHelper(object_id_t objectId) : SystemObject(objectId) {}
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include "Filenaming.h"
|
#include "Filenaming.h"
|
||||||
|
|
||||||
#include "Timestamp.h"
|
#include "Timestamp.h"
|
||||||
|
|
||||||
Filenaming::Filenaming() {
|
Filenaming::Filenaming() {}
|
||||||
}
|
|
||||||
|
|
||||||
std::string Filenaming::generateAbsoluteFilename(std::string path, std::string filename,
|
std::string Filenaming::generateAbsoluteFilename(std::string path, std::string filename,
|
||||||
bool addTimestamp) {
|
bool addTimestamp) {
|
||||||
|
@ -20,6 +20,7 @@ class Filenaming {
|
|||||||
*/
|
*/
|
||||||
static std::string generateAbsoluteFilename(std::string path, std::string filename,
|
static std::string generateAbsoluteFilename(std::string path, std::string filename,
|
||||||
bool addTimestamp);
|
bool addTimestamp);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Filenaming();
|
Filenaming();
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
#include <iomanip>
|
|
||||||
#include "ProgressPrinter.h"
|
#include "ProgressPrinter.h"
|
||||||
|
|
||||||
|
#include <iomanip>
|
||||||
|
|
||||||
#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
|
#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
|
||||||
|
|
||||||
ProgressPrinter::ProgressPrinter(std::string name, uint32_t numSteps, float percentageResolution)
|
ProgressPrinter::ProgressPrinter(std::string name, uint32_t numSteps, float percentageResolution)
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
*/
|
*/
|
||||||
class ProgressPrinter {
|
class ProgressPrinter {
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static constexpr float HALF_PERCENT = 0.5;
|
static constexpr float HALF_PERCENT = 0.5;
|
||||||
static constexpr float ONE_PERCENT = 1;
|
static constexpr float ONE_PERCENT = 1;
|
||||||
static constexpr float FIVE_PERCENT = 5;
|
static constexpr float FIVE_PERCENT = 5;
|
||||||
@ -34,7 +33,6 @@ class ProgressPrinter {
|
|||||||
void print(uint32_t step);
|
void print(uint32_t step);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
std::string name = "";
|
std::string name = "";
|
||||||
uint32_t numSteps = 0;
|
uint32_t numSteps = 0;
|
||||||
float nextProgressPrint = 0;
|
float nextProgressPrint = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user