Index: firmware/App/Services/NVMsgQ.h
===================================================================
diff -u -rb442c93bd71649c2e7473c7013d32c534334cdcb -r724f9a0cf2b603e988a519420bf95f4aa4da4b93
--- firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision b442c93bd71649c2e7473c7013d32c534334cdcb)
+++ firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision 724f9a0cf2b603e988a519420bf95f4aa4da4b93)
@@ -29,15 +29,19 @@
 
 // ********** public definitions **********
 
-#define MIN_JOBS_NEEDED_FOR_SECTOR_0         5U                                                                 ///< Min queue count needed to erase and write all (5) records back in sector 0.
+#define NV_MEM_BASE_ADDRESS   BANK7_SECTOR0_START_ADDRESS
+#define NV_RECORD_SLOT_SIZE   4096      // 4K
+
+#define SYSTEM_RECORD_OFFSET   (0U * NV_RECORD_SLOT_SIZE)
+#define SERVICE_RECORD_OFFSET  (1U * NV_RECORD_SLOT_SIZE)
+#define CAL_RECORD_OFFSET      (2U * NV_RECORD_SLOT_SIZE)
+
+#define SYSTEM_RECORD_NV_MEM_START_ADDRESS      (NV_MEM_BASE_ADDRESS + SYSTEM_RECORD_OFFSET)
+#define SERVICE_RECORD_NV_MEM_START_ADDRESS     (NV_MEM_BASE_ADDRESS + SERVICE_RECORD_OFFSET)
+#define CAL_RECORD_NV_MEM_START_ADDRESS         (NV_MEM_BASE_ADDRESS + CAL_RECORD_OFFSET)
 #define DD_USAGE_INFO_START_ADDRESS          0x00000030 /* 48 */                                                ///< DG usage info start address in RTC RAM (48).
-#define DD_SCHEDULED_RUNS_START_ADDRESS      (DD_USAGE_INFO_START_ADDRESS + sizeof(DD_SERVICE_GROUP_T))         ///< DG scheduled runs start address in RTC RAM.
-#define DD_HEATERS_INFO_START_ADDRESS        (DD_SCHEDULED_RUNS_START_ADDRESS + sizeof(DD_HEATERS_INFO_GROUP_T))///< DG heaters info start address in RTC RAM.
-#define SW_CONFIGS_START_ADDRESS             0x00000100 /* 256 */                                               ///< Software configurations start address in RTC RAM.
 
-#define SYSTEM_RECORD_NV_MEM_START_ADDRESS   (BANK7_SECTOR0_START_ADDRESS)                                      ///< System record storage start address in NV memory.
-#define SERVICE_RECORD_NV_MEM_START_ADDRESS  (BANK7_SECTOR0_START_ADDRESS + BITS_12_FULL_SCALE)                 ///< Service record storage start address in NV memory.
-#define CAL_RECORD_NV_MEM_START_ADDRESS      (SERVICE_RECORD_NV_MEM_START_ADDRESS + BITS_12_FULL_SCALE)         ///< Calibration record storage start address in NV memory.
+#define MIN_JOBS_NEEDED_FOR_SECTOR_0         5U                                                                 ///< Min queue count needed to erase and write all (5) records back in sector 0.
 
 /// NVDataMgmt records read status
 typedef enum NVDataMgmt_NV_Records_Read_Status