Index: Accel.c
===================================================================
diff -u -r2a312d7c2448c2ad754532e71c27cbe91f671a15 -raa1221efc98233c54a97a2cbbf7fb1a5a35d385d
--- Accel.c	(.../Accel.c)	(revision 2a312d7c2448c2ad754532e71c27cbe91f671a15)
+++ Accel.c	(.../Accel.c)	(revision aa1221efc98233c54a97a2cbbf7fb1a5a35d385d)
@@ -32,14 +32,16 @@
 
 #define ACCEL_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< interval (ms/task time) at which the accelerometer data is published on the CAN bus
 #define SIZE_OF_ROLLING_AVG                     ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< vector for tilt is filtered w/ moving average
-#define G_PER_LSB                               ( 0.004 )                                   ///< conversion from counts (LSB) to gravities
+#define G_PER_LSB                               ( 0.00390625 )                              ///< conversion from counts (LSB) to gravities
 #define NO_NEW_ACCEL_SAMPLES_TIMEOUT            ( 100 / TASK_PRIORITY_INTERVAL )            ///< maximum time w/o new accelerometer sample from FPGA.
 #define NOMINAL_ACCEL_VECTOR_LENGTH             ( 1.0 )                                     ///< expect unit vector length when system is stable
 #define MAX_ACCEL_VECTOR_LENGTH_ERROR           ( 0.1 )                                     ///< POST test looks at vector length at presumably stable moment - should be 1 +/- 0.1
 #define MAX_TILT_ANGLE                          ( 7.0 )                                     ///< maximum tilt of system before alarm.
 #define MIN_TILT_ANGLE_TO_CLEAR_ALARM           ( 5.0 )                                     ///< minimum tilt of system before alarm is cleared.
 #define MAX_TILT_PERSISTENCE                    ( 1 * MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< maximum time (in task intervals) that a tilt in excess of limit can persist before alarm
 #define MAX_SHOCK_ACCELERATION                  ( 2.0 )                                     ///< maximum shock (acceleration) measured on any axis before alarm.
+#define MAX_TILT_G                              ( 1.0 )                                     ///< maximum tilt (in g)
+#define MAX_TILT_ANGLE_DEG                      ( 90.0 )                                    ///< maximum tilt angle (in degrees)
 
 /// Enumeration of accelerometer monitor states.
 typedef enum Accelerometer_States
