Index: AlarmMgmt.c =================================================================== diff -u -rca1d590217b1bfd14f0e0682f88e04de076ff199 -ref31ae5f4eb4f62b8c1b5cdc467507d8d0787640 --- AlarmMgmt.c (.../AlarmMgmt.c) (revision ca1d590217b1bfd14f0e0682f88e04de076ff199) +++ AlarmMgmt.c (.../AlarmMgmt.c) (revision ef31ae5f4eb4f62b8c1b5cdc467507d8d0787640) @@ -403,7 +403,30 @@ return result; } +/*********************************************************************//** + * @brief + * The getActiveAlarmCount function returns the count of currently active + * alarms by iterating the alarmIsActive array directly. + * @details \b Inputs: alarmIsActive[] + * @details \b Outputs: none + * @return Count of alarms currently active. + *************************************************************************/ +U32 getActiveAlarmCount( void ) +{ + U32 count = 0U; + ALARM_ID_T alarm; + for ( alarm = (ALARM_ID_T)1; alarm < NUM_OF_ALARM_IDS; alarm++ ) + { + if ( TRUE == alarmIsActive[ alarm ] ) + { + count++; + } + } + + return count; +} + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ Index: AlarmMgmt.h =================================================================== diff -u -rca1d590217b1bfd14f0e0682f88e04de076ff199 -ref31ae5f4eb4f62b8c1b5cdc467507d8d0787640 --- AlarmMgmt.h (.../AlarmMgmt.h) (revision ca1d590217b1bfd14f0e0682f88e04de076ff199) +++ AlarmMgmt.h (.../AlarmMgmt.h) (revision ef31ae5f4eb4f62b8c1b5cdc467507d8d0787640) @@ -120,6 +120,8 @@ BOOL isAlarmConditionDetected( ALARM_ID_T alarm ); BOOL isAlarmRecoverable( ALARM_ID_T alarm ); +U32 getActiveAlarmCount( void ); + BOOL testAlarmStateOverride( MESSAGE_T *message ); /**@}*/ Index: MessagePayloads.h =================================================================== diff -u -rf677679e0381ee76e2370d4cd09cf13f9172a5c8 -ref31ae5f4eb4f62b8c1b5cdc467507d8d0787640 --- MessagePayloads.h (.../MessagePayloads.h) (revision f677679e0381ee76e2370d4cd09cf13f9172a5c8) +++ MessagePayloads.h (.../MessagePayloads.h) (revision ef31ae5f4eb4f62b8c1b5cdc467507d8d0787640) @@ -46,6 +46,7 @@ F32 bicarbConvFactor; ///< Conversion factor of bicarbonate. U32 sodium; ///< Set sodium being used to make dialysate. U32 bicarbonate; ///< Set bicarbonate being used to make dialysate. + F32 substitutionRate; ///< Set substitution (D92) pump rate (mL/min). } DIALYSATE_DELIVERY_REQ_PAYLOAD_T; /// Payload record structure for requesting pre generate dialysate.