Index: sources/model/MModel.h =================================================================== diff -u -r70986eda0c1b55e62935f500014d0aa72f7262fe -r38ae7b93679d05a54fc460dac68891562d7da72d --- sources/model/MModel.h (.../MModel.h) (revision 70986eda0c1b55e62935f500014d0aa72f7262fe) +++ sources/model/MModel.h (.../MModel.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MModel.h - * \author (last) Behrouz NematiPour - * \date (last) 04-Oct-2022 + * \author (last) Dara Navaei + * \date (last) 06-May-2024 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * @@ -63,6 +63,8 @@ #include "MHDAirTrapData.h" #include "MHDBloodLeakData.h" #include "MHDAirBubbleData.h" +#include "MHDRTCEpochData.h" +#include "MHDUsageInfoResponse.h" // Debugging Messages #include "MHDDebugText.h" @@ -84,6 +86,7 @@ #include "MAdjustHDDateTimeResponse.h" #include "MAdjustDGDateTimeResponse.h" #include "MDuetRoWaterDG.h" +#include "MAdjustHDInstitutionalRecordResponse.h" // DG Data Messages #include "MDGDrainPumpData.h" @@ -130,6 +133,7 @@ // Post-Treatment #include "MPostTreatmentAdjustRequests.h" +#include "MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h" #include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h" // Treatment Log #include "MPostTreatmentAdjustTreatmentLogResponse.h" @@ -142,6 +146,7 @@ #include "MDisinfectAdjustStartRequests.h" #include "MDisinfectAdjustModeResponse.h" #include "MDisinfectAdjustStartResponse.h" +#include "MAdjustDGCleaningUsageResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -276,6 +281,7 @@ REGISTER_METATYPE( DGPostFinalResultData ) \ REGISTER_METATYPE( AdjustUIPostFinalResultRequestData ) \ REGISTER_METATYPE( UIPostFinalResultHDRequestData ) \ + REGISTER_METATYPE( HDRTCEpochData ) \ /* Devices */ \ REGISTER_METATYPE( DeviceBrightnessRequestData ) \ REGISTER_METATYPE( DeviceBrightnessResponseData ) \ @@ -284,6 +290,16 @@ REGISTER_METATYPE( DeviceBluetoothPairedResetResponseData ) \ REGISTER_METATYPE( DeviceBluetoothPairedQueryRequestData ) \ REGISTER_METATYPE( DeviceBluetoothPairedQueryResponseData ) \ + REGISTER_METATYPE( DeviceCryptSetupRequestData ) \ + REGISTER_METATYPE( DeviceCryptSetupResponseData ) \ + REGISTER_METATYPE( DeviceRootSSHAccessRequestData ) \ + REGISTER_METATYPE( DeviceRootSSHAccessResponseData ) \ + REGISTER_METATYPE( DeviceFactoryResetRequestData ) \ + REGISTER_METATYPE( DeviceFactoryResetResponseData ) \ + REGISTER_METATYPE( DeviceDecommissionRequestData ) \ + REGISTER_METATYPE( DeviceDecommissionResponseData ) \ + REGISTER_METATYPE( DeviceUSBMountRequestData ) \ + REGISTER_METATYPE( DeviceUSBMountResponseData ) \ /* Settings */ \ REGISTER_METATYPE( SettingsData ) \ REGISTER_METATYPE( WifiNetworkData ) \ @@ -312,6 +328,8 @@ REGISTER_METATYPE( HDBloodLeakData ) \ REGISTER_METATYPE( HDAirTrapData ) \ REGISTER_METATYPE( HDAirBubbleData ) \ + REGISTER_METATYPE( HDUsageInfoResponseData ) \ + REGISTER_METATYPE( HDUsageInfoRequestData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ REGISTER_METATYPE( TreatmentLogAlarmData ) \ @@ -346,6 +364,7 @@ REGISTER_METATYPE( PreTreatmentDisposablesPrimeData ) \ /* Request */ \ /* Post-Treatment */ \ + REGISTER_METATYPE( AdjustPatientDisconnectionNotifyRequestData ) \ REGISTER_METATYPE( AdjustPatientDisconnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustDisposablesRemovalConfirmRequestData ) \ REGISTER_METATYPE( AdjustTreatmentLogRequestData ) \ @@ -365,6 +384,8 @@ /* Disinfection */ \ REGISTER_METATYPE( AdjustDisinfectModeRequestData ) \ REGISTER_METATYPE( AdjustDisinfectStartRequestData ) \ + /* DGCleaningUsage */ \ + REGISTER_METATYPE( AdjustDGCleaningUsageRequestData ) \ \ /* Alarms */ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ @@ -394,6 +415,7 @@ \ /* Response */ \ /* Post-Treatment */ \ + REGISTER_METATYPE( AdjustPatientDisconnectionConfirmResponseData ) \ REGISTER_METATYPE( AdjustDisposablesRemovalConfirmResponseData ) \ REGISTER_METATYPE( AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ @@ -409,6 +431,7 @@ /* Disinfect */ \ REGISTER_METATYPE( AdjustDisinfectModeResponseData ) \ REGISTER_METATYPE( AdjustDisinfectStartResponseData ) \ + REGISTER_METATYPE( AdjustDGCleaningUsageResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ @@ -434,9 +457,12 @@ /* Alarms - Active List Response */ \ REGISTER_METATYPE( AlarmActiveListResponseData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ + REGISTER_METATYPE( AdjustInstitutionalRequestData ) \ + REGISTER_METATYPE( AdjustInstitutionalRecordResponseData ) \ + /* HD reset in service mode */ \ + REGISTER_METATYPE( AdjustHDResetInSrvcRequestData ) \ - //===============================================================================// /*! \def ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS @@ -464,6 +490,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostFinalResultData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, UIPostFinalResultHDRequestData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDRTCEpochData ) \ /* */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, SettingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ @@ -522,6 +549,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentDisposablesPrimeData ) \ /* Response */ \ /* Post-Treatment */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesRemovalConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ @@ -537,6 +565,7 @@ /* Disinfect */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGCleaningUsageResponseData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ @@ -562,8 +591,10 @@ /* 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 ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRecordResponseData ) \ - // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ @@ -593,6 +624,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentLogRequestData ) \ @@ -611,10 +643,19 @@ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartRequestData ) \ + /* DG Cleaning Usage */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGCleaningUsageRequestData ) \ /* Alarms */ \ 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 ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRequestData ) \ + /* HD reset in service mode */ \ + 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 */ \ @@ -647,6 +688,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostSingleResultData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostFinalResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDRTCEpochData ) \ /* The slot implementation is different in Dispatcher, App, Gui, so only signal is here. */ \ ACTION_RECEIVE_SIGNAL ( UIPostFinalResultHDRequestData ) \ \ @@ -707,6 +749,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentDisposablesPrimeData ) \ /* Response */ \ /* Post-Treatment */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientDisconnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ @@ -722,6 +765,7 @@ /* Disinfect */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectStartResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGCleaningUsageResponseData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ @@ -747,6 +791,9 @@ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ + /* Settings - HD Data Response */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDUsageInfoResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInstitutionalRecordResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ @@ -758,6 +805,7 @@ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentLogRequestData ) \ @@ -777,6 +825,8 @@ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectStartRequestData ) \ + /* DG Cleaning Usage */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGCleaningUsageRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ @@ -800,6 +850,11 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmActiveListRequestData ) \ + /* Settings - HD Info */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( HDUsageInfoRequestData ) \ + 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 */ \ @@ -813,6 +868,7 @@ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentLogRequestData ) \ @@ -832,6 +888,8 @@ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectStartRequestData ) \ + /* DG Cleaning Usage */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGCleaningUsageRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ @@ -855,6 +913,12 @@ 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 ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustInstitutionalRequestData ) \ + /* 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 */ \ @@ -868,6 +932,7 @@ /* POST */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionNotifyRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesRemovalConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentLogRequestData ) \ @@ -887,6 +952,8 @@ /* Disinfection */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectStartRequestData ) \ + /* DG Cleaning Usage */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGCleaningUsageRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ @@ -910,6 +977,11 @@ 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 ) \ + 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 */ \ @@ -927,6 +999,7 @@ ACTION_RECEIVE_SIGNAL( DGPostSingleResultData ) \ ACTION_RECEIVE_SIGNAL( DGPostFinalResultData ) \ ACTION_RECEIVE_SIGNAL( UIPostFinalResultHDRequestData ) \ + ACTION_RECEIVE_SIGNAL( HDRTCEpochData ) \ /* Received signals */ \ /* NO RESPONSE message model here */ \ ACTION_RECEIVE_SIGNAL( SettingsData ) \ @@ -985,6 +1058,7 @@ ACTION_RECEIVE_SIGNAL( PreTreatmentDisposablesPrimeData ) \ /* Response */ \ /* Post-Treatment */ \ + ACTION_RECEIVE_SIGNAL( AdjustPatientDisconnectionConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesRemovalConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentLogResponseData ) \ /* Pre-Treatment */ \ @@ -1000,6 +1074,7 @@ /* Disinfect */ \ ACTION_RECEIVE_SIGNAL( AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisinfectStartResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDGCleaningUsageResponseData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ @@ -1025,7 +1100,11 @@ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ + /* Settings - HD data response */ \ + ACTION_RECEIVE_SIGNAL( HDUsageInfoResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustInstitutionalRecordResponseData ) \ + //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//