@@ -165,9 +167,10 @@
 static ACCEL_STATE_T handleAccelMonitorState( void )
 {
     ACCEL_STATE_T result = ACCELEROMETER_MONITOR_STATE;
-    S16 x, y, z;    // axis readings
-    S16 xm, ym, zm; // max axis readings since last time we read FPGA registers
-    U16 cnt;        // FPGA read counter
+    S16 x, y, z;          // axis readings
+    S16 xm, ym, zm;       // max axis readings since last time we read FPGA registers
+    F32 xMax, yMax, zMax; // max axis readings (in gs)
+    U16 cnt;              // FPGA read counter
 
     // read FPGA accelerometer registers
     getFPGAAccelAxes( &x, &y, &z );
@@ -206,9 +209,21 @@
     accelAxes[ ACCEL_AXIS_X ].data = (F32)x * G_PER_LSB + accelCalOffsets[ ACCEL_AXIS_X ];
     accelAxes[ ACCEL_AXIS_Y ].data = (F32)y * G_PER_LSB + accelCalOffsets[ ACCEL_AXIS_Y ];
     accelAxes[ ACCEL_AXIS_Z ].data = (F32)z * G_PER_LSB + accelCalOffsets[ ACCEL_AXIS_Z ];
-    accelMaxs[ ACCEL_AXIS_X ].data = (F32)xm * G_PER_LSB + accelCalOffsets[ ACCEL_AXIS_X ];
-    accelMaxs[ ACCEL_AXIS_Y ].data = (F32)ym * G_PER_LSB + accelCalOffsets[ ACCEL_AXIS_Y ];
-    accelMaxs[ ACCEL_AXIS_Z ].data = (F32)zm * G_PER_LSB + accelCalOffsets[ ACCEL_AXIS_Z ];
+    xMax = (F32)xm * G_PER_LSB;
+    yMax = (F32)ym * G_PER_LSB;
+    zMax = (F32)zm * G_PER_LSB;
+    if ( xMax > accelMaxs[ ACCEL_AXIS_X ].data )
+    {
+        accelMaxs[ ACCEL_AXIS_X ].data = xMax;
+    }
+    if ( yMax > accelMaxs[ ACCEL_AXIS_Y ].data )
+    {
+        accelMaxs[ ACCEL_AXIS_Y ].data = yMax;
+    }
+    if ( zMax > accelMaxs[ ACCEL_AXIS_Z ].data )
+    {
+        accelMaxs[ ACCEL_AXIS_Z ].data = zMax;
+    }
 
     // filter readings to get a stable vector for tilt
     filterAccelReadings();
@@ -327,9 +342,9 @@
     // publish accelerometer data on interval
     if ( ++accelDataPublicationTimerCounter >= getPublishAccelDataInterval() )
     {
-        F32 x = getMeasuredAccelAxis( ACCEL_AXIS_X );
-        F32 y = getMeasuredAccelAxis( ACCEL_AXIS_Y );
-        F32 z = getMeasuredAccelAxis( ACCEL_AXIS_Z );
+        F32 x = accelAvgVector[ ACCEL_AXIS_X ];
+        F32 y = accelAvgVector[ ACCEL_AXIS_Y ];
+        F32 z = accelAvgVector[ ACCEL_AXIS_Z ];
         F32 xm = getMaxAccelAxis( ACCEL_AXIS_X );
         F32 ym = getMaxAccelAxis( ACCEL_AXIS_Y );
         F32 zm = getMaxAccelAxis( ACCEL_AXIS_Z );
@@ -338,7 +353,12 @@
         F32 zt = accelTilt[ ACCEL_AXIS_Z ];
 
         broadcastAccelData( x, y, z, xm, ym, zm, xt, yt, zt );
+        // reset publication timer counter
         accelDataPublicationTimerCounter = 0;
+        // reset max axes
+        accelMaxs[ ACCEL_AXIS_X ].data = 0.0;
+        accelMaxs[ ACCEL_AXIS_Y ].data = 0.0;
+        accelMaxs[ ACCEL_AXIS_Z ].data = 0.0;
     }
 }
 
@@ -399,9 +419,21 @@
     accelAvgVector[ ACCEL_AXIS_Y ] = accelReadingsTotal[ ACCEL_AXIS_Y ] / (F32)accelReadingsCount;
     accelAvgVector[ ACCEL_AXIS_Z ] = accelReadingsTotal[ ACCEL_AXIS_Z ] / (F32)accelReadingsCount;
     // calculate axis angles
-    accelTilt[ ACCEL_AXIS_X ] = RAD2DEG( asin( accelAvgVector[ ACCEL_AXIS_X ] ) );
-    accelTilt[ ACCEL_AXIS_Y ] = RAD2DEG( asin( accelAvgVector[ ACCEL_AXIS_Y ] ) );
-    accelTilt[ ACCEL_AXIS_Z ] = RAD2DEG( asin( accelAvgVector[ ACCEL_AXIS_Z ] ) );
+    for ( axis = ACCEL_AXIS_X; axis < NUM_OF_ACCEL_AXES; axis++ )
+    {
+        if ( accelAvgVector[ axis ] > MAX_TILT_G )
+        {
+            accelTilt[ axis ] = MAX_TILT_ANGLE_DEG;
+        }
+        else if ( accelAvgVector[ axis ] < ( MAX_TILT_G * -1.0 ) )
+        {
+            accelTilt[ axis ] = MAX_TILT_ANGLE_DEG * -1.0;
+        }
+        else
+        {
+            accelTilt[ axis ] = RAD2DEG( asin( accelAvgVector[ axis ] ) );
+        }
+    }
 }
 
 /*********************************************************************//**
@@ -411,9 +443,9 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param x : X axis magnitude of vector
- * @param y : Y axis magnitude of vector
- * @param z : Z axis magnitude of vector
+ * @param x X axis magnitude of vector
+ * @param y Y axis magnitude of vector
+ * @param z Z axis magnitude of vector
  * @return the length of the given vector.
  *************************************************************************/
 static F32 calcVectorLength( F32 x, F32 y, F32 z )
@@ -476,7 +508,7 @@
 {
     F32 maxX = fabs(getMaxAccelAxis( ACCEL_AXIS_X ));
     F32 maxY = fabs(getMaxAccelAxis( ACCEL_AXIS_Y ));
-    F32 maxZ = fabs(getMaxAccelAxis( ACCEL_AXIS_Z ) - 1.0);  // when system level, expect Z axis to be at 1 g normally
+    F32 maxZ = fabs(getMaxAccelAxis( ACCEL_AXIS_Z ));
     F32 maxAll = maxX;
     ACCEL_AXIS_T maxAxis = ACCEL_AXIS_X;
 
@@ -594,9 +626,9 @@
  * @details
  * Inputs : none
  * Outputs : accelCalOffsets[]
- * @param offsetX : offset calibration factor for X axis
- * @param offsetY : offset calibration factor for Y axis
- * @param offsetZ : offset calibration factor for Z axis
+ * @param offsetX offset calibration factor for X axis
+ * @param offsetY offset calibration factor for Y axis
+ * @param offsetZ offset calibration factor for Z axis
  * @return TRUE if calibration factors successfully set/stored, FALSE if not
  *************************************************************************/
 BOOL setAccelCalibration( F32 offsetX, F32 offsetY, F32 offsetZ )
@@ -630,9 +662,9 @@
  * @details
  * Inputs : accelCalOffsets[]
  * Outputs : none
- * @param offsetX : value to populate with X axis offset calibration factor
- * @param offsetY : value to populate with Y axis offset calibration factor
- * @param offsetZ : value to populate with Z axis offset calibration factor
+ * @param offsetX value to populate with X axis offset calibration factor
+ * @param offsetY value to populate with Y axis offset calibration factor
+ * @param offsetZ value to populate with Z axis offset calibration factor
  * @return none
  *************************************************************************/
 void getAccelCalibration( F32 *offsetX, F32 *offsetY, F32 *offsetZ )
@@ -649,7 +681,7 @@
  * @details
  * Inputs : none
  * Outputs : accelDataPublishInterval
- * @param value : override accelerometer data publish interval with (in ms)
+ * @param value override accelerometer data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetAccelDataPublishIntervalOverride( U32 value )
@@ -697,8 +729,8 @@
  * specified accelerometer axis with a given value.
  * Inputs : none
  * Outputs : accelAxes[]
- * @param axis : ID of sensor axis to override for
- * @param value : override value for the given axis
+ * @param axis ID of sensor axis to override for
+ * @param value override value for the given axis
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetAccelAxisOverride( U32 axis, F32 value )
@@ -725,7 +757,7 @@
  * @details
  * Inputs : none
  * Outputs : accelAxes[]
- * @param axis : ID of accelerometer axis to reset override for
+ * @param axis ID of accelerometer axis to reset override for
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetAccelAxisOverride( U32 axis )
@@ -751,8 +783,8 @@
  * specified accelerometer axis with a given value.
  * Inputs : none
  * Outputs : accelMaxs[]
- * @param axis : ID of sensor axis to override for
- * @param value : override value for the given axis maximum
+ * @param axis ID of sensor axis to override for
+ * @param value override value for the given axis maximum
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetAccelMaxOverride( U32 axis, F32 value )
@@ -779,7 +811,7 @@
  * @details
  * Inputs : none
  * Outputs : accelMaxs[]
- * @param axis : ID of accelerometer axis to reset override for
+ * @param axis ID of accelerometer axis to reset override for
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetAccelMaxOverride( U32 axis )
Index: NVDataMgmt.c
===================================================================
diff -u -r2a312d7c2448c2ad754532e71c27cbe91f671a15 -raa1221efc98233c54a97a2cbbf7fb1a5a35d385d
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2a312d7c2448c2ad754532e71c27cbe91f671a15)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision aa1221efc98233c54a97a2cbbf7fb1a5a35d385d)
@@ -268,7 +268,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 void initNVDataMgmt ( void )
@@ -307,7 +306,6 @@
  * @details
  * Inputs : MFG_DATA_T (data)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL setMfgData ( MFG_DATA_T data )
@@ -325,7 +323,6 @@
  * @details
  * Inputs : MFG_DATA_T* (buffer)
  * Outputs : BOOL (status)
- * @param none
  * @return BOOL (status)
  *************************************************************************/
 BOOL getMfgData ( MFG_DATA_T* buffer )
@@ -350,7 +347,6 @@
  * @details
  * Inputs : MFG_DATA_T (data)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL setCalibrationData ( CALIBRATION_DATA_T data )
@@ -372,7 +368,6 @@
  * @details
  * Inputs : CALIBRATION_DATA_T* (buffer)
  * Outputs : BOOL (status)
- * @param none
  * @return BOOL (status)
  *************************************************************************/
 BOOL getCalibrationData ( CALIBRATION_DATA_T* buffer )
@@ -396,7 +391,6 @@
  * @details
  * Inputs : SERVICE_DATA_T (data)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL setServiceDate ( SERVICE_DATA_T data )
@@ -422,7 +416,6 @@
  * @details
  * Inputs : SERVICE_DATA_T* (buffer)
  * Outputs : BOOL (status)
- * @param none
  * @return BOOL (status)
  *************************************************************************/
 BOOL getServiceDate ( SERVICE_DATA_T* buffer )
@@ -445,7 +438,6 @@
  * @details
  * Inputs : LOG_DATA_T* (data)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL writeLogData ( LOG_DATA_T* data )
@@ -469,7 +461,6 @@
  * @details
  * Inputs : READ_DATA_T* (buffer), U32 (length)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL readLogData ( READ_DATA_T* buffer, U32 length )
@@ -493,7 +484,6 @@
  * @details
  * Inputs : U32 (mins)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL setTreatmentTime ( U32 hours )
@@ -519,7 +509,6 @@
  * @details
  * Inputs : none
  * Outputs : U32
- * @param none
  * @return U32
  *************************************************************************/
 U32  getTreatmentTime ( void )
@@ -534,7 +523,6 @@
  * @details
  * Inputs : U32 (liters)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL setWaterConsumption ( U32 liters )
@@ -559,7 +547,6 @@
  * @details
  * Inputs : none
  * Outputs : U32
- * @param none
  * @return U32
  *************************************************************************/
 U32 getWaterConsumption ( void )
@@ -575,7 +562,6 @@
  * @details
  * Inputs : DISINFECTION_DATE_T (date)
  * Outputs : BOOL (status)
- * @param none
  * @return BOOL (status)
  *************************************************************************/
 BOOL setDisinfectionDate ( DISINFECTION_DATE_T date )
@@ -601,7 +587,6 @@
  * @details
  * Inputs : DISINFECTION_DATE_T* (buffer)
  * Outputs : BOOL (status)
- * @param none
  * @return BOOL (status)
  *************************************************************************/
 BOOL getDisinfectionDate ( DISINFECTION_DATE_T* buffer )
@@ -623,7 +608,6 @@
  * @details
  * Inputs : none
  * Outputs : SELF_TEST_STATUS_T
