Index: sources/drydemo/StateControllerStandby.cpp =================================================================== diff -u -rfb3e70cb47f3d22f31f68358c1bda69cce9cd248 -rb9f4ddeb2dec3019b87c712bfe64b8df1d4b328c --- sources/drydemo/StateControllerStandby.cpp (.../StateControllerStandby.cpp) (revision fb3e70cb47f3d22f31f68358c1bda69cce9cd248) +++ sources/drydemo/StateControllerStandby.cpp (.../StateControllerStandby.cpp) (revision b9f4ddeb2dec3019b87c712bfe64b8df1d4b328c) @@ -91,7 +91,7 @@ quint16 properties = _alarmTriggerSpecs[alarmID][ALARM_TABLE_PROPERTIES_INDEX].toInt(); quint32 alarmExpires = 0; - _treatmentStatus.activeAlarm = alarmID; + _treatmentStatus.activeTopAlarm = alarmID; QVariantList resp; resp.append(static_cast(ID_ALARM_STATUS_DATA)); @@ -146,15 +146,26 @@ QVariantList msg; msg.append(static_cast(ID_ALARM_CLEARED)); msg.append(Can_Id::eChlid_TD_Alarm); - msg.append(_treatmentStatus.activeAlarm); + msg.append(_treatmentStatus.activeTopAlarm); _isBroadcastListReady = false; _broadcastMessages.append(msg); _isBroadcastListReady = true; // Send the alarm clear command and then clear the variable - _treatmentStatus.activeAlarm = ALARM_ID_NO_ALARM; + _treatmentStatus.activeTopAlarm = ALARM_ID_NO_ALARM; _treatmentRcvdMessages[ID_UI_ALARM_USER_ACTION_REQUEST].clear(); } +void StateController::handleTriggeredAlarmsToTxPause(State_Status &status) +{ + if (_treatmentStatus.activeTopAlarm == ALARM_ID_NO_ALARM) { return; } + + if (_alarmTriggerSpecs[_treatmentStatus.activeTopAlarm][ALARM_TABLE_TX_PAUSE_INDEX].toInt() == ALARM_TRANS_TO_TX_PAUSE) { + _treatmentStatus.stateTransitionEvent = "T_Tx_2_TP"; + _treatmentStatus.requestTreatmentReset = false; + status = STATE_ON_EXIT; + } +} + void StateController::handleUIConfirmMessage(const Generic_Confirm_Id confirmID, State_Status &status) { if (!_uiConfirmMessages.contains(confirmID)) { return; }