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

Merge remote-tracking branch 'origin/develop' into mueller/master
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 2022-01-18 11:44:19 +01:00
commit c9fe3294ac
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/obc/PtmeIF.h
View File

@ -1,10 +1,10 @@
#ifndef LINUX_OBC_PTMEIF_H_ #ifndef LINUX_OBC_PTMEIF_H_
#define LINUX_OBC_PTMEIF_H_ #define LINUX_OBC_PTMEIF_H_
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include <cstddef> #include <cstddef>
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
/** /**
* @brief Interface class for managing the PTME IP Core implemented in the programmable logic. * @brief Interface class for managing the PTME IP Core implemented in the programmable logic.
* *

6
mission/devices/SyrlinksHkHandler.h
View File

@ -57,10 +57,10 @@ class SyrlinksHkHandler : public DeviceHandlerBase {
std::string resetCommand = "<C04:5A5A:FF41>"; std::string resetCommand = "<C04:5A5A:FF41>";
std::string readRxStatusRegCommand = "<E00::825B>"; std::string readRxStatusRegCommand = "<E00::825B>";
std::string setTxModeStandby = "<W04:0040:2B9E>"; std::string setTxModeStandby = "<W04:4000:7E58>";
/** W - write, 04 - 4 bytes in data field, 01 - value, 40 register to write value */ /** W - write, 04 - 4 bytes in data field, 01 - value, 40 register to write value */
std::string setTxModeModulation = "<W04:0140:5D2A>"; std::string setTxModeModulation = "<W04:4001:4D69>";
std::string setTxModeCw = "<W04:1040:81CF>"; std::string setTxModeCw = "<W04:4010:4968>";
std::string readTxStatus = "<R02:40:7555>"; std::string readTxStatus = "<R02:40:7555>";
std::string readTxWaveform = "<R02:44:B991>"; std::string readTxWaveform = "<R02:44:B991>";
std::string readTxAgcValueHighByte = "<R02:46:DFF3>"; std::string readTxAgcValueHighByte = "<R02:46:DFF3>";

2
mission/devices/devicedefinitions/SyrlinksDefinitions.h
View File

@ -20,7 +20,7 @@ static const DeviceCommandId_t READ_TX_AGC_VALUE_HIGH_BYTE = 0x09;
static const DeviceCommandId_t READ_TX_AGC_VALUE_LOW_BYTE = 0x0A; static const DeviceCommandId_t READ_TX_AGC_VALUE_LOW_BYTE = 0x0A;
/** Size of a simple transmission success response */ /** Size of a simple transmission success response */
static const uint8_t ACK_SIZE = 11; static const uint8_t ACK_SIZE = 12;
static const uint8_t SIZE_CRC_AND_TERMINATION = 5; static const uint8_t SIZE_CRC_AND_TERMINATION = 5;
/** The size of the header with the message identifier and the payload size field */ /** The size of the header with the message identifier and the payload size field */
static const uint8_t MESSAGE_HEADER_SIZE = 5; static const uint8_t MESSAGE_HEADER_SIZE = 5;

7
mission/tmtc/VirtualChannel.h
View File

@ -1,14 +1,11 @@
#ifndef VIRTUALCHANNEL_H_ #ifndef VIRTUALCHANNEL_H_
#define VIRTUALCHANNEL_H_ #define VIRTUALCHANNEL_H_
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "fsfw/ipc/MessageQueueIF.h"
#include "linux/obc/PtmeIF.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "fsfw/tmtcservices/AcceptsTelemetryIF.h" #include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
#include "fsfw/ipc/MessageQueueIF.h" #include "linux/obc/PtmeIF.h"
class StorageManagerIF; class StorageManagerIF;