- * @param none
  * @return SELF_TEST_STATUS_T
  *************************************************************************/
 SELF_TEST_STATUS_T execNVDataMgmtSelfTest ( void )
@@ -712,7 +696,6 @@
  * @details
  * Inputs : U32 (flag)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 BOOL setBootloaderFlag ( U32 flag )
@@ -735,7 +718,6 @@
  * @details
  * Inputs : none
  * Outputs : U32 (flag value)
- * @param none
  * @return U32 (flag value)
  *************************************************************************/
 U32 getBootloaderFlag( void )
@@ -749,7 +731,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 void execNVDataMgmt( void )
@@ -813,7 +794,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestStart ( void )
@@ -835,7 +815,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestEnableEEPROM ( void )
@@ -865,7 +844,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadBootloaderFlag ( void )
@@ -906,7 +884,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadHDTreatmentTime ( void )
@@ -937,7 +914,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadDGWaterConsumption ( void )
@@ -966,7 +942,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadLogRecord ( void )
@@ -984,7 +959,7 @@
 
         currentTime = getMSTimerCount();
         // Get ready for reading the manufacturing record
-        Fapi_doMarginRead ( (U32*)BANK7_SECTOR0_START_ADDRESS, addr, len, Fapi_NormalRead );
+        Fapi_doMarginRead( (U32*)BANK7_SECTOR0_START_ADDRESS, addr, len, Fapi_NormalRead );
         state = NVDATAMGMT_SELF_TEST_STATE_READ_MFG_RECORD;
     }
 
@@ -998,7 +973,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadMfgRecord ( void )
@@ -1026,7 +1000,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadCalibrationRecord ( void )
@@ -1056,7 +1029,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadServiceRecord ( void )
@@ -1085,7 +1057,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestReadLastDisinfectionDate ( void )
@@ -1110,7 +1081,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_SELF_TEST_STATE_T
- * @param none
  * @return NVDATAMGMT_SELF_TEST_STATE_T
  *************************************************************************/
 static NVDATAMGMT_SELF_TEST_STATE_T handleSelfTestCheckCRC ( void )
@@ -1212,7 +1182,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_EXEC_STATE_T
- * @param none
  * @return NVDATAMGMT_EXEC_STATE_T
  *************************************************************************/
 static NVDATAMGMT_EXEC_STATE_T handleExecWaitForPostState ( void )
@@ -1234,7 +1203,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_EXEC_STATE_T
- * @param none
  * @return NVDATAMGMT_EXEC_STATE_T
  *************************************************************************/
 static NVDATAMGMT_EXEC_STATE_T handleExecIdleState ( void )
@@ -1303,7 +1271,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_EXEC_STATE_T
- * @param none
  * @return NVDATAMGMT_EXEC_STATE_T
  *************************************************************************/
 static NVDATAMGMT_EXEC_STATE_T handleExecWriteToEEPROMState ( void )
@@ -1326,7 +1293,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_EXEC_STATE_T
- * @param none
  * @return NVDATAMGMT_EXEC_STATE_T
  *************************************************************************/
 static NVDATAMGMT_EXEC_STATE_T handleExecReadFromEEPROMState ( void )
@@ -1350,7 +1316,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_EXEC_STATE_T
- * @param none
  * @return NVDATAMGMT_EXEC_STATE_T
  *************************************************************************/
 static NVDATAMGMT_EXEC_STATE_T handleExecEraseState ( void )
@@ -1374,7 +1339,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_EXEC_STATE_T
- * @param none
  * @return NVDATAMGMT_EXEC_STATE_T
  *************************************************************************/
 static NVDATAMGMT_EXEC_STATE_T handleExecWriteToRAMState ( void )
@@ -1399,7 +1363,6 @@
  * @details
  * Inputs : none
  * Outputs : NVDATAMGMT_EXEC_STATE_T
- * @param none
  * @return NVDATAMGMT_EXEC_STATE_T
  *************************************************************************/
 static NVDATAMGMT_EXEC_STATE_T handleExecReadFromRAMState ( void )
