Index: sources/model/MModel.h =================================================================== diff -u -r006258aac11cf89bd1a37ffde078c953f5e307f1 -rc1d0546e2d1a51ff919b2172ce647003359f0853 --- sources/model/MModel.h (.../MModel.h) (revision 006258aac11cf89bd1a37ffde078c953f5e307f1) +++ sources/model/MModel.h (.../MModel.h) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) @@ -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" @@ -98,17 +100,21 @@ // 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" // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" @@ -134,6 +140,7 @@ #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "MTreatmentAdjustSalineResponse.h" +#include "MTreatmentAdjustVitalsResponse.h" #include "MTreatmentAdjustHeparinResponse.h" #include "MTreatmentAdjustRinsebackResponse.h" #include "MTreatmentAdjustRecirculateResponse.h" @@ -311,6 +318,10 @@ REGISTER_METATYPE( DeviceUSBMountResponseData ) \ REGISTER_METATYPE( DeviceWifiListRequestData ) \ REGISTER_METATYPE( DeviceWifiListResponseData ) \ + REGISTER_METATYPE( DeviceWifiInfoRequestData ) \ + REGISTER_METATYPE( DeviceWifiInfoResponseData ) \ + REGISTER_METATYPE( DeviceWifiConnectRequestData ) \ + REGISTER_METATYPE( DeviceWifiConnectResponseData ) \ /* Settings */ \ REGISTER_METATYPE( SettingsData ) \ REGISTER_METATYPE( BluetoothData ) \ @@ -328,13 +339,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 ) \ @@ -345,7 +357,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 */ \ @@ -357,17 +370,21 @@ 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 ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -413,6 +430,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ + REGISTER_METATYPE( AdjustVitalsRequestData ) \ REGISTER_METATYPE( AdjustHeparinRequestData ) \ REGISTER_METATYPE( AdjustRinsebackRequestData ) \ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ @@ -452,6 +470,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( AdjustVitalsResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ REGISTER_METATYPE( AdjustRinsebackResponseData ) \ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ @@ -518,17 +537,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 ) \ @@ -545,17 +566,21 @@ 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 ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -592,6 +617,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 ) \ @@ -630,6 +656,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 ) \ @@ -720,17 +747,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 ) \ @@ -747,17 +776,21 @@ 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 ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -794,6 +827,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 ) \ @@ -855,6 +889,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 ) \ @@ -915,6 +950,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 ) \ @@ -976,6 +1012,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 ) \ @@ -1026,13 +1063,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 ) \ @@ -1043,7 +1081,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 ) \ @@ -1054,17 +1093,21 @@ 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 ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ @@ -1101,6 +1144,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 ) \