Index: sources/model/MModel.h =================================================================== diff -u -ra89b5249df072be403141463d7d88728b66a848e -r3c30d57c6cba7595b1e1d6b806d90ca151bc8db2 --- sources/model/MModel.h (.../MModel.h) (revision a89b5249df072be403141463d7d88728b66a848e) +++ sources/model/MModel.h (.../MModel.h) (revision 3c30d57c6cba7595b1e1d6b806d90ca151bc8db2) @@ -45,6 +45,8 @@ #include "MTreatmentRecirculateData.h" #include "MTreatmentBloodPrimeData.h" #include "MHDAccelerometerData.h" +#include "MHDPostSingleResultData.h" +#include "MHDPostFinalResultData.h" // Debugging Messages #include "MHDDebugText.h" @@ -69,6 +71,8 @@ #include "MDGTemperaturesData.h" #include "MDGValvesStatesData.h" #include "MDGAccelerometerData.h" +#include "MDGPostSingleResultData.h" +#include "MDGPostFinalResultData.h" // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" @@ -257,6 +261,8 @@ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ + REGISTER_METATYPE( HDPostSingleResultData ) \ + REGISTER_METATYPE( HDPostFinalResultData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ REGISTER_METATYPE( TreatmentLogAlarmData ) \ @@ -278,6 +284,8 @@ REGISTER_METATYPE( DGLoadCellReadingsData ) \ REGISTER_METATYPE( DGTemperaturesData ) \ REGISTER_METATYPE( DGAccelerometerData ) \ + REGISTER_METATYPE( DGPostSingleResultData ) \ + REGISTER_METATYPE( DGPostFinalResultData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -409,6 +417,9 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ + \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \ @@ -430,6 +441,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostFinalResultData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -563,6 +576,9 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ + \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \ @@ -584,6 +600,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostFinalResultData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -794,6 +812,9 @@ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ + ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ + ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \ + \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ @@ -814,6 +835,8 @@ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ + ACTION_RECEIVE_SIGNAL( DGPostSingleResultData ) \ + ACTION_RECEIVE_SIGNAL( DGPostFinalResultData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \