Index: sources/model/MModel.h =================================================================== diff -u -r4b7b6f9506d7c7ad4f611b8c417ed37d5f9a48ac -r6be40239ce52d641692de158a044af0a54cde1e8 --- sources/model/MModel.h (.../MModel.h) (revision 4b7b6f9506d7c7ad4f611b8c417ed37d5f9a48ac) +++ sources/model/MModel.h (.../MModel.h) (revision 6be40239ce52d641692de158a044af0a54cde1e8) @@ -64,6 +64,7 @@ #include "MHDBloodLeakData.h" #include "MHDAirBubbleData.h" #include "MHDRTCEpochData.h" +#include "MHDUsageInfoResponse.h" // Debugging Messages #include "MHDDebugText.h" @@ -326,6 +327,8 @@ REGISTER_METATYPE( HDBloodLeakData ) \ REGISTER_METATYPE( HDAirTrapData ) \ REGISTER_METATYPE( HDAirBubbleData ) \ + REGISTER_METATYPE( HDUsageInfoResponseData ) \ + REGISTER_METATYPE( HDUsageInfoRequestData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ REGISTER_METATYPE( TreatmentLogAlarmData ) \ @@ -584,8 +587,9 @@ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ + /* Settings - HD Data Response */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoResponseData ) \ - // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ @@ -640,6 +644,9 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListRequestData ) \ + /* Settings - HD Info */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoRequestData ) \ + /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionRequestData ) \ disabled coco end */ \ @@ -775,6 +782,8 @@ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ + /* Settings - HD Data Response */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDUsageInfoResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ @@ -831,6 +840,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmActiveListRequestData ) \ + /* Settings - HD Info */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( HDUsageInfoRequestData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmClearedConditionRequestData ) \ disabled coco end */ \ @@ -889,6 +900,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmActiveListRequestData ) \ + /* Settings - HD Info */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( HDUsageInfoRequestData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmClearedConditionRequestData ) \ disabled coco end */ \ @@ -947,6 +960,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmActiveListRequestData ) \ + /* Settings - HD Info */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( HDUsageInfoRequestData ) \ /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmClearedConditionRequestData ) \ disabled coco end */ \ @@ -1065,7 +1080,10 @@ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ + /* Settings - HD data response */ \ + ACTION_RECEIVE_SIGNAL( HDUsageInfoResponseData ) \ + //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//