Index: firmware/.launches/DG.launch
===================================================================
diff -u -rcb586152197059cb52c33474f5b9be0855bbad51 -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6
--- firmware/.launches/DG.launch	(.../DG.launch)	(revision cb586152197059cb52c33474f5b9be0855bbad51)
+++ firmware/.launches/DG.launch	(.../DG.launch)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
@@ -6,7 +6,7 @@
 </mapAttribute>
 <mapAttribute key="ccs.memoryview.pageexpr">
 <mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser.PIN_CLONE_VIEW_1@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0x08011EAC"/>
-<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0x0801332C"/>
+<mapEntry key="org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowser@#$Texas Instruments XDS110 USB Debug Probe/CortexR4" value="@@0x080132EC"/>
 </mapAttribute>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/wsdg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rcb586152197059cb52c33474f5b9be0855bbad51 -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision cb586152197059cb52c33474f5b9be0855bbad51)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
@@ -94,6 +94,7 @@
             postState = DG_POST_STATE_FPGA;
 #ifdef SKIP_POST
             postState = DG_POST_STATE_COMPLETED;
+            postState = DG_POST_STATE_NVDATAMGMT;
 #endif
             break;
 
@@ -157,6 +158,7 @@
         case DG_POST_STATE_NVDATAMGMT:
             testStatus = execNVDataMgmtSelfTest();
             postState = handlePOSTStatus( testStatus );
+            //postState = DG_POST_STATE_COMPLETED;
             break;
 
         case DG_POST_STATE_WATCHDOG:
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rcb586152197059cb52c33474f5b9be0855bbad51 -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cb586152197059cb52c33474f5b9be0855bbad51)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
@@ -1137,10 +1137,6 @@
                 handleTestDGAccelBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_ACCEL_SET_CALIBRATION:
-                handleSetAccelCalibration( message );
-                break;
-
             case MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE:
                 handleSetDrainPumpDeltaPressureOverrideRequest( message );
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rcb586152197059cb52c33474f5b9be0855bbad51 -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cb586152197059cb52c33474f5b9be0855bbad51)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
@@ -855,7 +855,7 @@
 
 /*********************************************************************//**
  * @brief
- * The broadcastDGCalibrationRecord function sends out the DG calibration
+ * The sendDGCalibrationRecord function sends out the DG calibration
  * record.
  * @details Inputs: none
  * @details Outputs: DG calibration record msg constructed and queued
@@ -1990,31 +1990,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetAccelCalibration function handles a request to set
- * accelerometer calibration factors.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetAccelCalibration( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    if ( message->hdr.payloadLen == sizeof( ACCEL_CAL_PAYLOAD_T ) )
-    {
-        ACCEL_CAL_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof( ACCEL_CAL_PAYLOAD_T ) );
-        result = setAccelCalibration( payload.xOffset, payload.yOffset, payload.zOffset );
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestSetConductivityOverrideRequest function handles a
  * request to override a conductivity sensor's value
  * @details Inputs: none
@@ -2651,7 +2626,7 @@
 /*********************************************************************//**
 * @brief
 * The handleGetDGServiceRecord function handles a request to get the DG
-* last service data record.
+* service data record.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rcb586152197059cb52c33474f5b9be0855bbad51 -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision cb586152197059cb52c33474f5b9be0855bbad51)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
@@ -221,9 +221,6 @@
 // MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE:
 void handleTestDGAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_DG_ACCEL_SET_CALIBRATION:
-void handleSetAccelCalibration( MESSAGE_T *message );
-
 // MSG_ID_DG_START_STOP_INLET_UV_REACTOR
 void handleStartStopUVReactors( MESSAGE_T *message );