Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r31a5054c5a9a3c07ecfdced22fe25bb7ce4469cd -radeea598350354a833fff375526b888d0e6b6d48
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 31a5054c5a9a3c07ecfdced22fe25bb7ce4469cd)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision adeea598350354a833fff375526b888d0e6b6d48)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      05-Jan-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -476,7 +476,12 @@
 void handleDGSerialNumberRequest( void )
 {
     MESSAGE_T msg;
-    DG_SYSTEM_RECORD_T system = getDGSystemRecord();
+    DG_SYSTEM_RECORD_T system;
+
+    // Get the system's record. There are no arrays of system to check and also, raise no alarm since the system record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_SYS_RECORD, (U08*)&system, sizeof( DG_SYSTEM_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -507,18 +512,23 @@
 void handleDGServiceScheduleRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    DG_SERVICE_RECORD_T payload = getDGServiceRecord();
+    DG_SERVICE_RECORD_T service;
+
+    // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( DG_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_SERVICE_SCHEDULE_DATA;
+    msg.hdr.msgID      = MSG_ID_DG_SERVICE_SCHEDULE_DATA;
     msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
     // Fill message payload
-    memcpy( payloadPtr, &payload.lastServiceEpochDate, sizeof( U32 ) );
+    memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &payload.serviceIntervalSeconds, sizeof( U32 ) );
+    memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_REQUIRED );
@@ -3200,4 +3210,64 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleGetDGSoftwareConfigRecord function handles a request to get the DG
+* software configuration record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleGetDGSoftwareConfigRecord( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Tester must be logged in
+        if ( TRUE == isTestingActivated() )
+        {
+            result = sendRecordToDialin( NVDATAMGMT_SW_CONFIG_RECORD );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleSetDGSoftwareConfigRecord function handles a request to set the DG
+* software configuration record.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleSetDGSoftwareConfigRecord( MESSAGE_T *message )
+{
+    U32 currentMessage;
+    U32 totalMessages;
+    U32 payloadLength;
+
+    BOOL status = FALSE;
+    U08* payloadPtr = message->payload;
+
+    memcpy(&currentMessage, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&totalMessages, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    memcpy(&payloadLength, payloadPtr, sizeof(U32));
+    payloadPtr += sizeof(U32);
+
+    status = receiveRecordFromDialin( NVDATAMGMT_SW_CONFIG_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+}
+
 /**@}*/