Index: sources/model/MModel.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r22e9fba5d14ea03731b4e30f6bbde22561921894 --- sources/model/MModel.h (.../MModel.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/model/MModel.h (.../MModel.h) (revision 22e9fba5d14ea03731b4e30f6bbde22561921894) @@ -18,6 +18,7 @@ // device #include "DeviceModels.h" +#include "MBluetooth.h" // models #include "MSettings.h" @@ -29,6 +30,12 @@ #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" @@ -38,7 +45,8 @@ // HD Data Messages #include "MTreatmentTimeData.h" -#include "MTreatmentFlowsData.h" +#include "MTreatmentBloodFlowData.h" +#include "MTreatmentDialysateFlowData.h" #include "MTreatmentOutletFlowData.h" #include "MTreatmentPressureOcclusionData.h" #include "MTreatmentRangesData.h" @@ -47,15 +55,20 @@ #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" @@ -242,12 +255,23 @@ \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 ) \ @@ -266,6 +290,8 @@ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ + REGISTER_METATYPE( TreatmentStopData ) \ + REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ @@ -291,6 +317,8 @@ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ + REGISTER_METATYPE( HDGeneralEventData ) \ + REGISTER_METATYPE( DGGeneralEventData ) \ /* Pre-Treatment */ \ REGISTER_METATYPE( DGFilterFlushData ) \ REGISTER_METATYPE( PreTreatmentSelfTestNoCartridgeData ) \ @@ -341,6 +369,7 @@ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ + REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceRequestData ) \ REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ @@ -375,6 +404,7 @@ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ + REGISTER_METATYPE( AdjustVersionsHDRequestData ) \ REGISTER_METATYPE( AdjustVersionsHDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ @@ -405,6 +435,12 @@ */ #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 ) \ @@ -423,6 +459,8 @@ 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 ) \ @@ -448,6 +486,8 @@ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ + 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 ) \ @@ -485,6 +525,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ @@ -500,6 +541,8 @@ // /* 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 ) \ @@ -513,6 +556,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ @@ -563,6 +607,11 @@ 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 ) \ @@ -582,6 +631,8 @@ 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 ) \ @@ -607,6 +658,8 @@ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDGeneralEventData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGGeneralEventData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGFilterFlushData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestNoCartridgeData ) \ @@ -644,6 +697,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ @@ -659,6 +713,8 @@ #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 ) \ @@ -691,6 +747,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ @@ -706,6 +763,8 @@ #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 ) \ @@ -738,6 +797,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ @@ -753,6 +813,8 @@ #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 ) \ @@ -785,6 +847,7 @@ 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 ) \ @@ -800,6 +863,11 @@ //===============================================================================// #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 ) \ @@ -820,6 +888,8 @@ 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 ) \ @@ -844,6 +914,8 @@ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ + ACTION_RECEIVE_SIGNAL( HDGeneralEventData ) \ + ACTION_RECEIVE_SIGNAL( DGGeneralEventData ) \ /* Pre-Treatment */ \ ACTION_RECEIVE_SIGNAL( DGFilterFlushData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestNoCartridgeData ) \ @@ -881,6 +953,7 @@ 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 ) \