Index: sources/model/MModel.h =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r54c96a3275592c881e0fcd0cdfba65e8b1a78677 --- sources/model/MModel.h (.../MModel.h) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/model/MModel.h (.../MModel.h) (revision 54c96a3275592c881e0fcd0cdfba65e8b1a78677) @@ -27,7 +27,7 @@ #include "MAlarmTriggered.h" #include "MAlarmCleared.h" #include "MAlarmActiveList.h" -#include "MAdjustHDAlarmVolumeResponse.h" +#include "MAdjustTDAlarmVolumeResponse.h" #include "MDuetConfirmTDi.h" // POST @@ -97,7 +97,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" @@ -318,9 +319,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 ) \ @@ -500,7 +502,7 @@ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ + REGISTER_METATYPE( AdjustTDAlarmVolumeRequestData ) \ \ /* Response */ \ /* Post-Treatment */ \ @@ -562,7 +564,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 ) \ @@ -594,8 +596,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 ) \ @@ -743,7 +745,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 ) \ @@ -755,7 +757,8 @@ /* 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 ) \ \ @@ -792,7 +795,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 ) \ @@ -849,8 +852,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 ) \ @@ -999,7 +1002,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 ) \ @@ -1012,7 +1015,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 */ \ @@ -1070,7 +1074,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 ) \ @@ -1089,7 +1093,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 */ \ @@ -1147,7 +1152,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 ) \ @@ -1166,7 +1171,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 */ \ @@ -1224,7 +1230,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 ) \ @@ -1243,8 +1249,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 ) \ @@ -1394,7 +1400,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 ) \