Index: sources/model/MModel.h =================================================================== diff -u -r4fb6a5fb521604e29160115ff3b4b0623301e663 -r72289d4b682e419df5d6f7210eca83d97cd657ae --- sources/model/MModel.h (.../MModel.h) (revision 4fb6a5fb521604e29160115ff3b4b0623301e663) +++ sources/model/MModel.h (.../MModel.h) (revision 72289d4b682e419df5d6f7210eca83d97cd657ae) @@ -52,19 +52,21 @@ #include "MTreatmentPressureOcclusionData.h" #include "MTreatmentRangesData.h" #include "MTreatmentSalineData.h" +#include "MTreatmentVitalsData.h" #include "MTreatmentHeparinData.h" #include "MTreatmentRinsebackData.h" #include "MTreatmentRecirculateData.h" #include "MTreatmentBloodPrimeData.h" #include "MTreatmentStopData.h" #include "MTreatmentUltrafiltrationData.h" -#include "MTreatmentSetPointData.h" +#include "MTreatmentParametersSetPointData.h" #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,30 +88,44 @@ #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" #include "MAdjustDDVersionsResponse.h" +#include "MAdjustFPVersionsResponse.h" #include "MAdjustTDSerialNumberResponse.h" #include "MAdjustDDSerialNumberResponse.h" #include "MAdjustHDServiceModeResponse.h" #include "MAdjustHDServiceDatesResponse.h" #include "MAdjustDGServiceDatesResponse.h" -#include "MAdjustHDDateTimeResponse.h" -#include "MAdjustDGDateTimeResponse.h" +#include "MAdjustTDDateTimeResponse.h" +#include "MAdjustDDDateTimeResponse.h" #include "MDuetRoWaterDG.h" #include "MAdjustHDInstitutionalRecordResponse.h" // 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 "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" @@ -134,6 +150,7 @@ #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "MTreatmentAdjustSalineResponse.h" +#include "MTreatmentAdjustVitalsResponse.h" #include "MTreatmentAdjustHeparinResponse.h" #include "MTreatmentAdjustRinsebackResponse.h" #include "MTreatmentAdjustRecirculateResponse.h" @@ -231,8 +248,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 : @@ -313,8 +331,10 @@ REGISTER_METATYPE( DeviceWifiListResponseData ) \ REGISTER_METATYPE( DeviceWifiInfoRequestData ) \ REGISTER_METATYPE( DeviceWifiInfoResponseData ) \ - REGISTER_METATYPE( DeviceConnectWifiRequestData ) \ - REGISTER_METATYPE( DeviceConnectWifiResponseData ) \ + REGISTER_METATYPE( DeviceWifiConnectRequestData ) \ + REGISTER_METATYPE( DeviceWifiConnectResponseData ) \ + REGISTER_METATYPE( DeviceDateTimeRequestData ) \ + REGISTER_METATYPE( DeviceDateTimeResponseData ) \ /* Settings */ \ REGISTER_METATYPE( SettingsData ) \ REGISTER_METATYPE( BluetoothData ) \ @@ -332,13 +352,14 @@ REGISTER_METATYPE( PowerOffData ) \ REGISTER_METATYPE( TreatmentRangesData ) \ REGISTER_METATYPE( TreatmentSalineData ) \ + REGISTER_METATYPE( TreatmentVitalsData ) \ REGISTER_METATYPE( TreatmentHeparinData ) \ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( TreatmentStopData ) \ REGISTER_METATYPE( TreatmentUltrafiltrationData ) \ - REGISTER_METATYPE( TreatmentSetPointData ) \ + REGISTER_METATYPE( TreatmentParametersSetPointData ) \ REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ REGISTER_METATYPE( HDBloodLeakData ) \ @@ -349,7 +370,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 */ \ @@ -361,17 +383,29 @@ 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( 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 ) \ @@ -417,6 +451,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ + REGISTER_METATYPE( AdjustVitalsRequestData ) \ REGISTER_METATYPE( AdjustHeparinRequestData ) \ REGISTER_METATYPE( AdjustRinsebackRequestData ) \ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ @@ -426,8 +461,8 @@ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceModeRequestData ) \ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ - REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ \ /* Response */ \ @@ -456,6 +491,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( AdjustVitalsResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ REGISTER_METATYPE( AdjustRinsebackResponseData ) \ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ @@ -464,13 +500,14 @@ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ + REGISTER_METATYPE( AdjustVersionsFPResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberTDResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberDDResponseData ) \ REGISTER_METATYPE( AdjustServiceModeResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesDGResponseData ) \ - REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ - REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustTDDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ REGISTER_METATYPE( AlarmActiveListResponseData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ @@ -522,17 +559,19 @@ 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 ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSetPointData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentParametersSetPointData ) \ 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 ) \ @@ -549,17 +588,29 @@ 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, 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 ) \ @@ -596,6 +647,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 ) \ @@ -604,13 +656,14 @@ 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 ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ @@ -634,6 +687,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 ) \ @@ -643,8 +697,8 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ @@ -724,17 +778,19 @@ 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 ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSetPointData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentParametersSetPointData ) \ 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 ) \ @@ -751,17 +807,29 @@ 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( 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 ) \ @@ -798,6 +866,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 ) \ @@ -806,13 +875,14 @@ 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 ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ @@ -859,6 +929,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 ) \ @@ -868,8 +939,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ @@ -919,6 +990,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 ) \ @@ -928,8 +1000,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ @@ -980,6 +1052,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 ) \ @@ -988,8 +1061,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ @@ -1030,13 +1103,14 @@ 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 ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationData ) \ - ACTION_RECEIVE_SIGNAL( TreatmentSetPointData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentParametersSetPointData ) \ ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ @@ -1047,7 +1121,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 ) \ @@ -1058,17 +1133,29 @@ 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( 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 ) \ @@ -1105,6 +1192,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 ) \ @@ -1113,13 +1201,14 @@ 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 ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDDateTimeResponseData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \