Index: firmware/App/Controllers/AirTrap.c =================================================================== diff -u -r134e2da4b4c4f01528c4a6603bb4bd7a807711b3 -r2fbfc45cea26e36bc8295d4c81c48bb597ca63d3 --- firmware/App/Controllers/AirTrap.c (.../AirTrap.c) (revision 134e2da4b4c4f01528c4a6603bb4bd7a807711b3) +++ firmware/App/Controllers/AirTrap.c (.../AirTrap.c) (revision 2fbfc45cea26e36bc8295d4c81c48bb597ca63d3) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file AirTrap.c * -* @author (last) Sean Nash -* @date (last) 01-Aug-2023 +* @author (last) Dara Navaei +* @date (last) 13-Oct-2023 * * @author (original) Sean Nash * @date (original) 16-Sep-2020 @@ -38,9 +38,11 @@ #define AIR_TRAP_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the air trap data is published on the CAN bus. #define AIR_TRAP_FILL_TIMEOUT_MS ( 6 * MS_PER_SECOND ) ///< Air trap fill timeout period (in ms). +#define AIR_PUMP_ON_DELAY_TIME_MS ( 10 * MS_PER_SECOND ) ///< Delay between air pump On (in ms). #define AIR_PUMP_UPPER_LEVEL_PERSISTENCE ( 300 / TASK_GENERAL_INTERVAL ) ///< Persistence time for air pump operation after air trap upper level reads air. #define AIR_PUMP_ON_ERROR_MAX_CNT 6 ///< Maximum number of air pump on events within time window before alarm triggered. Do not exceed MAX_TIME_WINDOWED_COUNT. #define AIR_PUMP_ON_ERROR_TIME_WIN_MS ( 60 * MS_PER_SECOND ) ///< Time window for Air Pump on count error. +#define AIR_TRAP_LEVEL_DEBOUNCE_TIME_MS ( 400 ) ///< Air trap level sensor debounce time /// Persistence period for illegal level sensors fault. #define AIR_TRAP_ILLEGAL_LEVELS_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Air trap illegal values timeout (in ms) @@ -66,11 +68,13 @@ /// Interval (in ms) at which to publish air trap data to CAN bus. static OVERRIDE_U32_T airTrapDataPublishInterval = { AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, 0 }; static OVERRIDE_U32_T airTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ]; ///< Detected air trap level for each level sensor. +static U32 airTrapLevelsDebounceStartTime[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ]; ///< Debounce start time for airtrap level sensor. static BOOL pendingStartAirTrapController = FALSE; ///< Flag indicates an air trap controller start request is pending. static BOOL pendingStopAirTrapController = FALSE; ///< Flag indicates an air trap controller stop request is pending. static U32 fillStartTime = 0; ///< Time stamp for start of air trap fill. +static U32 airPumpOnDelayStartTime = 0; ///< Air pump On start time. static U32 airPumpUpperLevelCtr = 0; ///< Timer count for air pump persistence. @@ -95,13 +99,15 @@ resetAirTrap(); airTrapDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; airPumpUpperLevelCtr = 0; + airPumpOnDelayStartTime = getMSTimerCount(); for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ ) { airTrapLevels[i].data = 0; airTrapLevels[i].ovData = 0; airTrapLevels[i].ovInitData = 0; airTrapLevels[i].override = OVERRIDE_RESET; + airTrapLevelsDebounceStartTime[i] = 0; } initPersistentAlarm( ALARM_ID_HD_AIR_TRAP_ILLEGAL_LEVELS, AIR_TRAP_ILLEGAL_LEVELS_TIMEOUT_MS, AIR_TRAP_ILLEGAL_LEVELS_TIMEOUT_MS ); @@ -184,14 +190,42 @@ void execAirTrapMonitor( void ) { BOOL lower, upper; - bool isAirTrapLevelsValid = FALSE; + BOOL isAirTrapLevelsValid = FALSE; AIR_TRAP_LEVELS_T lowerAirTrap, upperAirTrap; + AIR_TRAP_LEVEL_SENSORS_T airTrapLevelSensor; + AIR_TRAP_LEVELS_T currentLevelStatus[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ]; // Get latest level readings getFPGAAirTrapLevels( &lower, &upper ); - airTrapLevels[ AIR_TRAP_LEVEL_SENSOR_LOWER ].data = (U32)( TRUE == lower ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID ); - airTrapLevels[ AIR_TRAP_LEVEL_SENSOR_UPPER ].data = (U32)( TRUE == upper ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID ); + currentLevelStatus[ AIR_TRAP_LEVEL_SENSOR_LOWER ] = ( TRUE == lower ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID ); + currentLevelStatus[ AIR_TRAP_LEVEL_SENSOR_UPPER ] = ( TRUE == upper ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID ); + // Read the level after expiry of debouncing time + for( airTrapLevelSensor = AIR_TRAP_LEVEL_SENSOR_LOWER; airTrapLevelSensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS; airTrapLevelSensor++ ) + { + // Check if the current level sensor status is not the same as the recorded data + if ( currentLevelStatus[ airTrapLevelSensor ] != (AIR_TRAP_LEVELS_T)airTrapLevels[ airTrapLevelSensor ].data ) + { + // If the debounce time is 0, start the timer + if ( 0 == airTrapLevelsDebounceStartTime[ airTrapLevelSensor ] ) + { + airTrapLevelsDebounceStartTime[ airTrapLevelSensor ] = getMSTimerCount(); + } + // If the debounce time has been elapsed, update the level sensor status to the new status + else if ( TRUE == didTimeout( airTrapLevelsDebounceStartTime[ airTrapLevelSensor ], AIR_TRAP_LEVEL_DEBOUNCE_TIME_MS ) ) + { + // reset the debounce time + airTrapLevelsDebounceStartTime[ airTrapLevelSensor ] = 0; + // update recent level status + airTrapLevels[ airTrapLevelSensor ].data = (U32)currentLevelStatus[ airTrapLevelSensor ]; + } + } + else + { + airTrapLevelsDebounceStartTime[ airTrapLevelSensor ] = 0; + } + } + if ( STATE_OPEN == getSwitchStatus( PUMP_TRACK_SWITCH ) ) { // If the pump track on open, zero the persistent counter to not check the air trap illegal level alarm @@ -334,7 +368,8 @@ //Turn on air pump if fluid reaches upper level. else if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) { - if ( AIR_PUMP_STATE_OFF == getAirPumpState() ) + if ( ( AIR_PUMP_STATE_OFF == getAirPumpState() ) && + ( TRUE == didTimeout( airPumpOnDelayStartTime, AIR_PUMP_ON_DELAY_TIME_MS ) ) ) { setAirPumpState( AIR_PUMP_STATE_ON ); airPumpUpperLevelCtr = 0; @@ -352,13 +387,14 @@ if ( airPumpUpperLevelCtr >= AIR_PUMP_UPPER_LEVEL_PERSISTENCE ) { setAirPumpState( AIR_PUMP_STATE_OFF ); + airPumpOnDelayStartTime = getMSTimerCount(); } } } // Transition to open valve state when air detected at lower level else if ( ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) && - ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) ) + ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) ) { if ( AIR_PUMP_STATE_ON == getAirPumpState() ) { @@ -367,7 +403,7 @@ setValveAirTrap( STATE_OPEN ); fillStartTime = getMSTimerCount(); - SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, 0, 0 ); + SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 ); result = AIR_TRAP_VALVE_OPEN_STATE; } @@ -396,6 +432,8 @@ else if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) { setValveAirTrap( STATE_CLOSED ); + signalLowVenousPressureCheck(); + SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_CLOSED, 0 ); result = AIR_TRAP_VALVE_CLOSED_STATE; } return result;