Index: Accel.c
===================================================================
diff -u -rb016222f4ffa51e29fdb8f7449fb94825ae30670 -r054de306b7cfd09d26ccd144beb3baf73e2efede
--- Accel.c	(.../Accel.c)	(revision b016222f4ffa51e29fdb8f7449fb94825ae30670)
+++ Accel.c	(.../Accel.c)	(revision 054de306b7cfd09d26ccd144beb3baf73e2efede)
@@ -624,7 +624,11 @@
                 accelCalOffsets[ ACCEL_AXIS_Z ] = cal.accelZOffset;
 
                 // Ensure calibration has been done for accelerometer
+#ifndef DISABLE_CAL_CHECK
                 if ( cal.calibrationTime == 0 )
+#else
+                if ( FALSE )
+#endif
                 {
                     result = SELF_TEST_STATUS_FAILED;
                     accelSelfTestState = ACCELEROMETER_SELF_TEST_STATE_COMPLETE;