Index: sources/drydemo/StateController.h =================================================================== diff -u -r4d0fc455e6307639e72db490721c7768a487c014 -r6c0428ed8c6430924d54d5a42c45c8ec0c16c7c2 --- sources/drydemo/StateController.h (.../StateController.h) (revision 4d0fc455e6307639e72db490721c7768a487c014) +++ sources/drydemo/StateController.h (.../StateController.h) (revision 6c0428ed8c6430924d54d5a42c45c8ec0c16c7c2) @@ -210,7 +210,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); - void triggerAnAlarm(Alarm_List alarmID); + void triggerAnAlarm(const Alarm_List alarmID); void handleAlarmUserAction(State_Status &status, bool isFromTxPause = false); void handleTriggeredAlarmsToTxPause(State_Status &status); void handleChemsReplacementAlarmsSequence(State_Status &status); @@ -220,6 +220,7 @@ void handleUIConfirmMessage(const Generic_Confirm_Id confirmID, State_Status &status); bool hasUIConfirmMessageTimedout(const Generic_Confirm_Id confirmID); void handleSendUIConfirmationMessage(const Generic_Confirm_Id confirmID, const Generic_Confirm_Command confirmCmd, const Reject_Reasons rejectReason = REQUEST_REJECT_REASON_NONE); + void handleTDWaterSampleResultRequest(); // Pre-treatment methods void handleSetupTubingSetConnectionsRequestMessage(); @@ -267,10 +268,11 @@ // HDF Treatment methods void initializeTreatmentHDFVariables(); - float handleCheckHDFRate(const float proposedRateMLPM); - void handleTreatmentHDF(); - void handleHemodialfiltrationBroadcastData(const Broadcast_Type BCType); + float handleHDFCheckRate(const float proposedRateMLPM, const bool initRate); + void handleHDFTreatment(); + void handleHDFBroadcastData(const Broadcast_Type BCType); void handleHDFAdjustmentRequestMessage(); + void hadnleHDFPauseResumeRequestMessage(); // Treatment pause methods void handleDryBicartBroadcastData(const Broadcast_Type BCType);