Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r6992574452287f98df60c835187e44a87845d855 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 24b2fe72608344e67ef37234085d15ad5e4fcc37) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 6992574452287f98df60c835187e44a87845d855) @@ -279,11 +279,6 @@ BOOL result = FALSE; REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NONE; - if ( TRUE == getNoNewTreatmentStatus() ) - { - rejReason = REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED; - } - if ( ( MODE_STAN != getCurrentOperationMode() ) || ( STANDBY_WAIT_FOR_TREATMENT_STATE != currentStandbyState ) ) { rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE; Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r6992574452287f98df60c835187e44a87845d855 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 6992574452287f98df60c835187e44a87845d855) @@ -199,7 +199,6 @@ alarmStatus.noResume = FALSE; alarmStatus.noRinseback = FALSE; alarmStatus.noEndTreatment = FALSE; - alarmStatus.noNewTreatment = FALSE; alarmStatus.noDialRecirc = FALSE; alarmStatus.usrACKRequired = FALSE; @@ -646,19 +645,6 @@ /*********************************************************************//** * @brief -* The getNoNewTreatmentStatus function gets the persistent no new -* treatment alarm status flag. -* @details Inputs: alarmStatus.noNewTreatment -* @details Outputs: none -* @return TRUE if no new treatment allowed, otherwise FALSE -*************************************************************************/ -BOOL getNoNewTreatmentStatus( void ) -{ - return alarmStatus.noNewTreatment; -} - -/*********************************************************************//** - * @brief * The handleActiveAlarmListRequest function processed the active alarms list * request from UI. * @details Inputs: alarmIsActive[] @@ -1038,7 +1024,6 @@ BOOL noResume = FALSE; BOOL noRinseback = FALSE; BOOL noEndTreatment = FALSE; - BOOL noNewTreatment = FALSE; BOOL usrAckReq = FALSE; BOOL noMinimize = TRUE; ALARM_ID_T a; @@ -1051,7 +1036,6 @@ systemFault = ( TRUE == ALARM_TABLE[ a ].alarmIsFault ? TRUE : systemFault ); stop = ( TRUE == ALARM_TABLE[ a ].alarmStops ? TRUE : stop ); noClear = ( TRUE == ALARM_TABLE[ a ].alarmNoClear ? TRUE : noClear ); - noNewTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoNewTreatment ? TRUE : noNewTreatment ); // Set user alarm recovery actions allowed flags if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] ) { @@ -1111,7 +1095,6 @@ alarmStatus.noResume = noResume; alarmStatus.noRinseback = noRinseback; alarmStatus.noEndTreatment = noEndTreatment; - alarmStatus.noNewTreatment |= noNewTreatment; alarmStatus.usrACKRequired = usrAckReq; alarmStatus.noMinimize = noMinimize; } Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r6992574452287f98df60c835187e44a87845d855 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 61716bc97ecca8af1ec560333844a8cf602eccb0) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision 6992574452287f98df60c835187e44a87845d855) @@ -71,7 +71,6 @@ BOOL noResume; ///< Treatment may not be resumed at this time BOOL noRinseback; ///< Rinseback may not be initiated at this time BOOL noEndTreatment; ///< Ending the treatment is not an option at this time - BOOL noNewTreatment; ///< No new treatments may be started even if current treatment is ended BOOL noDialRecirc; ///< No dialysate re-circulation allowed at this time BOOL usrACKRequired; ///< The user must acknowledge top alarm BOOL noMinimize; ///< Prevent user from minimizing the alarm window @@ -173,7 +172,6 @@ BOOL isAlarmRecoverable( ALARM_ID_T alarm ); void setAlarmAudioVolume( U32 volumeLevel ); -BOOL getNoNewTreatmentStatus( void ); void handleActiveAlarmListRequest( void ); U32 getAlarmAudioVolume( void ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r97494fb83f7e315750fd18f5f08a5106d6a4e4e4 -r6992574452287f98df60c835187e44a87845d855 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 97494fb83f7e315750fd18f5f08a5106d6a4e4e4) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 6992574452287f98df60c835187e44a87845d855) @@ -1803,7 +1803,6 @@ payload.alarmsFlags |= ( almStatus.noResume ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RESUME) : 0 ); payload.alarmsFlags |= ( almStatus.noRinseback ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK) : 0 ); payload.alarmsFlags |= ( almStatus.noEndTreatment ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT) : 0 ); - payload.alarmsFlags |= ( almStatus.noNewTreatment ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT) : 0 ); payload.alarmsFlags |= ( almStatus.usrACKRequired ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK) : 0 ); payload.alarmsFlags |= ( almStatus.alarmsToEscalate ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 ); payload.alarmsFlags |= ( almStatus.alarmsSilenced ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED) : 0 );