Index: sources/model/MModel.h =================================================================== diff -u -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 -r0af01ff89762b5934bb00500ce563a3dc700efed --- sources/model/MModel.h (.../MModel.h) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77) +++ sources/model/MModel.h (.../MModel.h) (revision 0af01ff89762b5934bb00500ce563a3dc700efed) @@ -76,6 +76,7 @@ #include "MDGSerialNumberResponse.h" #include "MAdjustHDServiceResponse.h" #include "MAdjustDGServiceResponse.h" +#include "MAdjustHDAlarmVolumeResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -260,6 +261,7 @@ REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustAlarmVolumeRequestData ) \ /* Response */ \ REGISTER_METATYPE( GuiAlertRequestData ) \ REGISTER_METATYPE( TreatmentStartResponseData ) \ @@ -286,6 +288,7 @@ REGISTER_METATYPE( DGSerialNumberResponseData ) \ REGISTER_METATYPE( AdjustHDServiceResponseData ) \ REGISTER_METATYPE( AdjustDGServiceResponseData ) \ + REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ //===============================================================================// /*! @@ -362,6 +365,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGSerialNumberResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDServiceResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -389,6 +393,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAlarmVolumeRequestData ) \ /* 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 */ \ @@ -471,6 +476,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGSerialNumberResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDServiceResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -493,6 +499,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAlarmVolumeRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ @@ -521,6 +528,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAlarmVolumeRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ @@ -549,6 +557,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAlarmVolumeRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ @@ -618,6 +627,7 @@ ACTION_RECEIVE_SIGNAL( DGSerialNumberResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDServiceResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGServiceResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//