Index: Accel.c
===================================================================
diff -u -r66600859e4fb3036f48901aae8c9845f37e3e707 -r33643a3ab1bcec2cd9b71e2977cb7c40750229c0
--- Accel.c	(.../Accel.c)	(revision 66600859e4fb3036f48901aae8c9845f37e3e707)
+++ Accel.c	(.../Accel.c)	(revision 33643a3ab1bcec2cd9b71e2977cb7c40750229c0)
@@ -35,19 +35,19 @@
 #define ACCEL_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )
 /// Vector for tilt is filtered w/ moving average.
 #define SIZE_OF_ROLLING_AVG                     ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )
-#define G_PER_LSB                               ( 0.00390625 )                                    ///< Conversion from counts (LSB) to gravities.
+#define G_PER_LSB                               ( 0.00390625F )                                   ///< Conversion from counts (LSB) to gravities.
 /// Maximum time w/o new accelerometer sample from FPGA.
 static const U32 NO_NEW_ACCEL_SAMPLES_TIMEOUT = ( 100 / TASK_PRIORITY_INTERVAL );
-#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 MAX_TILT_ANGLE_TO_CLEAR_ALARM           ( 5.0 )                                           ///< Maximum tilt of system before alarm is cleared.
+#define NOMINAL_ACCEL_VECTOR_LENGTH             ( 1.0F )                                          ///< Expect unit vector length when system is stable.
+#define MAX_ACCEL_VECTOR_LENGTH_ERROR           ( 0.1F )                                          ///< POST test looks at vector length at presumably stable moment - should be 1 +/- 0.1.
+#define MAX_TILT_ANGLE                          ( 7.0F )                                          ///< Maximum tilt of system before alarm.
+#define MAX_TILT_ANGLE_TO_CLEAR_ALARM           ( 5.0F )                                          ///< Maximum tilt of system before alarm is cleared.
 /// Maximum time (in task intervals) that a tilt in excess of limit can persist before alarm.
 static const U32 MAX_TILT_PERSISTENCE         = ( 1 * MS_PER_SECOND / TASK_PRIORITY_INTERVAL );
-#define MAX_SHOCK_ACCELERATION                  ( 2.5 )                                           ///< Maximum shock (acceleration) measured on any axis before alarm.
-#define MAX_SHOCK_TO_CLEAR_ALARM                ( 1.0 )                                           ///< Maximum shock (acceleration) measured on any axis in order to clear alarm.
-#define MAX_TILT_G                              ( 1.0 )                                           ///< Maximum tilt (in g).
-#define MAX_TILT_ANGLE_DEG                      ( 90.0 )                                          ///< Maximum tilt angle (in degrees).
+#define MAX_SHOCK_ACCELERATION                  ( 2.5F )                                          ///< Maximum shock (acceleration) measured on any axis before alarm.
+#define MAX_SHOCK_TO_CLEAR_ALARM                ( 1.0F )                                          ///< Maximum shock (acceleration) measured on any axis in order to clear alarm.
+#define MAX_TILT_G                              ( 1.0F )                                          ///< Maximum tilt (in g).
+#define MAX_TILT_ANGLE_DEG                      ( 90.0F )                                         ///< Maximum tilt angle (in degrees).
 #define DATA_PUBLISH_COUNTER_START_COUNT        30                                                ///< Data publish counter start count.
 
 /// Enumeration of accelerometer monitor states.
@@ -636,15 +636,13 @@
        {
            F32 vectorLen = calcVectorLength( accelAxes[ ACCEL_AXIS_X ].data, accelAxes[ ACCEL_AXIS_Y ].data, accelAxes[ ACCEL_AXIS_Z ].data );
 
-           if ( fabs(NOMINAL_ACCEL_VECTOR_LENGTH - vectorLen) < MAX_ACCEL_VECTOR_LENGTH_ERROR )
+           if ( fabs( NOMINAL_ACCEL_VECTOR_LENGTH - vectorLen ) < MAX_ACCEL_VECTOR_LENGTH_ERROR )
            {
                result = SELF_TEST_STATUS_PASSED;
            }
            else
            {
-               result = SELF_TEST_STATUS_FAILED;                      result = SELF_TEST_STATUS_FAILED;
-        result = SELF_TEST_STATUS_FAILED;
-
+               result = SELF_TEST_STATUS_FAILED;
 #ifdef _DG_
                SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE, vectorLen )
 #else