Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 61716bc97ecca8af1ec560333844a8cf602eccb0) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 5420b3e1f4260d8fbdce3f4f495f19f1a6f05b7e) @@ -206,7 +206,7 @@ alarmStatus.noEndTreatment = FALSE; alarmStatus.noNewTreatment = FALSE; alarmStatus.noDialRecirc = FALSE; - alarmStatus.usrACKRequired = FALSE; + alarmStatus.ok = FALSE; alarmAudioTestToneRequested = FALSE; alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_START; @@ -494,8 +494,8 @@ if ( ALARM_USER_ACTION_ACK == action ) { - // If user acknowledged top alarm, just clear that alarm - if ( TRUE == ALARM_TABLE[ a ].alarmUserAckRequired ) + // // If user acknowledged alarm w/ clear only property, just clear that alarm + if ( TRUE == ALARM_TABLE[ a ].alarmClearOnly ) { clearAlarm( a ); } @@ -1091,8 +1091,8 @@ noRinseback = TRUE; } - // If top alarm requires user ack or no other user options enabled for recoverable alarm and condition cleared, set user ack flag and block other flags - if ( ( TRUE == ALARM_TABLE[ alarmStatus.alarmTop ].alarmUserAckRequired ) || + // If top alarm has clear only property or no other user options enabled for recoverable alarm and condition cleared, set user ack flag and block other flags + if ( ( TRUE == ALARM_TABLE[ alarmStatus.alarmTop ].alarmClearOnly ) || ( ( FALSE == alarmStatus.noClear ) && ( noResume ) && ( noRinseback ) && ( noEndTreatment ) && ( FALSE == alarmStatus.topAlarmConditionDetected ) ) ) { @@ -1116,7 +1116,7 @@ alarmStatus.noRinseback = noRinseback; alarmStatus.noEndTreatment = noEndTreatment; alarmStatus.noNewTreatment |= noNewTreatment; - alarmStatus.usrACKRequired = usrAckReq; + alarmStatus.ok = usrAckReq; alarmStatus.noMinimize = noMinimize; }