@@ -1425,7 +1388,6 @@
  * (location), U32 (startAddress), U08* (data), READ_DATA_T* (extAddress)
  * U32 (length)
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 static void setMemoryOpsStruct ( NVDATAMGMT_OPERATION_STATE_T ops, NVDATAMGMT_LOCATION_STATE_T location,
@@ -1463,7 +1425,6 @@
  * @details
  * Inputs : U08* (data)
  * Outputs : U32 (opsStartAddress)
- * @param none
  * @return U32 (opsStartAddress)
  *************************************************************************/
 static U32 prepareWriteLogJobAndGetStartAddress ( U08* data )
@@ -1516,7 +1477,6 @@
  * @details
  * Inputs : none
  * Outputs : U32 (opsStartAddress)
- * @param none
  * @return U32 (opsStartAddress)
  *************************************************************************/
 static U32 prepareReadLogJobAndGetStartAddress ( void )
@@ -1563,7 +1523,6 @@
  * (location), U32 (startAddress), U08* (data), READ_DATA_T* (extAddress)
  * U32 (length)
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 static void enqueue ( NVDATAMGMT_OPERATION_STATE_T ops, NVDATAMGMT_LOCATION_STATE_T location,
@@ -1625,7 +1584,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 static void dequeue ( void )
@@ -1653,7 +1611,6 @@
  * @details
  * Inputs : none
  * Outputs : isEmpty (BOOL)
- * @param none
  * @return isEmpty (BOOL)
  *************************************************************************/
 static BOOL isQueueEmpty ( void )
@@ -1675,7 +1632,6 @@
  * @details
  * Inputs : none
  * Outputs : isFull (BOOL)
- * @param none
  * @return isFull (BOOL)
  *************************************************************************/
 static BOOL isQueueFull ( void )
@@ -1696,7 +1652,6 @@
  * @details
  * Inputs : none
  * Outputs : U32
- * @param none
  * @return U32
  *************************************************************************/
 static U32 getAvailableQueueCount ( void )
@@ -1713,7 +1668,6 @@
  * @details
  * Inputs : none
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 static BOOL enqueueBank7Sector0Records( void )
@@ -1741,7 +1695,6 @@
  * @details
  * Inputs : ALARM_ID_T (alarm), U08* state (pointer to the state)
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 static BOOL didCommandTimeout ( ALARM_ID_T alarm, U08* state )
@@ -1769,7 +1722,6 @@
  * @details
  * Inputs : none
  * Outputs : BOOL
- * @param none
  * @return BOOL
  *************************************************************************/
 static BOOL eraseDataLogSectors ( void )
Index: Timers.c
===================================================================
diff -u -r2a312d7c2448c2ad754532e71c27cbe91f671a15 -raa1221efc98233c54a97a2cbbf7fb1a5a35d385d
--- Timers.c	(.../Timers.c)	(revision 2a312d7c2448c2ad754532e71c27cbe91f671a15)
+++ Timers.c	(.../Timers.c)	(revision aa1221efc98233c54a97a2cbbf7fb1a5a35d385d)
@@ -74,8 +74,8 @@
  * @details
  * Inputs : msTimerCount
  * Outputs : none
- * @param startMSCount : the ms count at the start of the timeout period
- * @param timeoutPeriod : the period for the timeout (in ms)
+ * @param startMSCount the ms count at the start of the timeout period
+ * @param timeoutPeriod the period for the timeout (in ms)
  * @return TRUE if a timeout has occurred, FALSE if not
  *************************************************************************/
 BOOL didTimeout( U32 startMSCount, U32 timeoutPeriod )
@@ -112,7 +112,7 @@
  * @details
  * Inputs : msTimerCount
  * Outputs : none
- * @param startMSCount : the ms count at the start of the period
+ * @param startMSCount the ms count at the start of the period
  * @return ms since given start time
  *************************************************************************/
 U32 calcTimeSince( U32 startMSCount )
@@ -140,8 +140,8 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param startMSCount : the ms count at the start of the period
- * @param endMSCount : the ms count at the end of the period
+ * @param startMSCount the ms count at the start of the period
+ * @param endMSCount the ms count at the end of the period
  * @return ms between two given times
  *************************************************************************/
 U32 calcTimeBetween( U32 startMSCount, U32 endMSCount )
Index: Utilities.c
===================================================================
diff -u -r2a312d7c2448c2ad754532e71c27cbe91f671a15 -raa1221efc98233c54a97a2cbbf7fb1a5a35d385d
--- Utilities.c	(.../Utilities.c)	(revision 2a312d7c2448c2ad754532e71c27cbe91f671a15)
+++ Utilities.c	(.../Utilities.c)	(revision aa1221efc98233c54a97a2cbbf7fb1a5a35d385d)
@@ -103,8 +103,8 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param address : pointer to start address of memory range to calculate CRC for
- * @param len : # of bytes in the memory range to calculate CRC for
+ * @param address pointer to start address of memory range to calculate CRC for
+ * @param len number of bytes in the memory range to calculate CRC for
  * @return CRC
  *************************************************************************/
 U16 crc16( const U08 *address, U32 len )
@@ -127,8 +127,8 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param address : pointer to start address of memory range to calculate CRC for
- * @param len : # of bytes in the memory range to calculate CRC for
+ * @param address pointer to start address of memory range to calculate CRC for
+ * @param len number of bytes in the memory range to calculate CRC for
  * @return CRC
  *************************************************************************/
 U08 crc8( const U08 *address, U32 len )
@@ -150,9 +150,9 @@
  * @details
  * Inputs : none
  * Outputs : all time windowed count variables for a given time windowed count are initialized.
- * @param cnt : ID of the time windowed count to initialize
- * @param maxCnt : maximum number of instances in the time window for this count
- * @param winMs : number of ms in the time window for this count
+ * @param cnt ID of the time windowed count to initialize
+ * @param maxCnt maximum number of instances in the time window for this count
+ * @param winMs number of ms in the time window for this count
  * @return none
  *************************************************************************/
 void initTimeWindowedCount( TIME_WINDOWED_COUNT_T cnt, U32 maxCnt, U32 winMs )
@@ -204,7 +204,7 @@
  * @details
  * Inputs : timeWindowedCounts[][], timeWindowedCountIndexes[], timeWindowedCountCounts[]
  * Outputs : timeWindowedCounts[][], timeWindowedCountIndexes[], timeWindowedCountCounts[]
- * @param cnt : ID of the time windowed count to add an instance to
+ * @param cnt ID of the time windowed count to add an instance to
  * @return TRUE if this instances brings the count to the maximum within \n
  * this counts time window, otherwise FALSE
  *************************************************************************/
@@ -248,7 +248,7 @@
  * @details
  * Inputs : none
  * Outputs : given critical data record's value is retrieved.
- * @param data : Ptr to a critical data record
+ * @param data Ptr to a critical data record
  * @return The data from a critical data record
  *************************************************************************/
 CRITICAL_DATAS_T getCriticalData( CRITICAL_DATA_T *data )
@@ -284,8 +284,8 @@
  * @details
  * Inputs : none
  * Outputs : given critical data record's value is set to given value
- * @param data : Ptr to a critical data record
- * @param value : a value to set
+ * @param data Ptr to a critical data record
+ * @param value a value to set
  * @return none
  *************************************************************************/
 void setCriticalData( CRITICAL_DATA_T *data, CRITICAL_DATAS_T value )
@@ -314,7 +314,7 @@
  * @details
  * Inputs : none
  * Outputs : Given critical data record is reset
- * @param data : Ptr to a critical data record
+ * @param data Ptr to a critical data record
  * @return none
  *************************************************************************/
 void resetCriticalData( CRITICAL_DATA_T *data )