Index: sources/model/MModel.h =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- sources/model/MModel.h (.../MModel.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/model/MModel.h (.../MModel.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -29,7 +29,7 @@ #include "MAlarmActiveList.h" #include "MAdjustHDAlarmVolumeResponse.h" -#include "MDuetConfirmHDi.h" +#include "MDuetConfirmTDi.h" // POST #include "MHDPostSingleResultData.h" @@ -154,6 +154,7 @@ #include "MTreatmentAdjustDurationEditResponse.h" #include "MTreatmentAdjustDurationConfirmResponse.h" #include "MTreatmentAdjustSetPointsResponse.h" +#include "MTreatmentAdjustVitalsAlarmLimitsResponse.h" #include "MTreatmentAdjustBloodFlowRateResponse.h" #include "MTreatmentAdjustDialysateFlowRateResponse.h" #include "MTreatmentAdjustDialysateTemperatureResponse.h" @@ -311,7 +312,7 @@ */ #define REGISTER_MODEL_METATYPES \ /* CONFIRM */ \ - REGISTER_METATYPE( DuetConfirmHDiData ) \ + REGISTER_METATYPE( DuetConfirmTDiData ) \ REGISTER_METATYPE( DuetConfirmUIrData ) \ /* RO Water Mode */ \ REGISTER_METATYPE( DuetRoWaterStatDGqData ) \ @@ -468,6 +469,7 @@ REGISTER_METATYPE( AdjustDurationEditRequestData ) \ REGISTER_METATYPE( AdjustDurationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSetPointsRequestData ) \ + REGISTER_METATYPE( AdjustVitalsAlarmLimitsRequestData ) \ REGISTER_METATYPE( AdjustBloodFlowRateRequestData ) \ REGISTER_METATYPE( AdjustDialysateFlowRateRequestData ) \ REGISTER_METATYPE( AdjustDialysateTemperatureRequestData ) \ @@ -519,6 +521,7 @@ REGISTER_METATYPE( AdjustDurationEditResponseData ) \ REGISTER_METATYPE( AdjustDurationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSetPointsResponseData ) \ + REGISTER_METATYPE( AdjustVitalsAlarmLimitsResponseData ) \ REGISTER_METATYPE( AdjustBloodFlowRateResponseData ) \ REGISTER_METATYPE( AdjustDialysateFlowRateResponseData ) \ REGISTER_METATYPE( AdjustDialysateTemperatureResponseData ) \ @@ -579,7 +582,7 @@ #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ \ /* CONFIRM */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmHDiData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmTDiData ) \ /* RO Water Mode */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterStatDGqData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeDGrData ) \ @@ -695,6 +698,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsAlarmLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodFlowRateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureResponseData ) \ @@ -747,6 +751,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsAlarmLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureRequestData ) \ @@ -825,7 +830,7 @@ */ #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ /* CONFIRM */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmHDiData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmTDiData ) \ /* RO Water Mode */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterStatDGqData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterModeDGrData ) \ @@ -942,6 +947,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSetPointsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsAlarmLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodFlowRateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateFlowRateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateTemperatureResponseData ) \ @@ -1016,6 +1022,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVitalsAlarmLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateTemperatureRequestData ) \ @@ -1089,6 +1096,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVitalsAlarmLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateTemperatureRequestData ) \ @@ -1162,6 +1170,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsAlarmLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateFlowRateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateTemperatureRequestData ) \ @@ -1202,7 +1211,7 @@ //== MessageInterpreter Signal Definition =======================================// #define ACTION_RECEIVE_SIGNALS \ /* CONFIRM */ \ - ACTION_RECEIVE_SIGNAL( DuetConfirmHDiData ) \ + ACTION_RECEIVE_SIGNAL( DuetConfirmTDiData ) \ /* RO Water Mode */ \ ACTION_RECEIVE_SIGNAL( DuetRoWaterStatDGqData ) \ ACTION_RECEIVE_SIGNAL( DuetRoWaterModeDGrData ) \ @@ -1320,6 +1329,7 @@ ACTION_RECEIVE_SIGNAL( AdjustDurationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSetPointsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVitalsAlarmLimitsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustBloodFlowRateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDialysateFlowRateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDialysateTemperatureResponseData ) \