Index: sources/model/MModel.h =================================================================== diff -u -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/model/MModel.h (.../MModel.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) +++ sources/model/MModel.h (.../MModel.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -75,8 +75,8 @@ #include "MTDSwitchesData.h" #include "MTDEjectorData.h" #include "MTDTemperatureData.h" +#include "MWaterSampleData.h" - // Debugging Messages #include "MHDDebugText.h" #include "MDGDebugText.h" @@ -103,11 +103,11 @@ #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" #include "MTDAdvancedInstitutionalRecordResponse.h" -// DG Data Messages +// DD Data Messages #include "MDGDrainPumpData.h" #include "MDDHeatersData.h" #include "MDGLoadCellReadingsData.h" -#include "MDGOperationModeData.h" +#include "MDDOperationModeData.h" #include "MDDPressuresData.h" #include "MDGReservoirData.h" #include "MDGROPumpData.h" @@ -129,13 +129,14 @@ #include "MFPConductivityData.h" #include "MFPTemperatureData.h" #include "MFPBoostPumpData.h" +#include "MFPRORejectionPercentageData.h" // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" #include "MPreTreatmentAdjustInitTreatmentResponse.h" #include "MPreTreatmentAdjustParametersValidationResponse.h" #include "MDGFilterFlushData.h" // DG message but part of the Pre-Treatment messaging flow -#include "MPreTreatmentAdjustWaterSampleResponse.h" +#include "MPreTreatmentAdjustWaterSampleResultResponse.h" #include "MPreTreatmentSelfTestNoCartridgeData.h" #include "MPreTreatmentSelfTestDryData.h" #include "MPreTreatmentAdjustDisposablesConfirmResponse.h" @@ -390,6 +391,7 @@ REGISTER_METATYPE( TDAirPumpData ) \ REGISTER_METATYPE( HDUsageInfoResponseData ) \ REGISTER_METATYPE( HDUsageInfoRequestData ) \ + REGISTER_METATYPE( WaterSampleData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ REGISTER_METATYPE( TreatmentLogAlarmData ) \ @@ -401,7 +403,7 @@ REGISTER_METATYPE( DGROPumpData ) \ REGISTER_METATYPE( DDPressuresData ) \ REGISTER_METATYPE( DGDrainPumpData ) \ - REGISTER_METATYPE( DGOperationModeData ) \ + REGISTER_METATYPE( DDOperationModeData ) \ REGISTER_METATYPE( DGReservoirData ) \ REGISTER_METATYPE( DDValvesStatesData ) \ REGISTER_METATYPE( DDHeatersData ) \ @@ -422,6 +424,7 @@ REGISTER_METATYPE( FPConductivityData ) \ REGISTER_METATYPE( FPTemperatureData ) \ REGISTER_METATYPE( FPBoostPumpData ) \ + REGISTER_METATYPE( FPRORejectionPercentageData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -441,7 +444,6 @@ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentRequestData ) \ REGISTER_METATYPE( AdjustParametersValidationRequestData ) \ - REGISTER_METATYPE( AdjustWaterSampleRequestData ) \ REGISTER_METATYPE( AdjustWaterSampleResultRequestData ) \ REGISTER_METATYPE( AdjustConsumablesConfirmRequestData ) \ REGISTER_METATYPE( AdjustDisposablesConfirmRequestData ) \ @@ -499,7 +501,7 @@ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ REGISTER_METATYPE( AdjustParametersValidationResponseData ) \ - REGISTER_METATYPE( AdjustWaterSampleResponseData ) \ + REGISTER_METATYPE( AdjustWaterSampleResultResponseData ) \ REGISTER_METATYPE( AdjustDisposablesConfirmResponseData ) \ REGISTER_METATYPE( AdjustDisposablesPrimeResponseData ) \ REGISTER_METATYPE( AdjustPatientConnectionBeginResponseData ) \ @@ -623,6 +625,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSwitchesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDBatteryData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDValvesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, WaterSampleData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \ @@ -634,7 +637,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGReservoirData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDHeatersData ) \ @@ -655,6 +658,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPConductivityData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPTemperatureData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPBoostPumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPRORejectionPercentageData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -673,7 +677,7 @@ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResultResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginResponseData ) \ @@ -775,7 +779,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmRequestData ) \ @@ -869,6 +872,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TDSwitchesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDEjectorData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDTemperatureData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( WaterSampleData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \ @@ -880,7 +884,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGReservoirData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDHeatersData ) \ @@ -901,6 +905,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( FPConductivityData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( FPTemperatureData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( FPBoostPumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPRORejectionPercentageData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -919,7 +924,7 @@ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustParametersValidationResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResultResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionBeginResponseData ) \ @@ -991,7 +996,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesConfirmRequestData ) \ @@ -1065,7 +1069,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesConfirmRequestData ) \ @@ -1139,7 +1142,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesConfirmRequestData ) \ @@ -1247,6 +1249,7 @@ ACTION_RECEIVE_SIGNAL( TDTemperatureData ) \ ACTION_RECEIVE_SIGNAL( TDAirBubbleData ) \ ACTION_RECEIVE_SIGNAL( TDAirPumpData ) \ + ACTION_RECEIVE_SIGNAL( WaterSampleData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ @@ -1259,7 +1262,7 @@ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ ACTION_RECEIVE_SIGNAL( DDPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ - ACTION_RECEIVE_SIGNAL( DGOperationModeData ) \ + ACTION_RECEIVE_SIGNAL( DDOperationModeData ) \ ACTION_RECEIVE_SIGNAL( DGReservoirData ) \ ACTION_RECEIVE_SIGNAL( DDValvesStatesData ) \ ACTION_RECEIVE_SIGNAL( DDHeatersData ) \ @@ -1280,6 +1283,7 @@ ACTION_RECEIVE_SIGNAL( FPConductivityData ) \ ACTION_RECEIVE_SIGNAL( FPTemperatureData ) \ ACTION_RECEIVE_SIGNAL( FPBoostPumpData ) \ + ACTION_RECEIVE_SIGNAL( FPRORejectionPercentageData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ @@ -1298,7 +1302,7 @@ /* Pre-Treatment */ \ ACTION_RECEIVE_SIGNAL( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustParametersValidationResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResultResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionBeginResponseData ) \