Skip to content
Snippets Groups Projects
Commit d19b2ced authored by thodkatz's avatar thodkatz
Browse files

Trying to fix vera and clang-tidy

parent 1f851864
No related branches found
No related tags found
No related merge requests found
#include "Helpers/TimeHelper.hpp" #include "Helpers/TimeHelper.hpp"
bool TimeHelper::IsLeapYear(uint16_t year) { bool TimeHelper::IsLeapYear(uint16_t year) {
if (year % 4 != 0) {
if (year % 4 != 0) return false; return false;
if (year % 100 != 0) return true; }
if (year % 100 != 0) {
return true;
}
return (year % 400) == 0; return (year % 400) == 0;
} }
uint32_t TimeHelper::mkUTCtime(struct TimeAndDate &timeInfo) { uint32_t TimeHelper::mkUTCtime(struct TimeAndDate &timeInfo) {
uint32_t secs = 0; uint32_t secs = 0;
for (uint16_t y = 1970; y < timeInfo.year; ++y) for (uint16_t y = 1970; y < timeInfo.year; ++y) {
secs += (IsLeapYear(y) ? 366 : 365) * SecondsPerDay; secs += (IsLeapYear(y) ? 366 : 365) * SecondsPerDay;
}
for (uint16_t m = 1; m < timeInfo.month; ++m) { for (uint16_t m = 1; m < timeInfo.month; ++m) {
secs += DaysOfMonth[m - 1] * SecondsPerDay; secs += DaysOfMonth[m - 1] * SecondsPerDay;
if (m == 2 && IsLeapYear(timeInfo.year)) if (m == 2 && IsLeapYear(timeInfo.year)) {
secs += SecondsPerDay; secs += SecondsPerDay;
}
} }
secs += (timeInfo.day - 1) * SecondsPerDay; secs += (timeInfo.day - 1) * SecondsPerDay;
secs += timeInfo.hour * SecondsPerHour; secs += timeInfo.hour * SecondsPerHour;
...@@ -114,16 +118,16 @@ uint64_t TimeHelper::implementCDSTimeFormat(struct TimeAndDate &TimeInfo) { ...@@ -114,16 +118,16 @@ uint64_t TimeHelper::implementCDSTimeFormat(struct TimeAndDate &TimeInfo) {
return timeFormat; return timeFormat;
} }
struct TimeAndDate TimeHelper::parseCDSTimeFormat(uint8_t *timeData, uint8_t length) { struct TimeAndDate TimeHelper::parseCDSTimeFormat(uint8_t *data, uint8_t length) {
// check if we have the correct length of the packet data // check if we have the correct length of the packet data
assertI(length != 48, ErrorHandler::InternalErrorType::UnknownInternalError); assertI(length != 48, ErrorHandler::InternalErrorType::UnknownInternalError);
uint16_t elapsedDays = (static_cast<uint16_t >(timeData[0])) << 8 | static_cast<uint16_t > uint16_t elapsedDays = (static_cast<uint16_t >(data[0])) << 8 | static_cast<uint16_t >
(timeData[1]); (data[1]);
uint32_t msOfDay = (static_cast<uint32_t >(timeData[2])) << 24 | uint32_t msOfDay = (static_cast<uint32_t >(data[2])) << 24 |
(static_cast<uint32_t >(timeData[3])) << 16 | (static_cast<uint32_t >(data[3])) << 16 |
(static_cast<uint32_t >(timeData[4])) << 8 | (static_cast<uint32_t >(data[4])) << 8 |
static_cast<uint32_t >(timeData[5]); static_cast<uint32_t >(data[5]);
uint32_t seconds = elapsedDays * 86400 + msOfDay / 1000; uint32_t seconds = elapsedDays * 86400 + msOfDay / 1000;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment