Index: sources/model/MModel.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r70986eda0c1b55e62935f500014d0aa72f7262fe --- sources/model/MModel.h (.../MModel.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/MModel.h (.../MModel.h) (revision 70986eda0c1b55e62935f500014d0aa72f7262fe) @@ -83,6 +83,7 @@ #include "MAdjustDGServiceDatesResponse.h" #include "MAdjustHDDateTimeResponse.h" #include "MAdjustDGDateTimeResponse.h" +#include "MDuetRoWaterDG.h" // DG Data Messages #include "MDGDrainPumpData.h" @@ -264,6 +265,10 @@ /* CONFIRM */ \ REGISTER_METATYPE( DuetConfirmHDiData ) \ REGISTER_METATYPE( DuetConfirmUIrData ) \ + /* RO Water Mode */ \ + REGISTER_METATYPE( DuetRoWaterStatDGqData ) \ + REGISTER_METATYPE( DuetRoWaterModeUIiData ) \ + REGISTER_METATYPE( DuetRoWaterModeDGrData ) \ /* POST */ \ REGISTER_METATYPE( HDPostSingleResultData ) \ REGISTER_METATYPE( HDPostFinalResultData ) \ @@ -450,6 +455,9 @@ \ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmHDiData ) \ + /* RO Water Mode */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterStatDGqData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeDGrData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ @@ -490,7 +498,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionData ) \ - disabled coco end */ \ + disabled coco end */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ @@ -560,6 +568,8 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetConfirmUIrData ) \ + /* RO Water Mode */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeUIiData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUIPostFinalResultRequestData ) \ \ @@ -629,6 +639,9 @@ #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ /* CONFIRM */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmHDiData ) \ + /* RO Water Mode */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterStatDGqData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterModeDGrData ) \ /* POST */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ @@ -670,7 +683,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedConditionData ) \ - disabled coco end */ \ + disabled coco end */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ @@ -740,6 +753,8 @@ /* Request --------------------------------------------------------- */ \ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetConfirmUIrData ) \ + /* RO Water Mode */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DuetRoWaterModeUIiData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -793,6 +808,8 @@ /* Request ----------------------- NoEmit -------------------------- */ \ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetConfirmUIrData ) \ + /* RO Water Mode */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DuetRoWaterModeUIiData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -846,6 +863,8 @@ /* Request ----------------------- public -------------------------- */ \ /* CONFIRM */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetConfirmUIrData ) \ + /* RO Water Mode */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DuetRoWaterModeUIiData ) \ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ @@ -899,6 +918,9 @@ #define ACTION_RECEIVE_SIGNALS \ /* CONFIRM */ \ ACTION_RECEIVE_SIGNAL( DuetConfirmHDiData ) \ + /* RO Water Mode */ \ + ACTION_RECEIVE_SIGNAL( DuetRoWaterStatDGqData ) \ + ACTION_RECEIVE_SIGNAL( DuetRoWaterModeDGrData ) \ /* POST */ \ ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \