Index: sources/model/MModel.h =================================================================== diff -u -r4a67c01045f365be38f1a12a8572c0070d343e1e -rb5afbc61af03dd2e84acf8439cb6be1f022a2921 --- sources/model/MModel.h (.../MModel.h) (revision 4a67c01045f365be38f1a12a8572c0070d343e1e) +++ sources/model/MModel.h (.../MModel.h) (revision b5afbc61af03dd2e84acf8439cb6be1f022a2921) @@ -7,7 +7,7 @@ * * \file MModel.h * \author (last) Behrouz NematiPour - * \date (last) 09-Mar-2022 + * \date (last) 18-Apr-2022 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -30,6 +30,8 @@ #include "MAlarmActiveList.h" #include "MAdjustHDAlarmVolumeResponse.h" +#include "MDuetConfirmHDi.h" + // POST #include "MHDPostSingleResultData.h" #include "MHDPostFinalResultData.h" @@ -76,8 +78,9 @@ #include "MAdjustDGVersionsResponse.h" #include "MAdjustHDSerialNumberResponse.h" #include "MAdjustDGSerialNumberResponse.h" -#include "MAdjustHDServiceResponse.h" -#include "MAdjustDGServiceResponse.h" +#include "MAdjustHDServiceModeResponse.h" +#include "MAdjustHDServiceDatesResponse.h" +#include "MAdjustDGServiceDatesResponse.h" #include "MAdjustHDDateTimeResponse.h" #include "MAdjustDGDateTimeResponse.h" @@ -260,6 +263,9 @@ \details Registers the models in the Qt MetaType so it can be used in signal/slots between threads. */ #define REGISTER_MODEL_METATYPES \ + /* CONFIRM */ \ + REGISTER_METATYPE( DuetConfirmHDiData ) \ + REGISTER_METATYPE( DuetConfirmUIrData ) \ /* POST */ \ REGISTER_METATYPE( HDPostSingleResultData ) \ REGISTER_METATYPE( HDPostFinalResultData ) \ @@ -382,7 +388,8 @@ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ - REGISTER_METATYPE( AdjustServiceRequestData ) \ + REGISTER_METATYPE( AdjustServiceModeRequestData ) \ + REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ @@ -421,8 +428,9 @@ REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \ - REGISTER_METATYPE( AdjustServiceHDResponseData ) \ - REGISTER_METATYPE( AdjustServiceDGResponseData ) \ + REGISTER_METATYPE( AdjustServiceModeResponseData ) \ + REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \ + REGISTER_METATYPE( AdjustServiceDatesDGResponseData ) \ REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -447,6 +455,8 @@ */ #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ \ + /* CONFIRM */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmHDiData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ @@ -547,8 +557,9 @@ 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, AdjustServiceModeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesDGResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -558,6 +569,8 @@ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ + /* CONFIRM */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetConfirmUIrData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUIPostFinalResultRequestData ) \ \ @@ -575,7 +588,8 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ @@ -624,6 +638,8 @@ This macro should be used with its counterpart macro \ref ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS */ #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ + /* CONFIRM */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmHDiData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ @@ -724,8 +740,9 @@ 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( AdjustServiceModeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesDGResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ /* Alarms - Active List Response */ \ @@ -735,6 +752,8 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ + /* CONFIRM */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetConfirmUIrData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -771,7 +790,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ @@ -785,6 +805,8 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ + /* CONFIRM */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetConfirmUIrData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -821,7 +843,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ @@ -835,6 +858,8 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ + /* CONFIRM */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetConfirmUIrData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -871,7 +896,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceModeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceDatesRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ @@ -885,6 +911,8 @@ //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ + /* CONFIRM */ \ + ACTION_RECEIVE_SIGNAL( DuetConfirmHDiData ) \ /* POST */ \ ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \ @@ -985,8 +1013,9 @@ ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustServiceHDResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustServiceDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceDatesDGResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ /* Alarms */ \