Index: NVDataMgmt.c
===================================================================
diff -u -r575d7fda016d3fd647a53a5165d867709592c4e4 -r2e7123d1fa361b4bf15e20e5226a0c9366d443b2
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 575d7fda016d3fd647a53a5165d867709592c4e4)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2e7123d1fa361b4bf15e20e5226a0c9366d443b2)
@@ -1017,28 +1017,28 @@
             nvDataStartPtr = (U08*)&hdCalibrationRecord.hdCalibrationGroups.pumpsCalRecord;
             nvDataLength   = sizeof( hdCalibrationRecord.hdCalibrationGroups.pumpsCalRecord );
             for ( i = 0; i < NUM_OF_CAL_DATA_HD_PUMPS; i++ )
-                isNVDataValid  = ( 0 == hdCalibrationRecord.hdCalibrationGroups.pumpsCalRecord.hdPumps[ i ].calibrationTime ? FALSE : TRUE );
+                isNVDataValid  |= ( 0 == hdCalibrationRecord.hdCalibrationGroups.pumpsCalRecord.hdPumps[ i ].calibrationTime ? FALSE : TRUE );
             break;
 
         case GET_CAL_PRESSURE_SENSORS:
             nvDataStartPtr = (U08*)&hdCalibrationRecord.hdCalibrationGroups.pressureSensorsCalRecord;
             nvDataLength   = sizeof( hdCalibrationRecord.hdCalibrationGroups.pressureSensorsCalRecord );
             for ( i = 0; i < NUM_OF_CAL_DATA_HD_PRESSURE_SESNSORS; i++ )
-                isNVDataValid  = ( 0 == hdCalibrationRecord.hdCalibrationGroups.pressureSensorsCalRecord.hdPressureSensors[ i ].calibrationTime ? FALSE : TRUE );
+                isNVDataValid  |= ( 0 == hdCalibrationRecord.hdCalibrationGroups.pressureSensorsCalRecord.hdPressureSensors[ i ].calibrationTime ? FALSE : TRUE );
             break;
 
         case GET_CAL_OCCLUSION_SESNSORS:
             nvDataStartPtr = (U08*)&hdCalibrationRecord.hdCalibrationGroups.occlusionSensorsCalRecord;
             nvDataLength   = sizeof( hdCalibrationRecord.hdCalibrationGroups.occlusionSensorsCalRecord );
             for ( i = 0; i < NUM_OF_CAL_DATA_OCCLUSION_SENSORS; i++ )
-                isNVDataValid  = ( 0 == hdCalibrationRecord.hdCalibrationGroups.occlusionSensorsCalRecord.hdOcclusionSensors[ i ].calibrationTime ? FALSE : TRUE );
+                isNVDataValid  |= ( 0 == hdCalibrationRecord.hdCalibrationGroups.occlusionSensorsCalRecord.hdOcclusionSensors[ i ].calibrationTime ? FALSE : TRUE );
             break;
 
         case GET_CAL_VALVES:
             nvDataStartPtr = (U08*)&hdCalibrationRecord.hdCalibrationGroups.valvesCalRecord;
             nvDataLength   = sizeof( hdCalibrationRecord.hdCalibrationGroups.valvesCalRecord );
             for ( i = 0; i < NUM_OF_CAL_DATA_HD_VALVES; i++ )
-                isNVDataValid  = ( 0 == hdCalibrationRecord.hdCalibrationGroups.valvesCalRecord.hdvalves[ i ].calibrationTime ? FALSE : TRUE );
+                isNVDataValid |= ( 0 == hdCalibrationRecord.hdCalibrationGroups.valvesCalRecord.hdvalves[ i ].calibrationTime ? FALSE : TRUE );
             break;
 
         case GET_SYS_RECORD:
@@ -1217,9 +1217,21 @@
         }
         else
         {
-            activateAlarmNoData( nvAlarm );
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAL_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( nvAlarm );
+            }
+#ifndef _RELEASE_
+            else
+            {
+                isNVDataValid = TRUE;
+            }
+#endif
         }
     }
+
 #else
     isNVDataValid = TRUE;
 #endif