Index: sources/model/MModel.h =================================================================== diff -u -rd17a7a6adf72a6224280548e2341dfce22bf72c7 -r8350b02fa06da7cb6d7f085f88f55bf505ae78df --- sources/model/MModel.h (.../MModel.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) +++ sources/model/MModel.h (.../MModel.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) @@ -101,6 +101,8 @@ #include "MTDInstitutionalRecordResponse.h" #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" #include "MTDAdvancedInstitutionalRecordResponse.h" +#include "MDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationPressureRecordResponse.h" // DD Data Messages #include "MDGDrainPumpData.h" @@ -560,6 +562,10 @@ REGISTER_METATYPE( AdjustAdvancedInstitutionalRecordResponseData ) \ REGISTER_METATYPE( AdvancedInstitutionalRequestData ) \ REGISTER_METATYPE( AdvancedInstitutionalRecordResponseData ) \ + REGISTER_METATYPE( DDCalibrationPressureRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationPressureRequestData ) \ + REGISTER_METATYPE( DDCalibrationPressureResponseData ) \ + REGISTER_METATYPE( AdjustDDCalibrationPressureResponseData ) \ /* HD reset in service mode */ \ REGISTER_METATYPE( AdjustHDResetInSrvcRequestData ) \ @@ -735,6 +741,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ @@ -806,6 +814,8 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDResetInSrvcRequestData ) \ @@ -984,6 +994,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDCalibrationPressureResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -1056,6 +1068,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationPressureRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDResetInSrvcRequestData ) \ @@ -1130,6 +1144,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationPressureRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDResetInSrvcRequestData ) \ @@ -1204,6 +1220,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( InstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationPressureRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDResetInSrvcRequestData ) \ @@ -1366,6 +1384,8 @@ ACTION_RECEIVE_SIGNAL( InstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustAdvancedInstitutionalRecordResponseData ) \ ACTION_RECEIVE_SIGNAL( AdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_SIGNAL( DDCalibrationPressureResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDCalibrationPressureResponseData ) \ //--------------------------------------------------------------------------------//