Index: sources/model/MModel.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -re125bd5cf13750eaf241d518b9c846139afaa81c --- sources/model/MModel.h (.../MModel.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/model/MModel.h (.../MModel.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) @@ -24,10 +24,14 @@ #include "MAlarmCleared.h" #include "MAlarmClearedCondition.h" +// States Messages #include "MHDOperationModeData.h" #include "MPreTreatmentStatesData.h" #include "MTreatmentStatesData.h" +#include "MPostTreatmentStatesData.h" +#include "MDisinfectStatesData.h" +// HD Data Messages #include "MTreatmentTimeData.h" #include "MTreatmentFlowsData.h" #include "MTreatmentOutletFlowData.h" @@ -40,6 +44,18 @@ #include "MTreatmentBloodPrimeData.h" #include "MHDAccelerometerData.h" +// Debugging Messages +#include "MHDDebugText.h" +#include "MDGDebugText.h" + +// Settings +#include "MAdjustHDRequests.h" +#include "MAdjustDGRequests.h" +#include "MAdjustHDVersionsResponse.h" +#include "MAdjustDGVersionsResponse.h" +#include "MAdjustHDDateTimeResponse.h" +#include "MAdjustDGDateTimeResponse.h" + // DG Data Messages #include "MDGDrainPumpData.h" #include "MDGHeatersData.h" @@ -67,9 +83,6 @@ #include "MPreTreatmentAdjustPatientConnectionConfirmResponse.h" #include "MPreTreatmentAdjustStartTreatmentResponse.h" -// Debugging Messages -#include "MHDDebugText.h" -#include "MDGDebugText.h" // Treatment #include "MTreatmentAdjustRequests.h" #include "MTreatmentAdjustDurationResponse.h" @@ -83,10 +96,20 @@ #include "MTreatmentAdjustRecirculateResponse.h" #include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" -#include "MAdjustHDVersionsResponse.h" -#include "MAdjustDGVersionsResponse.h" +// Post-Treatment +#include "MPostTreatmentAdjustRequests.h" +#include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h" +#include "MPostTreatmentAdjustTreatmentLogResponse.h" +// Disinfection +#include "MDisinfectAdjustRequests.h" +#include "MDisinfectAdjustResponse.h" +#include "MDisinfectAdjustChemicalConfirmResponse.h" +#include "MDisinfectDGFlushTimeData.h" +#include "MDisinfectDGHeatTimeData.h" +#include "MDisinfectDGChemicalTimeData.h" + /*! * \page MessageFlow Message interpretation Flow * \dot @@ -140,7 +163,7 @@ * * 02 - MessageGlobals.h : add len * \code{.cpp} - * {Gui::GuiActionType::ID_HDOperationModeData , 1 * 4 }, // 1 parameter each 4bytes + * {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes * \endcode * * 03 - Implement the model by copy/paste of the closest model, fit to your need. @@ -211,6 +234,8 @@ REGISTER_METATYPE( HDOperationModeData ) \ REGISTER_METATYPE( PreTreatmentStatesData ) \ REGISTER_METATYPE( TreatmentStatesData ) \ + REGISTER_METATYPE( PostTreatmentStatesData ) \ + REGISTER_METATYPE( DisinfectStatesData ) \ REGISTER_METATYPE( BloodFlowData ) \ REGISTER_METATYPE( DialysateFlowData ) \ REGISTER_METATYPE( OutletFlowData ) \ @@ -249,8 +274,16 @@ REGISTER_METATYPE( PreTreatmentSelfTestNoCartridgeData ) \ REGISTER_METATYPE( PreTreatmentSelfTestDryData ) \ REGISTER_METATYPE( PreTreatmentDisposablesPrimeData ) \ + /* Disinfection */ \ + REGISTER_METATYPE( DisinfectDGFlushTimeData ) \ + REGISTER_METATYPE( DisinfectDGHeatTimeData ) \ + REGISTER_METATYPE( DisinfectDGChemicalTimeData ) \ \ /* Request */ \ + /* Post-Treatment */ \ + REGISTER_METATYPE( AdjustPatientDisconnectionConfirmRequestData ) \ + REGISTER_METATYPE( AdjustDisposablesRemovalConfirmRequestData ) \ + REGISTER_METATYPE( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentRequestData ) \ REGISTER_METATYPE( AdjustParametersValidationRequestData ) \ @@ -264,6 +297,9 @@ REGISTER_METATYPE( AdjustUltrafiltrationInitRequestData ) \ REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ + /* Disinfection */ \ + REGISTER_METATYPE( AdjustDisinfectRequestData ) \ + REGISTER_METATYPE( AdjustChemicalConfirmRequestData ) \ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ @@ -282,8 +318,13 @@ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ + REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ \ /* Response */ \ + /* Post-Treatment */ \ + REGISTER_METATYPE( AdjustDisposablesRemovalConfirmResponseData ) \ + REGISTER_METATYPE( AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ REGISTER_METATYPE( AdjustParametersValidationResponseData ) \ @@ -293,6 +334,9 @@ REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ REGISTER_METATYPE( AdjustPatientConnectionConfirmResponseData ) \ REGISTER_METATYPE( AdjustStartTreatmentResponseData ) \ + /* Disinfect */ \ + REGISTER_METATYPE( AdjustDisinfectResponseData ) \ + REGISTER_METATYPE( AdjustChemicalConfirmResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ @@ -307,7 +351,10 @@ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustHDVersionsResponseData ) \ REGISTER_METATYPE( AdjustDGVersionsResponseData ) \ + REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ + //===============================================================================// /*! \def ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS @@ -328,6 +375,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStatesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PostTreatmentStatesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DialysateFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, OutletFlowData ) \ @@ -366,7 +415,14 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentDisposablesPrimeData ) \ + /* Disinfection */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectDGFlushTimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectDGHeatTimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DisinfectDGChemicalTimeData ) \ /* Response */ \ + /* Post-Treatment */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesRemovalConfirmResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationResponseData ) \ @@ -376,6 +432,9 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentResponseData ) \ + /* Disinfect */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustChemicalConfirmResponseData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ @@ -390,6 +449,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -407,6 +468,12 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ + /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesRemovalConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationRequestData ) \ @@ -419,6 +486,9 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ + /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustChemicalConfirmRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ @@ -449,6 +519,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( HDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStatesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( PostTreatmentStatesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DialysateFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( OutletFlowData ) \ @@ -487,7 +559,14 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentDisposablesPrimeData ) \ + /* Disinfection */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectDGFlushTimeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectDGHeatTimeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DisinfectDGChemicalTimeData ) \ /* Response */ \ + /* Post-Treatment */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustParametersValidationResponseData ) \ @@ -497,6 +576,9 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustStartTreatmentResponseData ) \ + /* Disinfect */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustChemicalConfirmResponseData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ @@ -511,9 +593,15 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ + /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustParametersValidationRequestData ) \ @@ -527,6 +615,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ + /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustChemicalConfirmRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ @@ -540,6 +631,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ @@ -549,6 +642,10 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ + /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesRemovalConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustParametersValidationRequestData ) \ @@ -562,6 +659,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ + /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustChemicalConfirmRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ @@ -575,6 +675,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ @@ -584,6 +686,10 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ + /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesRemovalConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentLogRequestData ) \ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustParametersValidationRequestData ) \ @@ -597,6 +703,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ + /* Disinfection */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustChemicalConfirmRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ @@ -610,6 +719,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ @@ -625,6 +736,8 @@ ACTION_RECEIVE_SIGNAL( HDOperationModeData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentStatesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStatesData ) \ + ACTION_RECEIVE_SIGNAL( PostTreatmentStatesData ) \ + ACTION_RECEIVE_SIGNAL( DisinfectStatesData ) \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ ACTION_RECEIVE_SIGNAL( DialysateFlowData ) \ ACTION_RECEIVE_SIGNAL( OutletFlowData ) \ @@ -661,7 +774,14 @@ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestDryData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentDisposablesPrimeData ) \ + /* Disinfection */ \ + ACTION_RECEIVE_SIGNAL( DisinfectDGFlushTimeData ) \ + ACTION_RECEIVE_SIGNAL( DisinfectDGHeatTimeData ) \ + ACTION_RECEIVE_SIGNAL( DisinfectDGChemicalTimeData ) \ /* Response */ \ + /* Post-Treatment */ \ + ACTION_RECEIVE_SIGNAL( AdjustDisposablesRemovalConfirmResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_SIGNAL( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustParametersValidationResponseData ) \ @@ -671,6 +791,9 @@ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustStartTreatmentResponseData ) \ + /* Disinfect */ \ + ACTION_RECEIVE_SIGNAL( AdjustDisinfectResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustChemicalConfirmResponseData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ @@ -685,6 +808,8 @@ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGVersionsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//