Index: Accel.c =================================================================== diff -u -r53cdbd6fcdef7f41e93968cd120d4ad9b5ed184f -rdfd2821ec7c2bc50a00818bca901415f9f841114 --- Accel.c (.../Accel.c) (revision 53cdbd6fcdef7f41e93968cd120d4ad9b5ed184f) +++ Accel.c (.../Accel.c) (revision dfd2821ec7c2bc50a00818bca901415f9f841114) @@ -8,7 +8,7 @@ * @file Accel.c * * @author (last) Dara Navaei -* @date (last) 04-Jan-2022 +* @date (last) 22-Feb-2022 * * @author (original) Sean Nash * @date (original) 29-Jul-2020 @@ -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.