Index: sources/drydemo/StateController.h =================================================================== diff -u -rfb3e70cb47f3d22f31f68358c1bda69cce9cd248 -rb9f4ddeb2dec3019b87c712bfe64b8df1d4b328c --- sources/drydemo/StateController.h (.../StateController.h) (revision fb3e70cb47f3d22f31f68358c1bda69cce9cd248) +++ sources/drydemo/StateController.h (.../StateController.h) (revision b9f4ddeb2dec3019b87c712bfe64b8df1d4b328c) @@ -52,7 +52,7 @@ quint32 validateTxDurMin; quint32 validateHepDurMin; // Alarm variables - Alarm_List activeAlarm; + Alarm_List activeTopAlarm; // Rinseback variables quint32 rinsebackFlowMLPM; float rinsebackAccumVolML; @@ -146,6 +146,7 @@ float extractF32DataFromReceivedMessage(const Can::Message_ID_Enum msgID, qint32 index); void triggerAnAlarm(Alarm_List alarmID); void handleAlarmUserAction(State_Status &status, bool isFromTxPause = false); + void handleTriggeredAlarmsToTxPause(State_Status &status); // Standby methods void handleInitiateTreatmentRequestMessage(State_Status &status); @@ -155,6 +156,7 @@ // Blood prime methods float getBloodPrimeRampStepML(); + void handleBloodPrimePauseResume(bool &resume); void handleBloodPrimeBroadcastData(const float accumulatedVolML, const quint32 primeTimeOutS, const quint32 pauseCountDownS, const Broadcast_Type BCType); void handleBloodPrimeVolML(const bool resume, const float rampStepML, const bool hasFlowChanged, quint32 &currBloodFlowMLPM, float &accumBloodVolML);