Index: sources/drydemo/StateController.h =================================================================== diff -u -r0deaf8f3e192a0ecde953ab65efc1ded1c06269b -r521f29cb7dcd0de352dd744292488380e07cb9e3 --- sources/drydemo/StateController.h (.../StateController.h) (revision 0deaf8f3e192a0ecde953ab65efc1ded1c06269b) +++ sources/drydemo/StateController.h (.../StateController.h) (revision 521f29cb7dcd0de352dd744292488380e07cb9e3) @@ -58,6 +58,7 @@ quint16 activeAlarmProperty; quint32 triggerAlarmTimeoutCtr; Treatment_Pause_Sequential_Alarms txPauseSeqAlarmState; + quint32 txPauseBloodSittingCounter; // Rinseback variables quint32 rinsebackFlowMLPM; float rinsebackAccumVolML; @@ -140,9 +141,11 @@ Blood_Prime_States bloodPrimeState; Fluid_Bolus_States fluidBolusState; Dialysis_States dialysisSubState; + Dialysis_States prevDialysisSubState; Rinseback_States rinsebackState; Recirculate_States recircState; Treatment_End_States txEndState; + Post_Treatment_States postTxState; }; struct Treatment_Params { @@ -220,6 +223,7 @@ void handleBackToStandbyEvent(State_Status &status); quint32 extractU32DataFromReceivedMessage(const Can::Message_ID_Enum msgID, qint32 index); float extractF32DataFromReceivedMessage(const Can::Message_ID_Enum msgID, qint32 index); + QString getActiveStateName(); // Alarm helper methods in standby.cpp void triggerAnAlarm(const Alarm_List alarmID, const qint16 alarmProperty = ALARM_USE_DEFAULT_PROPERTIES); @@ -267,6 +271,7 @@ void handleUltrafiltrationVolumeChangeConfirm(); void handleTreatmentTimeChangeValidation(); void handleTreatmentTimeChangeConfirm(); + void handleTreatmentPauseBroadcastData(const Broadcast_Type BCType); // Treatment pressure methods void handlePressureLimitState(); void handleUpdatePressureLimitWindows(); @@ -306,4 +311,8 @@ // Treatment end methods void handleTreatmentEndRequestMessage(State_Status &status); void handleTreatmentEndTimeout(); + + // Post treatment methods + void handlePatientDisconnectRequestMessage(); + void handleRemoveDisposablesRequestMessage(); };