Skip to content
Snippets Groups Projects
Commit 22c286f2 authored by Dimitrios Stoupis's avatar Dimitrios Stoupis
Browse files

Merge branch 'both-time-formats' into 'master' 

Keep both time formats

The CUC time format has been added to the `TimeHelper`. So, we have two possible time formats: the CUC (TAI compliant) and the CDS (UTC compliant), that are described in [CCSDS 301.0-B-4 ](https://public.ccsds.org/Pubs/301x0b4e1.pdf).

See merge request acubesat/obc/ecss-services!36
parents 260e377f 7225040a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment