Index: sources/model/MModel.h =================================================================== diff -u -rfdda01b86e25893f54de3d25e83ad0e8f5484a57 -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 --- sources/model/MModel.h (.../MModel.h) (revision fdda01b86e25893f54de3d25e83ad0e8f5484a57) +++ sources/model/MModel.h (.../MModel.h) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77) @@ -70,6 +70,12 @@ #include "MStartTreatmentResponse.h" #include "MTreatmentAdjustHDVersionsResponse.h" #include "MTreatmentAdjustDGVersionsResponse.h" +#include "MAdjustHDDateTimeResponse.h" +#include "MAdjustDGDateTimeResponse.h" +#include "MHDSerialNumberResponse.h" +#include "MDGSerialNumberResponse.h" +#include "MAdjustHDServiceResponse.h" +#include "MAdjustDGServiceResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -251,6 +257,9 @@ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ + REGISTER_METATYPE( AdjustServiceRequestData ) \ + REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ /* Response */ \ REGISTER_METATYPE( GuiAlertRequestData ) \ REGISTER_METATYPE( TreatmentStartResponseData ) \ @@ -270,7 +279,13 @@ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) \ REGISTER_METATYPE( AdjustHDVersionsResponseData ) \ - REGISTER_METATYPE( AdjustDGVersionsResponseData ) + REGISTER_METATYPE( AdjustDGVersionsResponseData ) \ + REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ + REGISTER_METATYPE( HDSerialNumberResponseData ) \ + REGISTER_METATYPE( DGSerialNumberResponseData ) \ + REGISTER_METATYPE( AdjustHDServiceResponseData ) \ + REGISTER_METATYPE( AdjustDGServiceResponseData ) \ //===============================================================================// /*! @@ -341,6 +356,12 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGVersionsResponseData ) \ + 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, AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGServiceResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -362,9 +383,12 @@ 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 ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionRequestData ) \ coco end */ \ @@ -441,6 +465,12 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentParametersResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ + 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 --------------------------------------------------------- */ \ @@ -460,6 +490,9 @@ 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 ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ @@ -485,6 +518,9 @@ 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 ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ @@ -510,6 +546,9 @@ 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 ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ @@ -573,6 +612,12 @@ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( HDSerialNumberResponseData ) \ + ACTION_RECEIVE_SIGNAL( DGSerialNumberResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDServiceResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGServiceResponseData ) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//