Index: sources/model/MModel.h =================================================================== diff -u -rb3f0f9afa498c5892f39745c36b9762ec957a468 -r0cb2630813e6f7216adaf990f4129deb87b849bf --- sources/model/MModel.h (.../MModel.h) (revision b3f0f9afa498c5892f39745c36b9762ec957a468) +++ sources/model/MModel.h (.../MModel.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) @@ -98,13 +98,13 @@ // DG Data Messages #include "MDGDrainPumpData.h" -#include "MDGHeatersData.h" +#include "MDDHeatersData.h" #include "MDGLoadCellReadingsData.h" #include "MDGOperationModeData.h" -#include "MDGPressuresData.h" +#include "MDDPressuresData.h" #include "MDGReservoirData.h" #include "MDGROPumpData.h" -#include "MDGTemperaturesData.h" +#include "MDDTemperaturesData.h" #include "MDGValvesStatesData.h" #include "MDGAccelerometerData.h" #include "MDDConductivityData.h" @@ -362,14 +362,14 @@ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ REGISTER_METATYPE( DGROPumpData ) \ - REGISTER_METATYPE( DGPressuresData ) \ + REGISTER_METATYPE( DDPressuresData ) \ REGISTER_METATYPE( DGDrainPumpData ) \ REGISTER_METATYPE( DGOperationModeData ) \ REGISTER_METATYPE( DGReservoirData ) \ REGISTER_METATYPE( DGValvesStatesData ) \ - REGISTER_METATYPE( DGHeatersData ) \ + REGISTER_METATYPE( DDHeatersData ) \ REGISTER_METATYPE( DGLoadCellReadingsData ) \ - REGISTER_METATYPE( DGTemperaturesData ) \ + REGISTER_METATYPE( DDTemperaturesData ) \ REGISTER_METATYPE( DGAccelerometerData ) \ REGISTER_METATYPE( DDConductivityData ) \ REGISTER_METATYPE( DDGenDialysateData ) \ @@ -551,14 +551,14 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDPressuresData ) \ 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, DGHeatersData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDHeatersData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDGenDialysateData ) \ @@ -754,14 +754,14 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGPressuresData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGReservoirData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGValvesStatesData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGHeatersData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDHeatersData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDConductivityData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDGenDialysateData ) \ @@ -1062,14 +1062,14 @@ ACTION_RECEIVE_SIGNAL( TreatmentLogEventData ) \ \ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ - ACTION_RECEIVE_SIGNAL( DGPressuresData ) \ + ACTION_RECEIVE_SIGNAL( DDPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ ACTION_RECEIVE_SIGNAL( DGOperationModeData ) \ ACTION_RECEIVE_SIGNAL( DGReservoirData ) \ ACTION_RECEIVE_SIGNAL( DGValvesStatesData ) \ - ACTION_RECEIVE_SIGNAL( DGHeatersData ) \ + ACTION_RECEIVE_SIGNAL( DDHeatersData ) \ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ - ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ + ACTION_RECEIVE_SIGNAL( DDTemperaturesData ) \ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( DDConductivityData ) \ ACTION_RECEIVE_SIGNAL( DDGenDialysateData ) \