Index: sources/model/MModel.h =================================================================== diff -u -rf723048b0efe2edf7cb08b9bba2ef67c55917503 -rca67f7413160dfba507856222bd9aa95c5fa6200 --- sources/model/MModel.h (.../MModel.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) +++ sources/model/MModel.h (.../MModel.h) (revision ca67f7413160dfba507856222bd9aa95c5fa6200) @@ -75,8 +75,8 @@ #include "MTDSwitchesData.h" #include "MTDEjectorData.h" #include "MTDTemperatureData.h" +#include "MWaterSampleData.h" - // Debugging Messages #include "MHDDebugText.h" #include "MDGDebugText.h" @@ -390,6 +390,7 @@ REGISTER_METATYPE( TDAirPumpData ) \ REGISTER_METATYPE( HDUsageInfoResponseData ) \ REGISTER_METATYPE( HDUsageInfoRequestData ) \ + REGISTER_METATYPE( WaterSampleData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ REGISTER_METATYPE( TreatmentLogAlarmData ) \ @@ -624,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 ) \ @@ -871,6 +873,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 ) \ @@ -1252,6 +1255,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 ) \