Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -re8edb83fcba5c355198efc30944d51c54814bdbe -red0444d18e586808fd59cf6fc118f8885eebfe22 --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision e8edb83fcba5c355198efc30944d51c54814bdbe) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision ed0444d18e586808fd59cf6fc118f8885eebfe22) @@ -118,6 +118,7 @@ F32 getHeatDisinfectTemperatureSensorValue( void ); BOOL getTrimmerHeaterCommandedOn( void ); DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void ); +F32 getDialysateTemperature( void ); DG_MIXING_RATIOS_T getDGMixingRatios( void ); void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data ); Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -rf8278ffe0845a6e5ed80018bcebbcfec0eba23d2 -red0444d18e586808fd59cf6fc118f8885eebfe22 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision f8278ffe0845a6e5ed80018bcebbcfec0eba23d2) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision ed0444d18e586808fd59cf6fc118f8885eebfe22) @@ -166,10 +166,12 @@ #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD 0.05F ///< Minimum syringe pump speed to be considered not stalled. #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Syringe pump ADC FPGA error timeout in milliseconds. + #define SYRINGE_PUMP_DAC_MAX_RETRIES 5 ///< Syringe pump DAC retries to write. #define SYRINGE_PUMP_DAC_TIMER ( 200 / TASK_PRIORITY_INTERVAL ) ///< Syringe pump DAC timer between retries. #define SYRINGE_PUMP_OCCLUSION_PERSISTENCE 50 ///< Syringe pump occlusion persistence timer in milliseconds. #define SYRINGE_PUMP_EMPTY_FORCE_COUNT 5 ///< Syringe pump empty force voltage count persistence. + /// Defined states for the syringe pump control state machine. typedef enum SyringePump_States { @@ -349,6 +351,7 @@ initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE ); initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE ); initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, SYRINGE_PUMP_RATE_ALARM_PERSISTENCE ); + initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, SYRINGE_PUMP_OCCLUSION_PERSISTENCE); initTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, SYRINGE_PUMP_OFF_ERROR_MAX_CNT, SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS ); initFPGAPersistentAlarm( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT, Index: firmware/App/HDCommon.h =================================================================== diff -u -r0b5ba9b1d7e5632b47d53772a467193340b7a6be -red0444d18e586808fd59cf6fc118f8885eebfe22 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 0b5ba9b1d7e5632b47d53772a467193340b7a6be) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision ed0444d18e586808fd59cf6fc118f8885eebfe22) @@ -10,8 +10,8 @@ * @author (last) Dara Navaei * @date (last) 02-Feb-2024 * -* @author (original) Sean -* @date (original) 27-Feb-2020 +* @author (original) Sean +* @date (original) 27-Feb-2020 * ***************************************************************************/ @@ -25,8 +25,9 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 9 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 321 +#define HD_VERSION_BUILD 841 + // ********** development build switches ********** #ifndef _RELEASE_ Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -re8edb83fcba5c355198efc30944d51c54814bdbe -red0444d18e586808fd59cf6fc118f8885eebfe22 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision e8edb83fcba5c355198efc30944d51c54814bdbe) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision ed0444d18e586808fd59cf6fc118f8885eebfe22) @@ -260,6 +260,33 @@ /*********************************************************************//** * @brief + * The isACPowerLost function determines whether A/C power loss has + * been detected. This function sets the alarms blocked condition to + * allow smooth alarm recovery. + * + * @details Inputs: alarmStatus + * @details Outputs: alarmsBlockedTimer + * @return TRUE if A/C power loss alarm is in effect, FALSE if not + *************************************************************************/ +BOOL isACPowerLost( void ) +{ + BOOL result = TRUE; + + // Continue to block new alarms until the alarms are cleared. + if ( ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST ) ) && + ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT ) ) ) + { + result = FALSE; + } + else + { + alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN; + } + return result; +} + +/*********************************************************************//** + * @brief * The activateAlarm function activates a given alarm. * @details Inputs: none * @details Outputs: alarmIsActive[], alarmStartedAt[], alarmStatus is updated @@ -268,6 +295,11 @@ *************************************************************************/ static void activateAlarm( ALARM_ID_T alarm ) { + // Block new alarms, occuring during loss of AC power + if ( ( TRUE == getCPLDACPowerLossDetected() ) ) + { + alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN; + } // Verify valid alarm index if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) ) {