Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r8a78d0bee10166f1b5d2c47474f57f8a7b279cba -re9b40340e9f9d4ce27368a093e1bd0fce79b30d5 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 8a78d0bee10166f1b5d2c47474f57f8a7b279cba) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision e9b40340e9f9d4ce27368a093e1bd0fce79b30d5) @@ -42,12 +42,12 @@ /// Default publication interval for pressure and occlusion data. #define PRES_OCCL_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the pressure/occlusion data is published on the CAN bus. #define PRES_LIMIT_STABILIZATION_OFF ( 0 ) ///< pressure limit stabilization period off -#define PRES_LIMIT_SHORT_RESTABILIZATION_TIME_MS ( 60 * MS_PER_SECOND ) ///< Duration of pressure limit short restabilization period (in ms) +#define PRES_LIMIT_STABILIZATION_2_TIME_MS ( 60 * MS_PER_SECOND ) ///< Duration of pressure limit second stage stabilization period (in ms) #define PRES_LIMIT_STABILIZATION_TIME_MS ( 60 * MS_PER_SECOND ) ///< Duration of pressure limit stabilization period (in ms). #define PRES_LIMIT_SHORT_STABILIZE_TIME_MS ( 10 * MS_PER_SECOND ) ///< Duration of pressure limit short stabilization period (in ms). #define PRES_LIMIT_RESTABILIZE_TIME_MS ( 15 * SEC_PER_MIN * MS_PER_SECOND ) ///< Duration of pressure limit re-stabilize period (in ms). // Pressure Limit minimum stabilization time before short stabilization time activation -static const U32 PRES_LIMIT_MIN_STABILIZATION_TIME_IN_MS = ( PRES_LIMIT_STABILIZATION_TIME_MS - PRES_LIMIT_SHORT_STABILIZE_TIME_MS ) ; +static const U32 PRES_LIMIT_MIN_STABILIZATION_TIME_IN_MS = ( PRES_LIMIT_STABILIZATION_TIME_MS - PRES_LIMIT_SHORT_STABILIZE_TIME_MS ); #define ARTERIAL_PRESSURE_CONVERSION_OFFSET 0x800000 ///< Arterial pressure conversion coefficient. #define ARTERIAL_PRESSURE_V_BIAS ( 3.0F ) ///< Bias voltage for arterial pressure sensor. @@ -447,8 +447,8 @@ * Else reset stabilize counter. * @details Inputs: currPresLimitsState * @details Outputs: currPresLimitsState, stabilizationStartTimeMs, pressureStabilizeTime - * @param useShort Flag to use short stabilization period. Use defines: - * USE_NORMAL_STABILIZATION_PERIOD, USE_SHORT_STABILIZATION_PERIOD + * @param stabilizationPeriod stabilization periods. Use defines: + * STABILIZATION_PERIOD_OFF, USE_NORMAL_STABILIZATION_PERIOD, USE_SHORT_STABILIZATION_PERIOD * @return none *************************************************************************/ void signalInitiatePressureStabilization( STABILIZATION_PERIODS_T stabilizationPeriod ) @@ -702,7 +702,7 @@ { currPresLimitsState = PRESSURE_LIMITS_STATE_WIDE; } - else if ( TRUE == didTimeout( stabilizationStartTimeMs, PRES_LIMIT_SHORT_RESTABILIZATION_TIME_MS ) ) + else if ( TRUE == didTimeout( stabilizationStartTimeMs, PRES_LIMIT_STABILIZATION_2_TIME_MS ) ) { updatePressureLimitWindows(); stabilizationStartTimeMs = getMSTimerCount();