IC:2021-04-06, Fix merge error from #286

Re-add timebase name definition `CFE_PSP_SOFT_TIMEBASE_NAME` to `cfe_psp.h`
nasa · Apr 7, 2021 · 3664f88 · 3664f88
1 parent ffc429d
commit 3664f88
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/fsw/inc/cfe_psp.h b/fsw/inc/cfe_psp.h
@@ -146,6 +146,13 @@
 #define CFE_PSP_RST_SUBTYPE_MAX 10
 /** \} */
 
+/**
+ * \brief The name of the software/RTOS timebase for general system timers.
+ *
+ * This name may be referred to by CFE TIME and/or SCH when setting up its own timers.
+ */
+#define CFE_PSP_SOFT_TIMEBASE_NAME "cFS-Master"
+
 /*
 ** Type Definitions
 */