From 695b161934052c7d18f1db7dbb04c71e66e6f3de Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 3 Nov 2020 16:54:56 +0100 Subject: [PATCH] some bugfixes --- osal/FreeRTOS/Clock.cpp | 8 ++++---- pus/Service9TimeManagement.cpp | 2 +- serviceinterface/ServiceInterfaceBuffer.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osal/FreeRTOS/Clock.cpp b/osal/FreeRTOS/Clock.cpp index 42f060b4..f3d8516a 100644 --- a/osal/FreeRTOS/Clock.cpp +++ b/osal/FreeRTOS/Clock.cpp @@ -68,10 +68,10 @@ ReturnValue_t Clock::getUptime(uint32_t* uptimeMs) { } -uint32_t Clock::getUptimeSeconds() { - timeval uptime = getUptime(); - return uptime.tv_sec; -} +//uint32_t Clock::getUptimeSeconds() { +// timeval uptime = getUptime(); +// return uptime.tv_sec; +//} ReturnValue_t Clock::getClock_usecs(uint64_t* time) { diff --git a/pus/Service9TimeManagement.cpp b/pus/Service9TimeManagement.cpp index 8c90ae40..5625bdd8 100644 --- a/pus/Service9TimeManagement.cpp +++ b/pus/Service9TimeManagement.cpp @@ -28,7 +28,7 @@ ReturnValue_t Service9TimeManagement::handleRequest(uint8_t subservice) { } ReturnValue_t Service9TimeManagement::setTime() { - TimeOfDay_t timeToSet; + Clock::TimeOfDay_t timeToSet; TimePacket timePacket(currentPacket.getApplicationData(), currentPacket.getApplicationDataSize()); ReturnValue_t result = CCSDSTime::convertFromCcsds(&timeToSet, diff --git a/serviceinterface/ServiceInterfaceBuffer.cpp b/serviceinterface/ServiceInterfaceBuffer.cpp index cede344c..68fc4dec 100644 --- a/serviceinterface/ServiceInterfaceBuffer.cpp +++ b/serviceinterface/ServiceInterfaceBuffer.cpp @@ -93,7 +93,7 @@ bool ServiceInterfaceBuffer::isBuffered() const { } std::string* ServiceInterfaceBuffer::getPreamble(size_t * preambleSize) { - TimeOfDay_t loggerTime; + Clock::TimeOfDay_t loggerTime; Clock::getDateAndTime(&loggerTime); size_t currentSize = 0; char* parsePosition = &preamble[0];