eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

some bugfixes

Browse Source
This commit is contained in:
Robin Müller 2020-11-03 16:54:56 +01:00
parent 9e97357b8c
commit 695b161934
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osal/FreeRTOS/Clock.cpp
View File

@ -68,10 +68,10 @@ ReturnValue_t Clock::getUptime(uint32_t* uptimeMs) {
} }
uint32_t Clock::getUptimeSeconds() { //uint32_t Clock::getUptimeSeconds() {
timeval uptime = getUptime(); // timeval uptime = getUptime();
return uptime.tv_sec; // return uptime.tv_sec;
} //}
ReturnValue_t Clock::getClock_usecs(uint64_t* time) { ReturnValue_t Clock::getClock_usecs(uint64_t* time) {

2
pus/Service9TimeManagement.cpp
View File

@ -28,7 +28,7 @@ ReturnValue_t Service9TimeManagement::handleRequest(uint8_t subservice) {
} }
ReturnValue_t Service9TimeManagement::setTime() { ReturnValue_t Service9TimeManagement::setTime() {
TimeOfDay_t timeToSet; Clock::TimeOfDay_t timeToSet;
TimePacket timePacket(currentPacket.getApplicationData(), TimePacket timePacket(currentPacket.getApplicationData(),
currentPacket.getApplicationDataSize()); currentPacket.getApplicationDataSize());
ReturnValue_t result = CCSDSTime::convertFromCcsds(&timeToSet, ReturnValue_t result = CCSDSTime::convertFromCcsds(&timeToSet,

2
serviceinterface/ServiceInterfaceBuffer.cpp
View File

@ -93,7 +93,7 @@ bool ServiceInterfaceBuffer::isBuffered() const {
} }
std::string* ServiceInterfaceBuffer::getPreamble(size_t * preambleSize) { std::string* ServiceInterfaceBuffer::getPreamble(size_t * preambleSize) {
TimeOfDay_t loggerTime; Clock::TimeOfDay_t loggerTime;
Clock::getDateAndTime(&loggerTime); Clock::getDateAndTime(&loggerTime);
size_t currentSize = 0; size_t currentSize = 0;
char* parsePosition = &preamble[0]; char* parsePosition = &preamble[0];