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

compiles again
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2024-04-16 17:33:11 +02:00
parent 9477d04008
commit fac688d4c9
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux/payload/FreshMpsocHandler.cpp
View File

@ -51,6 +51,7 @@ void FreshMpsocHandler::performDeviceOperation(uint8_t opCode) {
} }
void FreshMpsocHandler::performDefaultDeviceOperation() { void FreshMpsocHandler::performDefaultDeviceOperation() {
handleQueue();
if (transitionActive) { if (transitionActive) {
if (targetMode == MODE_ON or targetMode == MODE_NORMAL) { if (targetMode == MODE_ON or targetMode == MODE_NORMAL) {
handleTransitionToOn(); handleTransitionToOn();
@ -99,7 +100,7 @@ void FreshMpsocHandler::performDefaultDeviceOperation() {
} }
ReturnValue_t FreshMpsocHandler::handleCommandMessage(CommandMessage* message) { ReturnValue_t FreshMpsocHandler::handleCommandMessage(CommandMessage* message) {
return FreshDeviceHandlerBase::handleCommandMessage(message); return returnvalue::FAILED;
} }
ReturnValue_t FreshMpsocHandler::initialize() { ReturnValue_t FreshMpsocHandler::initialize() {

8
linux/payload/SerialConfig.h
View File

@ -29,9 +29,10 @@ class SerialConfig : public CookieIF {
* One stop bit * One stop bit
*/ */
SerialConfig(std::string deviceFile, UartBaudRate baudrate, size_t maxReplyLen, SerialConfig(std::string deviceFile, UartBaudRate baudrate, size_t maxReplyLen,
UartModes uartMode = UartModes::NON_CANONICAL); UartModes uartMode = UartModes::NON_CANONICAL)
: deviceFile(deviceFile), baudrate(baudrate), maxReplyLen(maxReplyLen), uartMode(uartMode) {}
virtual ~SerialConfig(); virtual ~SerialConfig() = default;
UartBaudRate getBaudrate() const { return baudrate; } UartBaudRate getBaudrate() const { return baudrate; }
size_t getMaxReplyLen() const { return maxReplyLen; } size_t getMaxReplyLen() const { return maxReplyLen; }
@ -59,11 +60,10 @@ class SerialConfig : public CookieIF {
void setOneStopBit() { stopBits = StopBits::ONE_STOP_BIT; } void setOneStopBit() { stopBits = StopBits::ONE_STOP_BIT; }
private: private:
const object_id_t handlerId;
std::string deviceFile; std::string deviceFile;
const UartModes uartMode;
UartBaudRate baudrate; UartBaudRate baudrate;
size_t maxReplyLen = 0; size_t maxReplyLen = 0;
const UartModes uartMode;
Parity parity = Parity::NONE; Parity parity = Parity::NONE;
BitsPerWord bitsPerWord = BitsPerWord::BITS_8; BitsPerWord bitsPerWord = BitsPerWord::BITS_8;
StopBits stopBits = StopBits::ONE_STOP_BIT; StopBits stopBits = StopBits::ONE_STOP_BIT;

13
mission/pollingSeqTables.cpp
View File

@ -10,6 +10,7 @@
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "eive/definitions.h" #include "eive/definitions.h"
#include "eive/objects.h" #include "eive/objects.h"
#include "linux/payload/FreshMpsocHandler.h"
#include "linux/payload/FreshSupvHandler.h" #include "linux/payload/FreshSupvHandler.h"
#ifndef RPI_TEST_ADIS16507 #ifndef RPI_TEST_ADIS16507
@ -617,17 +618,21 @@ ReturnValue_t pst::pstPayload(FixedTimeslotTaskIF *thisSequence) {
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0,
DeviceHandlerIF::PERFORM_OPERATION); DeviceHandlerIF::PERFORM_OPERATION);
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::SEND_WRITE); thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::SEND_WRITE);
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::GET_WRITE);
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::SEND_READ);
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::GET_READ);
thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0, thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0,
FreshSupvHandler::OpCode::DEFAULT_OPERATION); FreshSupvHandler::OpCode::DEFAULT_OPERATION);
// Two COM TM steps, which might cover telemetry which takes a bit longer to be sent. // Parse TM with a bit of delay. Two COM steps which might cover telemetry wehich takes a bit
// longer to send
thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.1, thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.1,
FreshSupvHandler::OpCode::PARSE_TM); FreshSupvHandler::OpCode::PARSE_TM);
thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.2, thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.2,
FreshSupvHandler::OpCode::PARSE_TM); FreshSupvHandler::OpCode::PARSE_TM);
// Parse TM with a bit of delay. Two COM steps which might cover telemetry wehich takes a bit
// longer to send
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.2,
FreshMpsocHandler::OpCode::PARSE_TM);
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.4,
FreshMpsocHandler::OpCode::PARSE_TM);
thisSequence->addSlot(objects::SCEX, length * 0.6, DeviceHandlerIF::PERFORM_OPERATION); thisSequence->addSlot(objects::SCEX, length * 0.6, DeviceHandlerIF::PERFORM_OPERATION);
thisSequence->addSlot(objects::SCEX, length * 0.6, DeviceHandlerIF::SEND_WRITE); thisSequence->addSlot(objects::SCEX, length * 0.6, DeviceHandlerIF::SEND_WRITE);