esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

updated clock module

Browse Source
This commit is contained in:
Robin Müller 2021-03-03 17:13:37 +01:00
parent 9a3cd1d7fc
commit 6580aa73bf
2 changed files with 119 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
timemanager/CCSDSTime.cpp
View File

@ -396,12 +396,20 @@ ReturnValue_t CCSDSTime::convertToCcsds(OBT_FLP* to, const timeval* from) {
ReturnValue_t CCSDSTime::convertFromCcsds(timeval* to, const uint8_t* from, ReturnValue_t CCSDSTime::convertFromCcsds(timeval* to, const uint8_t* from,
size_t* foundLength, size_t maxLength) { size_t* foundLength, size_t maxLength) {
//We don't expect ascii here. SHOULDDO if(maxLength >= 19) {
Clock::TimeOfDay_t timeOfDay;
/* Try to parse it as ASCII */
ReturnValue_t result = convertFromASCII(&timeOfDay, from, maxLength);
if (result == RETURN_OK) {
return Clock::convertTimeOfDayToTimeval(&timeOfDay, to);
}
}
uint8_t codeIdentification = (*from >> 4); uint8_t codeIdentification = (*from >> 4);
switch (codeIdentification) { switch (codeIdentification) {
//unsupported, as Leap second correction would have to be applied /* Unsupported, as Leap second correction would have to be applied */
// case CUC_LEVEL1: case CUC_LEVEL1:
// return convertFromCUC(to, from, foundLength, maxLength); return UNSUPPORTED_TIME_FORMAT;
case CDS: case CDS:
return convertFromCDS(to, from, foundLength, maxLength); return convertFromCDS(to, from, foundLength, maxLength);
case CCS: case CCS: