From 545a276e61c1b289b4bc3c6545f8514c877a6afa Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Wed, 1 Dec 2021 15:54:19 -0500
Subject: [PATCH] Update build baseline and bump to v1.3.0-rc4+dev4

- Set build baseline to cFS-Caelum-rc4: v1.3.0-rc4
- Update mission rev to use 0xFF for development version
---
 README.md                    |  6 ++++++
 fsw/src/sample_app_version.h | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 75cf58e..090fce6 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,12 @@ sample_app is an example for how to build and link an application in cFS. See al
 
 ## Version History
 
+### Development Build: v1.3.0-rc4+dev4
+
+- Use CFE_MSG_PTR conversion macro
+- Update baseline for cFS-Caelum-rc4 to v1.3.0-rc4
+- See <https://github.com/nasa/sample_app/pull/163> and <https://github.com/nasa/cFS/pull/390>
+
 ### Development Build: v1.2.0-rc1+dev73
 
 - Apply CFE_SB_ValueToMsgId where required
diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h
index b75940a..fddd423 100644
--- a/fsw/src/sample_app_version.h
+++ b/fsw/src/sample_app_version.h
@@ -31,16 +31,23 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_APP_BUILD_NUMBER 73 /*!< Development Build: Number of commits since baseline */
+#define SAMPLE_APP_BUILD_NUMBER 4 /*!< Development Build: Number of commits since baseline */
 #define SAMPLE_APP_BUILD_BASELINE \
-    "v1.2.0-rc1" /*!< Development Build: git tag that is the base for the current development */
+    "v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */
 
 /* Version Macro Definitions */
 
-#define SAMPLE_APP_MAJOR_VERSION 1  /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
-#define SAMPLE_APP_MINOR_VERSION 1  /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
-#define SAMPLE_APP_REVISION      99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
-#define SAMPLE_APP_MISSION_REV   0  /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
+#define SAMPLE_APP_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
+#define SAMPLE_APP_MINOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
+#define SAMPLE_APP_REVISION      0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
+
+/*!
+ * @brief Mission revision.
+ *
+ * Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
+ * Values 1-254 are reserved for mission use to denote patches/customizations as needed.
+ */
+#define SAMPLE_APP_MISSION_REV 0xFF
 
 #define SAMPLE_APP_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */
 #define SAMPLE_APP_STR(x) \