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

hosted build compiling 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
2021-10-11 19:34:34 +02:00
parent 8d10dcbe18
commit 221012f790
10 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
linux/obc/Ptme.cpp
View File

@ -5,8 +5,7 @@
#include "fsfw/serviceinterface/ServiceInterface.h"
#include "PtmeConfig.h"
Ptme::Ptme(object_id_t objectId) :
SystemObject(objectId) {
Ptme::Ptme(object_id_t objectId): SystemObject(objectId) {
}
Ptme::~Ptme() {
@ -54,7 +53,7 @@ ReturnValue_t Ptme::writeToVc(uint8_t vcId, const uint8_t * data, size_t size) {
void Ptme::addVcInterface(VcId_t vcId, VcInterfaceIF* vc) {
if (vcId > config::NUMBER_OF_VIRTUAL_CHANNELS) {
if (vcId > common::NUMBER_OF_VIRTUAL_CHANNELS) {
sif::warning << "Ptme::addVcInterface: Invalid virtual channel ID" << std::endl;
return;
}

2
linux/obc/Ptme.h
View File

@ -78,7 +78,7 @@ private:
static const int PTME_DATA_REG_OFFSET = 256;
/** The file descriptor of the UIO driver */
int fd;
int fd = 0;
uint32_t* ptmeBaseAddress = nullptr;