Index: sources/model/MModel.h =================================================================== diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -r56add5af14ac43e5b78a12da65a4da27e223f103 --- sources/model/MModel.h (.../MModel.h) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a) +++ sources/model/MModel.h (.../MModel.h) (revision 56add5af14ac43e5b78a12da65a4da27e223f103) @@ -27,7 +27,7 @@ #include "MAlarmTriggered.h" #include "MAlarmCleared.h" #include "MAlarmActiveList.h" -#include "MAdjustHDAlarmVolumeResponse.h" +#include "MAdjustTDAlarmVolumeResponse.h" #include "MDuetConfirmTDi.h" // POST @@ -52,6 +52,7 @@ #include "MTreatmentRangesData.h" #include "MTreatmentSalineData.h" #include "MTreatmentVitalsData.h" +#include "MTreatmentHDFData.h" #include "MTreatmentDryBicartDisconnectData.h" #include "MTreatmentHeparinData.h" #include "MTreatmentRinsebackData.h" @@ -97,7 +98,8 @@ #include "MAdjustDGServiceDatesResponse.h" #include "MAdjustTDDateTimeResponse.h" #include "MAdjustDDDateTimeResponse.h" -#include "MDuetRoWaterDG.h" +#include "MAdjustRoWaterModeResponse.h" +#include "MRoWaterModeResponse.h" #include "MAdjustTDInstitutionalRecordResponse.h" #include "MTDInstitutionalRecordResponse.h" #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" @@ -173,6 +175,9 @@ #include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" #include "MTreatmentAdjustPressuresWideningResponse.h" +#include "MTreatmentAdjustAutoSubResponse.h" +#include "MTreatmentAdjustHDFResponse.h" +#include "MTreatmentAdjustHDFStateResponse.h" #include "MTreatmentAdjustDryBicartDisconnectResponse.h" // Post-Treatment @@ -316,9 +321,10 @@ REGISTER_METATYPE( DuetConfirmTDiData ) \ REGISTER_METATYPE( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - REGISTER_METATYPE( DuetRoWaterStatDGqData ) \ - REGISTER_METATYPE( DuetRoWaterModeUIiData ) \ - REGISTER_METATYPE( DuetRoWaterModeDGrData ) \ + REGISTER_METATYPE( AdjustRoWaterModeRequestData ) \ + REGISTER_METATYPE( AdjustRoWaterModeResponseData ) \ + REGISTER_METATYPE( RoWaterModeRequestData ) \ + REGISTER_METATYPE( RoWaterModeResponseData ) \ /* POST */ \ REGISTER_METATYPE( HDPostSingleResultData ) \ REGISTER_METATYPE( HDPostFinalResultData ) \ @@ -371,6 +377,7 @@ REGISTER_METATYPE( TreatmentRangesData ) \ REGISTER_METATYPE( TreatmentSalineData ) \ REGISTER_METATYPE( TreatmentVitalsData ) \ + REGISTER_METATYPE( TreatmentHDFData ) \ REGISTER_METATYPE( TreatmentHeparinData ) \ REGISTER_METATYPE( TreatmentDryBicartDisconnectData ) \ REGISTER_METATYPE( TreatmentRinsebackData ) \ @@ -468,6 +475,9 @@ REGISTER_METATYPE( AdjustBloodPrimeRequestData ) \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustBolusVolumeRequestData ) \ + REGISTER_METATYPE( AdjustHDFStateRequestData ) \ + REGISTER_METATYPE( AdjustAutoSubRequestData ) \ + REGISTER_METATYPE( AdjustHDFRequestData ) \ REGISTER_METATYPE( AdjustDurationEditRequestData ) \ REGISTER_METATYPE( AdjustDurationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSetPointsRequestData ) \ @@ -496,7 +506,7 @@ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeRequestData ) \ \ /* Response */ \ /* Post-Treatment */ \ @@ -543,6 +553,9 @@ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustPressuresWideningResponseData ) \ + REGISTER_METATYPE( AdjustHDFResponseData ) \ + REGISTER_METATYPE( AdjustHDFStateResponseData ) \ + REGISTER_METATYPE( AdjustAutoSubResponseData ) \ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ @@ -556,7 +569,7 @@ REGISTER_METATYPE( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ REGISTER_METATYPE( AlarmActiveListResponseData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeResponseData ) \ REGISTER_METATYPE( AdjustInstitutionalRequestData ) \ REGISTER_METATYPE( AdjustInstitutionalRecordResponseData ) \ REGISTER_METATYPE( InstitutionalRequestData ) \ @@ -588,8 +601,8 @@ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRoWaterModeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, RoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ @@ -612,6 +625,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentVitalsData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHDFData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ @@ -722,6 +736,9 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \ @@ -735,7 +752,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRecordResponseData ) \ @@ -747,13 +764,17 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUIPostFinalResultRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsRequestData ) \ @@ -782,7 +803,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmRequestData ) \ @@ -839,8 +860,8 @@ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRoWaterModeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( RoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ @@ -864,6 +885,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentVitalsData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHDFData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ @@ -974,6 +996,9 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAutoSubResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \ @@ -987,7 +1012,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInstitutionalRecordResponseData ) \ @@ -1000,7 +1025,8 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1028,6 +1054,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSetPointsRequestData ) \ @@ -1056,7 +1085,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ @@ -1075,7 +1104,8 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1103,6 +1133,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSetPointsRequestData ) \ @@ -1131,7 +1164,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ @@ -1150,7 +1183,8 @@ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetConfirmUIrData ) \ /* RO Water Mode */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetRoWaterModeUIiData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRoWaterModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( RoWaterModeRequestData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -1178,6 +1212,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodPrimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBolusVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAutoSubRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDFRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSetPointsRequestData ) \ @@ -1206,7 +1243,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ @@ -1225,8 +1262,8 @@ /* CONFIRM */ \ ACTION_RECEIVE_SIGNAL( DuetConfirmTDiData ) \ /* RO Water Mode */ \ - ACTION_RECEIVE_SIGNAL( DuetRoWaterStatDGqData ) \ - ACTION_RECEIVE_SIGNAL( DuetRoWaterModeDGrData ) \ + ACTION_RECEIVE_SIGNAL( AdjustRoWaterModeResponseData ) \ + ACTION_RECEIVE_SIGNAL( RoWaterModeResponseData ) \ /* POST */ \ ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \ @@ -1250,6 +1287,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \ ACTION_RECEIVE_SIGNAL( TreatmentVitalsData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentHDFData ) \ ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \ ACTION_RECEIVE_SIGNAL( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ @@ -1361,6 +1399,9 @@ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresWideningResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDFResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDFStateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustAutoSubResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \ @@ -1374,7 +1415,7 @@ ACTION_RECEIVE_SIGNAL( AdjustDDDateTimeResponseData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTDAlarmVolumeResponseData ) \ /* Settings - HD data response */ \ ACTION_RECEIVE_SIGNAL( HDUsageInfoResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustInstitutionalRecordResponseData ) \