Index: sources/model/MModel.h =================================================================== diff -u -r4c3c38d7f96cd63be776677bec5d1d0aa574611a -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 --- sources/model/MModel.h (.../MModel.h) (revision 4c3c38d7f96cd63be776677bec5d1d0aa574611a) +++ sources/model/MModel.h (.../MModel.h) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77) @@ -74,6 +74,8 @@ #include "MAdjustDGDateTimeResponse.h" #include "MHDSerialNumberResponse.h" #include "MDGSerialNumberResponse.h" +#include "MAdjustHDServiceResponse.h" +#include "MAdjustDGServiceResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -255,6 +257,7 @@ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ + REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ /* Response */ \ @@ -280,7 +283,9 @@ REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ REGISTER_METATYPE( HDSerialNumberResponseData ) \ - REGISTER_METATYPE( DGSerialNumberResponseData ) + REGISTER_METATYPE( DGSerialNumberResponseData ) \ + REGISTER_METATYPE( AdjustHDServiceResponseData ) \ + REGISTER_METATYPE( AdjustDGServiceResponseData ) \ //===============================================================================// /*! @@ -354,7 +359,9 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSerialNumberResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGSerialNumberResponseData ) + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGSerialNumberResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGServiceResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -376,6 +383,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ @@ -461,6 +469,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDSerialNumberResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGSerialNumberResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGServiceResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -480,6 +490,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ \ @@ -507,6 +518,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ \ @@ -534,6 +546,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ \ @@ -603,6 +616,8 @@ ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ ACTION_RECEIVE_SIGNAL( HDSerialNumberResponseData ) \ ACTION_RECEIVE_SIGNAL( DGSerialNumberResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGServiceResponseData ) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//