summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Burnicki <martin.burnicki@meinberg.de>2022-08-02 14:45:03 +0200
committerMartin Burnicki <martin.burnicki@meinberg.de>2022-08-02 14:45:03 +0200
commit3befc6ae7e579d75b242811c499bada17f2e9b13 (patch)
tree9945ba465e50c4c9bb55526491a3c1660ff1cc88
parentc2a4f965bd1c480edc168a429ba0eaf35ce25851 (diff)
downloadmbgtools-lx-3befc6ae7e579d75b242811c499bada17f2e9b13.tar.gz
mbgtools-lx-3befc6ae7e579d75b242811c499bada17f2e9b13.zip
Fix MJD_AT_NTP_EPOCH in mbgtime.h, which has not yet been used, though
-rw-r--r--mbglib/common/mbgtime.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/mbglib/common/mbgtime.h b/mbglib/common/mbgtime.h
index f0ce77f..a867f70 100644
--- a/mbglib/common/mbgtime.h
+++ b/mbglib/common/mbgtime.h
@@ -1,7 +1,7 @@
/**************************************************************************
*
- * $Id: mbgtime.h 1.46 2021/03/16 12:20:48 martin REL_M $
+ * $Id: mbgtime.h 1.47 2022/08/02 12:41:23 martin.burnicki REL_M $
*
* Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany
*
@@ -10,6 +10,9 @@
*
* -----------------------------------------------------------------------
* $Log: mbgtime.h $
+ * Revision 1.47 2022/08/02 12:41:23 martin.burnicki
+ * Fixed MJD_AT_NTP_EPOCH, which was erraneously the same
+ * as MJD_AT_POSIX_EPOCH.
* Revision 1.46 2021/03/16 12:20:48 martin
* Updated some comments.
* Revision 1.45 2021/03/12 12:32:51 martin
@@ -428,7 +431,7 @@ typedef uint32_t MBG_TIME32U_T;
/**
* @defgroup group_mjd_numbers Modified Julian Day (MJD) numbers for some commonly used epochs
*
- * To compute the MJD for a given date just compute the days since epoch
+ * To compute the MJD for a given date, just compute the days since epoch
* and add the constant number of days according to the epoch, e.g. for POSIX:
*
* current_unix_mjd = ( time( NULL ) / SECS_PER_DAY ) + MJD_AT_POSIX_EPOCH;
@@ -437,9 +440,9 @@ typedef uint32_t MBG_TIME32U_T;
*
* @{ */
-#define MJD_AT_GPS_EPOCH 44244UL ///< MJD at 1980-01-06, see @ref MBG_MJD_NUMBERS
-#define MJD_AT_POSIX_EPOCH 40587UL ///< MJD at 1970-01-01, see @ref MBG_MJD_NUMBERS
-#define MJD_AT_NTP_EPOCH 40587UL ///< MJD at 1900-01-01, see @ref MBG_MJD_NUMBERS
+#define MJD_AT_GPS_EPOCH 44244UL ///< MJD at 1980-01-06
+#define MJD_AT_POSIX_EPOCH 40587UL ///< MJD at 1970-01-01
+#define MJD_AT_NTP_EPOCH 15020UL ///< MJD at 1900-01-01
/** @} defgroup group_mjd_numbers */