Index: firmware/App/Services/NVRecordsDD.c
===================================================================
diff -u -rf525d2be1e7038cacbe2bb34b8db3505cf26a350 -r0face6417892ea9de28d146bf88d44a9f30cf2a4
--- firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision f525d2be1e7038cacbe2bb34b8db3505cf26a350)
+++ firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision 0face6417892ea9de28d146bf88d44a9f30cf2a4)
@@ -247,7 +247,7 @@
             break;
 
         default:
-//            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE, nvDataMgmtSelfTestState );
+            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_INVALID_SELF_TEST_STATE, ( U32 )nvDataMgmtSelfTestState );
             nvDataMgmtSelfTestState  = NVDATAMGMT_SELF_TEST_STATE_COMPLETE;
             nvDataMgmtSelfTestResult = SELF_TEST_STATUS_FAILED;
             break;
@@ -433,13 +433,14 @@
         ddSystemGroup.crc                = crc16 ( (U08*)&ddSystemGroup, sizeof( DD_SYSTEM_GROUP_T ) - sizeof( U16 ) );
         status                           = FALSE;
 
-//        activateAlarmNoData( ALARM_ID_DD_INVALID_SYSTEM_RECORD_CRC );
+        activateAlarmNoData( ALARM_ID_DD_NVM_INVALID_SYSTEM_RECORD_CRC );
     }
     else
     {
+        // Verify the serial number from the system record
         if ( RECORD_DEFAULT_CHARACTER == ddSystemGroup.ddSystemRecord.topLevelSN[ 0 ] )
         {
-//            activateAlarmNoData( ALARM_ID_DD_INVALID_SERIAL_NUMBER );
+            activateAlarmNoData( ALARM_ID_DD_NVM_INVALID_SERIAL_NUMBER );
         }
     }
 
@@ -470,8 +471,8 @@
         ddServiceGroup.crc                                    = crc16 ( (U08*)&ddServiceGroup, sizeof( DD_SERVICE_GROUP_T ) - sizeof( U16 ) );
         status                                                = FALSE;
 
-        // Service record failure is also considered as RTC RAM failure
-//        activateAlarmNoData( ALARM_ID_DD_INVALID_SERVICE_RECORD_CRC );
+        // Service record failure
+        activateAlarmNoData( ALARM_ID_DD_NVM_INVALID_SERVICE_RECORD_CRC );
     }
 
     return status;
@@ -502,7 +503,7 @@
         ddUsageInfoGroup.crc                                      = crc16( (U08*)&ddUsageInfoGroup, sizeof( DD_USAGE_INFO_GROUP_T ) - sizeof( U16 ) );
         status                                                    = FALSE;
 
-//        activateAlarmNoData( ALARM_ID_DD_INVALID_USAGE_RECORD_CRC );
+        activateAlarmNoData( ALARM_ID_DD_NVM_INVALID_USAGE_RECORD_CRC );
     }
 
     return status;
@@ -661,7 +662,7 @@
         isCalRecordValid        = FALSE;
         ddCalibrationRecord.crc = crc16 ( (U08*)&ddCalibrationRecord, sizeof( DD_CALIBRATION_RECORD_T ) - sizeof( U16 ) );
 
-//        activateAlarmNoData( ALARM_ID_DD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID );
+        activateAlarmNoData( ALARM_ID_DD_NVM_INVALID_CALIBRATION_RECORD_CRC );
     }
 
     return isCalRecordValid;
@@ -1037,6 +1038,7 @@
 
                     default:
                         // TODO software fault
+                        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, ( U32 )acidType );
                         break;
                 }
                 break;
@@ -1061,6 +1063,7 @@
 
                     default:
                         // TODO software fault
+                        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, ( U32 )acidType );
                         break;
                 }
                 break;
@@ -1072,6 +1075,7 @@
 
             default:
                 // Software fault
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, ( U32 )operation );
                 break;
         }
 
@@ -1136,7 +1140,7 @@
                 break;
 
             default:
-//                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_USAGE_INFO_SELECTED, disinfect );
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_INVALID_USAGE_INFO_SELECTED, ( U32 )disinfect );
                 break;
         }
 
@@ -1150,7 +1154,7 @@
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WRITE_USAGE_INFO_TO_NV_FAILURE, disinfect );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_WRITE_USAGE_INFO_FAILURE, ( U32 )disinfect );
     }
 
     return status;
@@ -1169,7 +1173,7 @@
 {
     BOOL status = FALSE;
 
-    if ( getAvailableRecordQueueCount() >= ( MIN_JOBS_NEEDED_FOR_ALL_RECORDS + 1 ) )
+    if ( getAvailableRecordQueueCount() >= ( MIN_JOBS_NEEDED_TO_WRITE_ALL_RECORDS + 1 ) )
     {
         // When the service record is changed, all the sector 0 must be re-written plus the stack's usage information must be updated.
         // Therefore, at least 4 queues are needed to be able to update all the records. The usage records are changed:
@@ -1380,7 +1384,7 @@
             break;
 
         default:
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_NV_RECORD_SELECTED, nvData );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_NVM_INVALID_RECORD_SELECTED, ( U32 )nvData );
             break;
     }
 
@@ -1448,6 +1452,7 @@
 
         default:
             // Software fault
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, ( U32 )nvJob );
             break;
     }