Index: sources/model/MModel.h =================================================================== diff -u -rb3f0f9afa498c5892f39745c36b9762ec957a468 -r9048646630717f980a852df54349805ba63773e0 --- sources/model/MModel.h (.../MModel.h) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) +++ sources/model/MModel.h (.../MModel.h) (revision 9048646630717f980a852df54349805ba63773e0) @@ -52,6 +52,7 @@ #include "MTreatmentPressureOcclusionData.h" #include "MTreatmentRangesData.h" #include "MTreatmentSalineData.h" +#include "MTreatmentVitalsData.h" #include "MTreatmentHeparinData.h" #include "MTreatmentRinsebackData.h" #include "MTreatmentRecirculateData.h" @@ -62,9 +63,10 @@ #include "MHDAccelerometerData.h" #include "MHDSyringePumpData.h" #include "MHDBloodLeakData.h" -#include "MHDAirBubbleData.h" #include "MHDRTCEpochData.h" #include "MHDUsageInfoResponse.h" +#include "MTDAirBubbleData.h" +#include "MTDAirPumpData.h" #include "MTDAirTrapData.h" #include "MTDVoltageData.h" #include "MTDValvesData.h" @@ -86,6 +88,7 @@ #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" #include "MAdjustDDVersionsResponse.h" +#include "MAdjustFPVersionsResponse.h" #include "MAdjustTDSerialNumberResponse.h" #include "MAdjustDDSerialNumberResponse.h" #include "MAdjustHDServiceModeResponse.h" @@ -98,19 +101,32 @@ // DG Data Messages #include "MDGDrainPumpData.h" -#include "MDGHeatersData.h" +#include "MDDHeatersData.h" #include "MDGLoadCellReadingsData.h" #include "MDGOperationModeData.h" -#include "MDGPressuresData.h" +#include "MDDPressuresData.h" #include "MDGReservoirData.h" #include "MDGROPumpData.h" -#include "MDGTemperaturesData.h" -#include "MDGValvesStatesData.h" +#include "MDDConcentratePumpData.h" +#include "MDDTemperaturesData.h" +#include "MDDDialysatePumpData.h" +#include "MDDValvesStatesData.h" #include "MDGAccelerometerData.h" #include "MDDConductivityData.h" #include "MDDGenDialysateData.h" #include "MDDLevelData.h" +#include "MDDBloodLeakData.h" +// FP Data Messages +#include "MFPValvesStatesData.h" +#include "MFPROPumpData.h" +#include "MFPPressuresData.h" +#include "MFPLevelData.h" +#include "MFPFlowData.h" +#include "MFPConductivityData.h" +#include "MFPTemperatureData.h" +#include "MFPBoostPumpData.h" + // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" #include "MPreTreatmentAdjustInitTreatmentResponse.h" @@ -135,6 +151,7 @@ #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "MTreatmentAdjustSalineResponse.h" +#include "MTreatmentAdjustVitalsResponse.h" #include "MTreatmentAdjustHeparinResponse.h" #include "MTreatmentAdjustRinsebackResponse.h" #include "MTreatmentAdjustRecirculateResponse.h" @@ -232,8 +249,9 @@ * * 06 - In the MessageInterpreter add a line of handler in interpretMessage_ method * and put the enum and model. - * \sa MessageInterpreter::interpretMessage_HD - * \sa MessageInterpreter::interpretMessage_DG + * \sa MessageInterpreter::interpretMessage_TD + * \sa MessageInterpreter::interpretMessage_DD + * \sa MessageInterpreter::interpretMessage_FP * \sa MessageInterpreter.cpp * * View : @@ -333,6 +351,7 @@ REGISTER_METATYPE( PowerOffData ) \ REGISTER_METATYPE( TreatmentRangesData ) \ REGISTER_METATYPE( TreatmentSalineData ) \ + REGISTER_METATYPE( TreatmentVitalsData ) \ REGISTER_METATYPE( TreatmentHeparinData ) \ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ @@ -350,7 +369,8 @@ REGISTER_METATYPE( TDSwitchesData ) \ REGISTER_METATYPE( TDEjectorData ) \ REGISTER_METATYPE( TDTemperatureData ) \ - REGISTER_METATYPE( HDAirBubbleData ) \ + REGISTER_METATYPE( TDAirBubbleData ) \ + REGISTER_METATYPE( TDAirPumpData ) \ REGISTER_METATYPE( HDUsageInfoResponseData ) \ REGISTER_METATYPE( HDUsageInfoRequestData ) \ /* Treatment Log */ \ @@ -362,18 +382,30 @@ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ REGISTER_METATYPE( DGROPumpData ) \ - REGISTER_METATYPE( DGPressuresData ) \ + REGISTER_METATYPE( DDPressuresData ) \ REGISTER_METATYPE( DGDrainPumpData ) \ REGISTER_METATYPE( DGOperationModeData ) \ REGISTER_METATYPE( DGReservoirData ) \ - REGISTER_METATYPE( DGValvesStatesData ) \ - REGISTER_METATYPE( DGHeatersData ) \ + REGISTER_METATYPE( DDValvesStatesData ) \ + REGISTER_METATYPE( DDHeatersData ) \ REGISTER_METATYPE( DGLoadCellReadingsData ) \ - REGISTER_METATYPE( DGTemperaturesData ) \ + REGISTER_METATYPE( DDConcentratePumpData ) \ + REGISTER_METATYPE( DDTemperaturesData ) \ + REGISTER_METATYPE( DDDialysatePumpData ) \ REGISTER_METATYPE( DGAccelerometerData ) \ REGISTER_METATYPE( DDConductivityData ) \ REGISTER_METATYPE( DDGenDialysateData ) \ REGISTER_METATYPE( DDLevelData ) \ + REGISTER_METATYPE( DDBloodLeakData ) \ + /* FP Data */ \ + REGISTER_METATYPE( FPValvesStatesData ) \ + REGISTER_METATYPE( FPROPumpData ) \ + REGISTER_METATYPE( FPPressuresData ) \ + REGISTER_METATYPE( FPLevelData ) \ + REGISTER_METATYPE( FPFlowData ) \ + REGISTER_METATYPE( FPConductivityData ) \ + REGISTER_METATYPE( FPTemperatureData ) \ + REGISTER_METATYPE( FPBoostPumpData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -419,6 +451,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ + REGISTER_METATYPE( AdjustVitalsRequestData ) \ REGISTER_METATYPE( AdjustHeparinRequestData ) \ REGISTER_METATYPE( AdjustRinsebackRequestData ) \ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ @@ -458,6 +491,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( AdjustVitalsResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ REGISTER_METATYPE( AdjustRinsebackResponseData ) \ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ @@ -466,6 +500,7 @@ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ + REGISTER_METATYPE( AdjustVersionsFPResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberTDResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberDDResponseData ) \ REGISTER_METATYPE( AdjustServiceModeResponseData ) \ @@ -524,6 +559,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentVitalsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ @@ -534,7 +570,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirBubbleData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirBubbleData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirTrapData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDVoltageData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDTemperatureData ) \ @@ -551,18 +588,30 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGReservoirData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGValvesStatesData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGHeatersData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDValvesStatesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDHeatersData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDConcentratePumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDDialysatePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDGenDialysateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDLevelData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDBloodLeakData ) \ + /* FP Data */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPValvesStatesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPROPumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPPressuresData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPLevelData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPFlowData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPConductivityData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPTemperatureData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPBoostPumpData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -599,6 +648,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ @@ -607,6 +657,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsFPResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeResponseData ) \ @@ -637,6 +688,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ @@ -727,6 +779,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentVitalsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ @@ -737,7 +790,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirBubbleData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirBubbleData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirTrapData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDVoltageData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDValvesData ) \ @@ -754,18 +808,30 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGPressuresData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGReservoirData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGValvesStatesData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGHeatersData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDValvesStatesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDHeatersData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDConcentratePumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDDialysatePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDGenDialysateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDLevelData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDBloodLeakData ) \ + /* FP Data */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPValvesStatesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPROPumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPPressuresData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPLevelData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPFlowData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPConductivityData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPTemperatureData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPBoostPumpData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -802,6 +868,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ @@ -810,6 +877,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsFPResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceModeResponseData ) \ @@ -863,6 +931,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRinsebackRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ @@ -923,6 +992,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRinsebackRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ @@ -984,6 +1054,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRinsebackRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ @@ -1034,6 +1105,7 @@ ACTION_RECEIVE_SIGNAL( PowerOffData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentVitalsData ) \ ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ @@ -1051,7 +1123,8 @@ ACTION_RECEIVE_SIGNAL( TDSwitchesData ) \ ACTION_RECEIVE_SIGNAL( TDEjectorData ) \ ACTION_RECEIVE_SIGNAL( TDTemperatureData ) \ - ACTION_RECEIVE_SIGNAL( HDAirBubbleData ) \ + ACTION_RECEIVE_SIGNAL( TDAirBubbleData ) \ + ACTION_RECEIVE_SIGNAL( TDAirPumpData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ @@ -1062,18 +1135,30 @@ ACTION_RECEIVE_SIGNAL( TreatmentLogEventData ) \ \ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ - ACTION_RECEIVE_SIGNAL( DGPressuresData ) \ + ACTION_RECEIVE_SIGNAL( DDPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ ACTION_RECEIVE_SIGNAL( DGOperationModeData ) \ ACTION_RECEIVE_SIGNAL( DGReservoirData ) \ - ACTION_RECEIVE_SIGNAL( DGValvesStatesData ) \ - ACTION_RECEIVE_SIGNAL( DGHeatersData ) \ + ACTION_RECEIVE_SIGNAL( DDValvesStatesData ) \ + ACTION_RECEIVE_SIGNAL( DDHeatersData ) \ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ - ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ + ACTION_RECEIVE_SIGNAL( DDConcentratePumpData ) \ + ACTION_RECEIVE_SIGNAL( DDTemperaturesData ) \ + ACTION_RECEIVE_SIGNAL( DDDialysatePumpData ) \ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( DDConductivityData ) \ ACTION_RECEIVE_SIGNAL( DDGenDialysateData ) \ ACTION_RECEIVE_SIGNAL( DDLevelData ) \ + ACTION_RECEIVE_SIGNAL( DDBloodLeakData ) \ + /* FP Data */ \ + ACTION_RECEIVE_SIGNAL( FPValvesStatesData ) \ + ACTION_RECEIVE_SIGNAL( FPROPumpData ) \ + ACTION_RECEIVE_SIGNAL( FPPressuresData ) \ + ACTION_RECEIVE_SIGNAL( FPLevelData ) \ + ACTION_RECEIVE_SIGNAL( FPFlowData ) \ + ACTION_RECEIVE_SIGNAL( FPConductivityData ) \ + ACTION_RECEIVE_SIGNAL( FPTemperatureData ) \ + ACTION_RECEIVE_SIGNAL( FPBoostPumpData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ @@ -1110,6 +1195,7 @@ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVitalsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHeparinResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ @@ -1118,6 +1204,7 @@ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsFPResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \