Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ECSS Services
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AcubeSat-OBC
ECSS Services
Commits
67456dd6
Commit
67456dd6
authored
6 years ago
by
thodkatz
Browse files
Options
Downloads
Patches
Plain Diff
Trying to fix clang-tidy
parent
d19b2ced
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
inc/Helpers/TimeHelper.hpp
+1
-1
1 addition, 1 deletion
inc/Helpers/TimeHelper.hpp
src/Helpers/TimeHelper.cpp
+3
-3
3 additions, 3 deletions
src/Helpers/TimeHelper.cpp
with
4 additions
and
4 deletions
inc/Helpers/TimeHelper.hpp
+
1
−
1
View file @
67456dd6
...
@@ -91,7 +91,7 @@ public:
...
@@ -91,7 +91,7 @@ public:
* @param seconds elapsed seconds since Unix epoch
* @param seconds elapsed seconds since Unix epoch
* @return the UTC date based on the /p
* @return the UTC date based on the /p
*/
*/
static
struct
TimeAndDate
parseCDSTimeFormat
(
uint8_t
*
data
,
uint8_t
length
);
static
struct
TimeAndDate
parseCDSTimeFormat
(
const
uint8_t
*
data
,
uint8_t
length
);
/**
/**
* Dummy function created only to access mkUTCtime for testing
* Dummy function created only to access mkUTCtime for testing
...
...
This diff is collapsed.
Click to expand it.
src/Helpers/TimeHelper.cpp
+
3
−
3
View file @
67456dd6
...
@@ -96,13 +96,13 @@ uint64_t TimeHelper::implementCDSTimeFormat(struct TimeAndDate &TimeInfo) {
...
@@ -96,13 +96,13 @@ uint64_t TimeHelper::implementCDSTimeFormat(struct TimeAndDate &TimeInfo) {
* Agency-defined epoch,that it will be 1 January 1970(1/1/1970) 00:00:00(hours:minutes:seconds)
* Agency-defined epoch,that it will be 1 January 1970(1/1/1970) 00:00:00(hours:minutes:seconds)
* This epoch is configured from the current implementation, using mktime() function
* This epoch is configured from the current implementation, using mktime() function
*/
*/
uint16_t
elapsedDays
=
static_cast
<
uint16_t
>
(
seconds
/
86400
);
auto
elapsedDays
=
static_cast
<
uint16_t
>
(
seconds
/
86400
);
/**
/**
* The `ms of day` segment, 32 bits as defined in standard. The `ms of the day` and DAY`
* The `ms of day` segment, 32 bits as defined in standard. The `ms of the day` and DAY`
* should give the time passed from the defined epoch (1/1/1970)
* should give the time passed from the defined epoch (1/1/1970)
*/
*/
uint32_t
msOfDay
=
static_cast
<
uint32_t
>
((
seconds
%
86400
)
*
1000
);
auto
msOfDay
=
static_cast
<
uint32_t
>
((
seconds
%
86400
)
*
1000
);
/**
/**
* Define CDS time format
* Define CDS time format
...
@@ -118,7 +118,7 @@ uint64_t TimeHelper::implementCDSTimeFormat(struct TimeAndDate &TimeInfo) {
...
@@ -118,7 +118,7 @@ uint64_t TimeHelper::implementCDSTimeFormat(struct TimeAndDate &TimeInfo) {
return
timeFormat
;
return
timeFormat
;
}
}
struct
TimeAndDate
TimeHelper
::
parseCDSTimeFormat
(
uint8_t
*
data
,
uint8_t
length
)
{
struct
TimeAndDate
TimeHelper
::
parseCDSTimeFormat
(
const
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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment