Index: sources/model/MModel.h =================================================================== diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- sources/model/MModel.h (.../MModel.h) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) +++ sources/model/MModel.h (.../MModel.h) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -16,22 +16,69 @@ #include "main.h" +// device +#include "DeviceModels.h" +#include "MBluetooth.h" + // models -#include "MPowerOff.h" +#include "MSettings.h" +#include "MAdjustPowerOff.h" #include "MAlarmStatusData.h" #include "MAlarmTriggered.h" #include "MAlarmCleared.h" #include "MAlarmClearedCondition.h" +#include "MAlarmActiveList.h" +#include "MAdjustHDAlarmVolumeResponse.h" +// POST +#include "MHDPostSingleResultData.h" +#include "MHDPostFinalResultData.h" +#include "MDGPostSingleResultData.h" +#include "MDGPostFinalResultData.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 "MTreatmentBloodFlowData.h" +#include "MTreatmentDialysateFlowData.h" #include "MTreatmentOutletFlowData.h" #include "MTreatmentPressureOcclusionData.h" #include "MTreatmentRangesData.h" -#include "MTreatmentStatesData.h" #include "MTreatmentSalineData.h" #include "MTreatmentHeparinData.h" +#include "MTreatmentRinsebackData.h" +#include "MTreatmentRecirculateData.h" +#include "MTreatmentBloodPrimeData.h" +#include "MTreatmentStopData.h" +#include "MHDAccelerometerData.h" +#include "MHDSyringePumpData.h" +// Debugging Messages +#include "MHDDebugText.h" +#include "MDGDebugText.h" +#include "MHDGeneralEvent.h" +#include "MDGGeneralEvent.h" + +// Settings +#include "MAdjustHDRequests.h" +#include "MAdjustDGRequests.h" +#include "MAdjustHDVersionsRequest.h" +#include "MAdjustHDVersionsResponse.h" +#include "MAdjustDGVersionsResponse.h" +#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustDGSerialNumberResponse.h" +#include "MAdjustHDServiceResponse.h" +#include "MAdjustDGServiceResponse.h" +#include "MAdjustHDDateTimeResponse.h" +#include "MAdjustDGDateTimeResponse.h" + +// DG Data Messages #include "MDGDrainPumpData.h" #include "MDGHeatersData.h" #include "MDGLoadCellReadingsData.h" @@ -41,27 +88,54 @@ #include "MDGROPumpData.h" #include "MDGTemperaturesData.h" #include "MDGValvesStatesData.h" +#include "MDGAccelerometerData.h" -#include "MTreatmentParametersResp.h" +// Pre-Treatment +#include "MPreTreatmentAdjustRequests.h" +#include "MPreTreatmentAdjustInitTreatmentResponse.h" +#include "MPreTreatmentAdjustParametersValidationResponse.h" +#include "MDGFilterFlushData.h" // DG message but part of the Pre-Treatment messaging flow +#include "MPreTreatmentAdjustWaterSampleResponse.h" +#include "MPreTreatmentSelfTestNoCartridgeData.h" +#include "MPreTreatmentSelfTestDryData.h" +#include "MPreTreatmentAdjustDisposablesPrimeResponse.h" +#include "MPreTreatmentDisposablesPrimeData.h" +#include "MPreTreatmentAdjustPatientConnectionBeginResponse.h" +#include "MPreTreatmentAdjustUltrafiltrationInitResponse.h" +#include "MPreTreatmentAdjustPatientConnectionConfirmResponse.h" +#include "MPreTreatmentAdjustStartTreatmentResponse.h" -#include "MHDDebugText.h" -#include "MDGDebugText.h" - -#include "MHDOperationModeData.h" +// Treatment #include "MTreatmentAdjustRequests.h" #include "MTreatmentAdjustDurationResponse.h" #include "MTreatmentAdjustBloodDialysateResponse.h" -#include "MTreatmentAdjustUltrafiltrationInitResponse.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "MTreatmentAdjustSalineResponse.h" #include "MTreatmentAdjustHeparinResponse.h" +#include "MTreatmentAdjustRinsebackResponse.h" +#include "MTreatmentAdjustRecirculateResponse.h" +#include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" -#include "MPrimingData.h" -#include "MStartTreatmentResponse.h" -#include "MEndTreatmentResponse.h" +// Post-Treatment +#include "MPostTreatmentAdjustRequests.h" +#include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h" +// Treatment Log +#include "MPostTreatmentAdjustTreatmentLogResponse.h" +#include "MTreatmentLogAvrgeData.h" +#include "MTreatmentLogAlarmData.h" +#include "MTreatmentLogEventData.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 @@ -115,7 +189,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. @@ -181,19 +255,49 @@ \details Registers the models in the Qt MetaType so it can be used in signal/slots between threads. */ #define REGISTER_MODEL_METATYPES \ - \ + /* POST */ \ + REGISTER_METATYPE( HDPostSingleResultData ) \ + REGISTER_METATYPE( HDPostFinalResultData ) \ + REGISTER_METATYPE( DGPostSingleResultData ) \ + REGISTER_METATYPE( DGPostFinalResultData ) \ + REGISTER_METATYPE( AdjustUIPostFinalResultRequestData ) \ + /* Devices */ \ + REGISTER_METATYPE( DeviceBrightnessRequestData ) \ + REGISTER_METATYPE( DeviceBrightnessResponseData ) \ + REGISTER_METATYPE( UIBloodPressureData ) \ + REGISTER_METATYPE( DeviceBluetoothPairedResetRequestData ) \ + REGISTER_METATYPE( DeviceBluetoothPairedResetResponseData ) \ + /* Settings */ \ + REGISTER_METATYPE( SettingsData ) \ + REGISTER_METATYPE( WifiNetworkData ) \ + REGISTER_METATYPE( BluetoothData ) \ + REGISTER_METATYPE( BluetoothDeviceData ) \ + /* Data */ \ + REGISTER_METATYPE( HDOperationModeData ) \ + REGISTER_METATYPE( PreTreatmentStatesData ) \ + REGISTER_METATYPE( TreatmentStatesData ) \ + REGISTER_METATYPE( PostTreatmentStatesData ) \ + REGISTER_METATYPE( DisinfectStatesData ) \ REGISTER_METATYPE( BloodFlowData ) \ REGISTER_METATYPE( DialysateFlowData ) \ REGISTER_METATYPE( OutletFlowData ) \ REGISTER_METATYPE( TreatmentTimeData ) \ REGISTER_METATYPE( PressureOcclusionData ) \ REGISTER_METATYPE( PowerOffData ) \ REGISTER_METATYPE( TreatmentRangesData ) \ - REGISTER_METATYPE( TreatmentStatesData ) \ REGISTER_METATYPE( TreatmentSalineData ) \ REGISTER_METATYPE( TreatmentHeparinData ) \ - REGISTER_METATYPE( HDOperationModeData ) \ - \ + REGISTER_METATYPE( TreatmentRinsebackData ) \ + REGISTER_METATYPE( TreatmentRecirculateData ) \ + REGISTER_METATYPE( TreatmentBloodPrimeData ) \ + REGISTER_METATYPE( TreatmentStopData ) \ + REGISTER_METATYPE( HDSyringePumpData ) \ + REGISTER_METATYPE( HDAccelerometerData ) \ + /* Treatment Log */ \ + REGISTER_METATYPE( TreatmentLogAvrgeData ) \ + REGISTER_METATYPE( TreatmentLogAlarmData ) \ + REGISTER_METATYPE( TreatmentLogEventData ) \ + /* Alarms */ \ REGISTER_METATYPE( AlarmStatusData ) \ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ @@ -209,46 +313,112 @@ REGISTER_METATYPE( DGHeatersData ) \ REGISTER_METATYPE( DGLoadCellReadingsData ) \ REGISTER_METATYPE( DGTemperaturesData ) \ + REGISTER_METATYPE( DGAccelerometerData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ - REGISTER_METATYPE( PrimingData ) \ + REGISTER_METATYPE( HDGeneralEventData ) \ + REGISTER_METATYPE( DGGeneralEventData ) \ + /* Pre-Treatment */ \ + REGISTER_METATYPE( DGFilterFlushData ) \ + REGISTER_METATYPE( PreTreatmentSelfTestNoCartridgeData ) \ + REGISTER_METATYPE( PreTreatmentSelfTestDryData ) \ + REGISTER_METATYPE( PreTreatmentDisposablesPrimeData ) \ + /* Disinfection */ \ + REGISTER_METATYPE( DisinfectDGFlushTimeData ) \ + REGISTER_METATYPE( DisinfectDGHeatTimeData ) \ + REGISTER_METATYPE( DisinfectDGChemicalTimeData ) \ \ /* Request */ \ - REGISTER_METATYPE( StartTreatmentRequestData ) \ - REGISTER_METATYPE( ConfirmTreatmentRequestData ) \ - REGISTER_METATYPE( EndTreatmentRequestData ) \ + /* Post-Treatment */ \ + REGISTER_METATYPE( AdjustPatientDisconnectionConfirmRequestData ) \ + REGISTER_METATYPE( AdjustDisposablesRemovalConfirmRequestData ) \ + REGISTER_METATYPE( AdjustTreatmentLogRequestData ) \ + /* Pre-Treatment */ \ + REGISTER_METATYPE( AdjustInitTreatmentRequestData ) \ + REGISTER_METATYPE( AdjustParametersValidationRequestData ) \ + REGISTER_METATYPE( AdjustParametersConfirmRequestData ) \ + REGISTER_METATYPE( AdjustWaterSampleRequestData ) \ + REGISTER_METATYPE( AdjustWaterSampleResultRequestData ) \ + REGISTER_METATYPE( AdjustConsumablesConfirmRequestData ) \ + REGISTER_METATYPE( AdjustDisposablesConfirmRequestData ) \ + REGISTER_METATYPE( AdjustDisposablesPrimeRequestData ) \ + REGISTER_METATYPE( AdjustPatientConnectionBeginRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitRequestData ) \ + REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ + REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ + /* Disinfection */ \ + REGISTER_METATYPE( AdjustDisinfectRequestData ) \ + REGISTER_METATYPE( AdjustChemicalConfirmRequestData ) \ \ + /* Alarms */ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ + REGISTER_METATYPE( AlarmActiveListRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. REGISTER_METATYPE( AlarmClearedConditionRequestData ) \ coco end*/ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationInitRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ REGISTER_METATYPE( AdjustHeparinRequestData ) \ + REGISTER_METATYPE( AdjustRinsebackRequestData ) \ + REGISTER_METATYPE( AdjustRecirculateRequestData ) \ + REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ - REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ + REGISTER_METATYPE( AdjustVersionsResponseData ) \ + REGISTER_METATYPE( AdjustVersionsRequestData ) \ + REGISTER_METATYPE( AdjustServiceRequestData ) \ + REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ + \ /* Response */ \ - REGISTER_METATYPE( StartTreatmentResponseData ) \ - REGISTER_METATYPE( EndTreatmentResponseData ) \ + /* Post-Treatment */ \ + REGISTER_METATYPE( AdjustDisposablesRemovalConfirmResponseData ) \ + REGISTER_METATYPE( AdjustTreatmentLogResponseData ) \ + /* Pre-Treatment */ \ + REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ + REGISTER_METATYPE( AdjustParametersValidationResponseData ) \ + REGISTER_METATYPE( AdjustWaterSampleResponseData ) \ + REGISTER_METATYPE( AdjustDisposablesPrimeResponseData ) \ + REGISTER_METATYPE( AdjustPatientConnectionBeginResponseData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ + REGISTER_METATYPE( AdjustPatientConnectionConfirmResponseData ) \ + REGISTER_METATYPE( AdjustStartTreatmentResponseData ) \ + /* Disinfect */ \ + REGISTER_METATYPE( AdjustDisinfectResponseData ) \ + REGISTER_METATYPE( AdjustChemicalConfirmResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ + REGISTER_METATYPE( AdjustRinsebackResponseData ) \ + REGISTER_METATYPE( AdjustRecirculateResponseData ) \ + REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ - REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) \ + REGISTER_METATYPE( AdjustVersionsHDRequestData ) \ + REGISTER_METATYPE( AdjustVersionsHDResponseData ) \ + REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \ + REGISTER_METATYPE( AdjustServiceHDResponseData ) \ + REGISTER_METATYPE( AdjustServiceDGResponseData ) \ + REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ + /* Alarms - Active List Response */ \ + REGISTER_METATYPE( AlarmActiveListResponseData ) \ + REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ + + //===============================================================================// /*! \def ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS @@ -265,18 +435,38 @@ */ #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ \ + /* POST */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostFinalResultData ) \ + /* */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, SettingsData ) \ + 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 ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentTimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PressureOcclusionData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ - \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ + /* Treatment Log */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogEventData ) \ + /* Alarms */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ @@ -292,43 +482,109 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGHeatersData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGAccelerometerData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PrimingData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDGeneralEventData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGGeneralEventData ) \ + /* Pre-Treatment */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGFilterFlushData ) \ + 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 ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginResponseData ) \ + 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 ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, EndTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDRequestData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ + /* Alarms - Active List Response */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ + // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUIPostFinalResultRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersRequestData ) \ - \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ + /* 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 ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResultRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustConsumablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginRequestData ) \ + 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 ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListRequestData ) \ /* 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 ) \ coco end */ \ @@ -351,19 +607,38 @@ This macro should be used with its counterpart macro \ref ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS */ #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ + /* POST */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostFinalResultData ) \ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( SettingsData ) \ + 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 ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentTimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PressureOcclusionData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( HDOperationModeData ) \ - \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ + /* Treatment Log */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogEventData ) \ + /* Alarms */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ @@ -379,110 +654,253 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGHeatersData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGLoadCellReadingsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGTemperaturesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGAccelerometerData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( PrimingData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDGeneralEventData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGGeneralEventData ) \ + /* Pre-Treatment */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGFilterFlushData ) \ + 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 ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesPrimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionBeginResponseData ) \ + 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 ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( EndTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentParametersResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDRequestData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ + /* Alarms - Active List Response */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ + #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ + /* 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 ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustParametersConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleResultRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustConsumablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesPrimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionBeginRequestData ) \ + 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 ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( EndTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHeparinRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRinsebackRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentParametersRequestData ) \ - \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ + /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmActiveListRequestData ) \ /* 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 ) \ coco end */ \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ + /* 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 ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustParametersConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleResultRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustConsumablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesPrimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionBeginRequestData ) \ + 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 ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( EndTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHeparinRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRinsebackRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentParametersRequestData ) \ - \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ + /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmActiveListRequestData ) \ /* 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 ) \ coco end */ \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ + /* 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 ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustParametersConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleResultRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustConsumablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesPrimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionBeginRequestData ) \ + 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 ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHeparinRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( EndTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ - \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRinsebackRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsResponseData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ + /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmActiveListRequestData ) \ /* 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 ) \ coco end */ \ //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ + /* POST */ \ + ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ + ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \ + ACTION_RECEIVE_SIGNAL( DGPostSingleResultData ) \ + ACTION_RECEIVE_SIGNAL( DGPostFinalResultData ) \ /* Received signals */ \ /* NO RESPONSE message model here */ \ + ACTION_RECEIVE_SIGNAL( SettingsData ) \ + 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 ) \ ACTION_RECEIVE_SIGNAL( TreatmentTimeData ) \ ACTION_RECEIVE_SIGNAL( PressureOcclusionData ) \ ACTION_RECEIVE_SIGNAL( PowerOffData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ - ACTION_RECEIVE_SIGNAL( TreatmentStatesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \ ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \ - ACTION_RECEIVE_SIGNAL( HDOperationModeData ) \ - \ + ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ + ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ + ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ + /* Alarms */ \ 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 ) \ + ACTION_RECEIVE_SIGNAL( TreatmentLogEventData ) \ + \ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ ACTION_RECEIVE_SIGNAL( DGPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ @@ -492,24 +910,62 @@ ACTION_RECEIVE_SIGNAL( DGHeatersData ) \ ACTION_RECEIVE_SIGNAL( DGLoadCellReadingsData ) \ ACTION_RECEIVE_SIGNAL( DGTemperaturesData ) \ + ACTION_RECEIVE_SIGNAL( DGAccelerometerData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ - ACTION_RECEIVE_SIGNAL( PrimingData ) \ + ACTION_RECEIVE_SIGNAL( HDGeneralEventData ) \ + ACTION_RECEIVE_SIGNAL( DGGeneralEventData ) \ + /* Pre-Treatment */ \ + ACTION_RECEIVE_SIGNAL( DGFilterFlushData ) \ + 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 */ \ - ACTION_RECEIVE_SIGNAL( StartTreatmentResponseData ) \ - ACTION_RECEIVE_SIGNAL( EndTreatmentResponseData ) \ + /* Post-Treatment */ \ + ACTION_RECEIVE_SIGNAL( AdjustDisposablesRemovalConfirmResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTreatmentLogResponseData ) \ + /* Pre-Treatment */ \ + ACTION_RECEIVE_SIGNAL( AdjustInitTreatmentResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustParametersValidationResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDisposablesPrimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionBeginResponseData ) \ + 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 ) \ - ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustTreatmentParametersResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustRinsebackResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsHDRequestData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceHDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustServiceDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ + /* Alarms */ \ + ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ + //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//