Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r34ed52c598042fdcfa5526e3b1d46fa09b040199 -r90b9d26ec61408366dcc745b583a69414a2271cd
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 34ed52c598042fdcfa5526e3b1d46fa09b040199)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 90b9d26ec61408366dcc745b583a69414a2271cd)
@@ -255,7 +255,7 @@
     // Persistent alarm for temperature sensors internal error
     // When the FPGA read count does not increment for a period of time, it is considered as an internal error of the temperature sensors
     // driver. This is internal because FPGA does not error out if the FPGA read count does not increment.
-    initPersistentAlarm( ALARM_ID_TEMPERATURE_SENSORS_FAULT, TEMPERATURE_SENSORS_FPGA_ERROR_PERSISTENT_PERIOD, TEMPERATURE_SENSORS_FPGA_ERROR_PERSISTENT_PERIOD );
+    initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, TEMPERATURE_SENSORS_FPGA_ERROR_PERSISTENT_PERIOD, TEMPERATURE_SENSORS_FPGA_ERROR_PERSISTENT_PERIOD );
 }
 
 /*********************************************************************//**
@@ -559,7 +559,7 @@
 
     BOOL isThereAnError = !isFPGACountChanging || !isFPGAErrorZero;
 
-    checkPersistentAlarm( ALARM_ID_TEMPERATURE_SENSORS_FAULT, isThereAnError, sensorIndex, TEMPERATURE_SENSORS_FPGA_ERROR_PERSISTENT_PERIOD );
+    checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, isThereAnError, sensorIndex, TEMPERATURE_SENSORS_FPGA_ERROR_PERSISTENT_PERIOD );
 
     return isADCValid;
 }
@@ -670,7 +670,7 @@
     if ( ( TRUE == isLessThanZero ) || ( TRUE == isGreaterThanFullScale ) )
     {
         tempSensorsSelfTestResult = SELF_TEST_STATUS_FAILED;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TEMPERATURE_SENSORS_FAULT, TEMPSENSORS_SELF_TEST_ADC_CHECK );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, TEMPSENSORS_SELF_TEST_ADC_CHECK );
     }
 
     return TEMPSENSORS_SELF_TEST_COMPLETE;
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r0d46714bc22f87f7027c6e82ad59cef1a01ff69b -r90b9d26ec61408366dcc745b583a69414a2271cd
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 0d46714bc22f87f7027c6e82ad59cef1a01ff69b)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 90b9d26ec61408366dcc745b583a69414a2271cd)
@@ -121,7 +121,6 @@
     SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID,                         // 90
     SW_FAULT_ID_INVALID_PRESSURE_SENSOR_ID,
     SW_FAULT_ID_INVALID_TASK,
-    SW_FAULT_ID_INVALID_CRC_ALGO,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r0d46714bc22f87f7027c6e82ad59cef1a01ff69b -r90b9d26ec61408366dcc745b583a69414a2271cd
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 0d46714bc22f87f7027c6e82ad59cef1a01ff69b)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 90b9d26ec61408366dcc745b583a69414a2271cd)
@@ -176,7 +176,7 @@
     U16 fpgaFanOut2Pulse;                   ///< Reg 398. Fan outlet 2 pulse time in 2.5 resolution
     U16 fpgaFanIn3Pulse;                    ///< Reg 400. Fan inlet 3 pulse time in 2.5 resolution
     U16 fpgaFanOut3Pulse;                   ///< Reg 402. Fan outlet 3 pulse time in 2.5 resolution
-    U16 fpgaTimerCount;                     ///< Reg 404.  Internal FPGA timer count.
+    U16 fpgaTimerCount_ms;                  ///< Reg 404.  Internal FPGA timer count in ms.
 } DG_FPGA_SENSORS_T;
 
 typedef struct
@@ -1788,14 +1788,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGATimerCount function gets the latest FPGA timer count.
+ * The getFPGATimerCount function gets the latest FPGA timer millisecond count.
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last FPGA timer count
  *************************************************************************/
 U16 getFPGATimerCount( void )
 {
-    return fpgaSensorReadings.fpgaTimerCount;
+    return fpgaSensorReadings.fpgaTimerCount_ms;
 }
 
 /*********************************************************************//**
Fisheye: Tag 90b9d26ec61408366dcc745b583a69414a2271cd refers to a dead (removed) revision in file `firmware/App/Services/Integrity.c'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 90b9d26ec61408366dcc745b583a69414a2271cd refers to a dead (removed) revision in file `firmware/App/Services/Integrity.h'.
Fisheye: No comparison available.  Pass `N' to diff?