Index: sources/model/MModel.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/model/MModel.h (.../MModel.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/model/MModel.h (.../MModel.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -58,6 +58,10 @@ #include "MAdjustDGRequests.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" +#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustDGSerialNumberResponse.h" +#include "MAdjustHDServiceResponse.h" +#include "MAdjustDGServiceResponse.h" #include "MAdjustHDDateTimeResponse.h" #include "MAdjustDGDateTimeResponse.h" @@ -338,6 +342,7 @@ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ + REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ @@ -370,8 +375,12 @@ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ - REGISTER_METATYPE( AdjustHDVersionsResponseData ) \ - REGISTER_METATYPE( AdjustDGVersionsResponseData ) \ + REGISTER_METATYPE( AdjustVersionsHDResponseData ) \ + REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \ + REGISTER_METATYPE( AdjustServiceHDResponseData ) \ + REGISTER_METATYPE( AdjustServiceDGResponseData ) \ REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -476,8 +485,12 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDGResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -501,6 +514,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ @@ -630,8 +644,12 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDGResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -674,6 +692,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ @@ -720,6 +739,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ 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( AdjustHDAlarmVolumeRequestData ) \ @@ -766,6 +786,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ 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( AdjustHDAlarmVolumeRequestData ) \ @@ -860,8 +881,12 @@ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceDGResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ /* Alarms */ \