Index: sources/model/MModel.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 --- sources/model/MModel.h (.../MModel.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/MModel.h (.../MModel.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) @@ -26,7 +26,6 @@ #include "MAlarmStatusData.h" #include "MAlarmTriggered.h" #include "MAlarmCleared.h" -#include "MAlarmClearedCondition.h" #include "MAlarmActiveList.h" #include "MAdjustHDAlarmVolumeResponse.h" @@ -339,9 +338,6 @@ REGISTER_METATYPE( AlarmStatusData ) \ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - REGISTER_METATYPE( AlarmClearedConditionData ) \ - disabled coco end */ \ REGISTER_METATYPE( DGROPumpData ) \ REGISTER_METATYPE( DGPressuresData ) \ REGISTER_METATYPE( DGDrainPumpData ) \ @@ -392,9 +388,6 @@ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ REGISTER_METATYPE( AlarmActiveListRequestData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - REGISTER_METATYPE( AlarmClearedConditionRequestData ) \ - disabled coco end*/ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ @@ -524,9 +517,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionData ) \ - disabled coco end */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ @@ -657,10 +647,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDResetInSrvcRequestData ) \ - /* 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 */ \ - //===============================================================================// /*! \def ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS @@ -724,9 +710,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedConditionData ) \ - disabled coco end */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ @@ -856,9 +839,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDResetInSrvcRequestData ) \ - /* 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 */ \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ @@ -920,10 +900,6 @@ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDResetInSrvcRequestData ) \ - /* 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 */ \ - #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ /* CONFIRM */ \ @@ -983,9 +959,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDResetInSrvcRequestData ) \ - /* 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 */ \ //== MessageInterpreter Signal Definition =======================================// #define ACTION_RECEIVE_SIGNALS \ @@ -1030,7 +1003,6 @@ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ ACTION_RECEIVE_SIGNAL( AlarmClearedData ) \ - ACTION_RECEIVE_SIGNAL( AlarmClearedConditionData ) \ /* Treatment Log */ \ ACTION_RECEIVE_SIGNAL( TreatmentLogAvrgeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentLogAlarmData ) \