Index: sources/model/MModel.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r3d13050e0319cf30a1686b58c8f2328f6860910a --- sources/model/MModel.h (.../MModel.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/MModel.h (.../MModel.h) (revision 3d13050e0319cf30a1686b58c8f2328f6860910a) @@ -104,8 +104,10 @@ #include "MDDPressuresData.h" #include "MDGReservoirData.h" #include "MDGROPumpData.h" +#include "MDDConcentratePumpData.h" #include "MDDTemperaturesData.h" -#include "MDGValvesStatesData.h" +#include "MDDDialysatePumpData.h" +#include "MDDValvesStatesData.h" #include "MDGAccelerometerData.h" #include "MDDConductivityData.h" #include "MDDGenDialysateData.h" @@ -366,10 +368,12 @@ REGISTER_METATYPE( DGDrainPumpData ) \ REGISTER_METATYPE( DGOperationModeData ) \ REGISTER_METATYPE( DGReservoirData ) \ - REGISTER_METATYPE( DGValvesStatesData ) \ + REGISTER_METATYPE( DDValvesStatesData ) \ REGISTER_METATYPE( DDHeatersData ) \ REGISTER_METATYPE( DGLoadCellReadingsData ) \ + REGISTER_METATYPE( DDConcentratePumpData ) \ REGISTER_METATYPE( DDTemperaturesData ) \ + REGISTER_METATYPE( DDDialysatePumpData ) \ REGISTER_METATYPE( DGAccelerometerData ) \ REGISTER_METATYPE( DDConductivityData ) \ REGISTER_METATYPE( DDGenDialysateData ) \ @@ -555,10 +559,12 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGReservoirData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGValvesStatesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDHeatersData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDConcentratePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDDialysatePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDGenDialysateData ) \ @@ -758,10 +764,12 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGReservoirData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGValvesStatesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDHeatersData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDConcentratePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDDialysatePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDGenDialysateData ) \ @@ -1066,10 +1074,12 @@ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ ACTION_RECEIVE_SIGNAL( DGOperationModeData ) \ ACTION_RECEIVE_SIGNAL( DGReservoirData ) \ - ACTION_RECEIVE_SIGNAL( DGValvesStatesData ) \ + ACTION_RECEIVE_SIGNAL( DDValvesStatesData ) \ ACTION_RECEIVE_SIGNAL( DDHeatersData ) \ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ + ACTION_RECEIVE_SIGNAL( DDConcentratePumpData ) \ ACTION_RECEIVE_SIGNAL( DDTemperaturesData ) \ + ACTION_RECEIVE_SIGNAL( DDDialysatePumpData ) \ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( DDConductivityData ) \ ACTION_RECEIVE_SIGNAL( DDGenDialysateData ) \