Index: sources/model/MModel.h =================================================================== diff -u -r667baa15f6fc3a9438dae68ded8cee26c2ca7450 -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 --- sources/model/MModel.h (.../MModel.h) (revision 667baa15f6fc3a9438dae68ded8cee26c2ca7450) +++ sources/model/MModel.h (.../MModel.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) @@ -54,6 +54,7 @@ #include "MTreatmentRecirculateData.h" #include "MTreatmentBloodPrimeData.h" #include "MHDAccelerometerData.h" +#include "MHDSyringePumpData.h" // Debugging Messages #include "MHDDebugText.h" @@ -62,6 +63,7 @@ // Settings #include "MAdjustHDRequests.h" #include "MAdjustDGRequests.h" +#include "MAdjustHDVersionsRequest.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" #include "MAdjustHDSerialNumberResponse.h" @@ -278,6 +280,7 @@ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ + REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ @@ -353,6 +356,7 @@ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ + REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ @@ -387,6 +391,7 @@ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ + REGISTER_METATYPE( AdjustVersionsHDRequestData ) \ REGISTER_METATYPE( AdjustVersionsHDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ @@ -441,6 +446,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ @@ -503,6 +509,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ @@ -533,6 +540,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ 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, AdjustHDDateTimeRequestData ) \ @@ -607,6 +615,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ @@ -669,6 +678,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ @@ -718,6 +728,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ @@ -767,6 +778,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ 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( AdjustHDDateTimeRequestData ) \ @@ -816,6 +828,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRinsebackRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ 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( AdjustHDDateTimeRequestData ) \ @@ -856,6 +869,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ @@ -917,6 +931,7 @@ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \