Index: drydemo.pro =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- drydemo.pro (.../drydemo.pro) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ drydemo.pro (.../drydemo.pro) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -111,272 +111,59 @@ sources/main.h \ sources/Threads.h \ sources/MainTimer.h \ - sources/AlarmGenerator.h \ - sources/ApplicationPost.h \ - sources/device/DeviceGlobals.h \ - sources/device/DeviceError.h \ \ # Controllers - sources/ApplicationController.h \ - sources/device/DeviceController.h \ - sources/storage/Settings.h \ - sources/storage/TreatmentLog.h \ - sources/wifi/WifiInterface.h \ - sources/bluetooth/BluetoothInterface.h \ - sources/cloudsync/CloudSyncController.h \ \ # ---------- Models ---------- - sources/model/MModel.h \ sources/model/MAbstract.h \ sources/model/MAbstractDynamic.h \ - sources/device/DeviceModels.h \ \ # ---------- Models - confirm - sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST - sources/model/dg/data/post/MDGPostFinalResultData.h \ - sources/model/dg/data/post/MDGPostSingleResultData.h \ - sources/model/hd/data/post/MHDPostFinalResultData.h \ - sources/model/hd/data/post/MHDPostSingleResultData.h \ - sources/model/hd/data/post/MUIPostFinalResultHDRequest.h \ \ # ---------- Models - settings - sources/model/settings/MSettings.h \ - sources/model/settings/MWifiNetwork.h \ - sources/model/settings/MBluetooth.h \ - sources/model/ui/data/MUIBloodPressureData.h \ - sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ - sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \ - sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm - sources/model/hd/alarm/MAlarmStatusData.h \ - sources/model/hd/alarm/MAlarmTriggered.h \ - sources/model/hd/alarm/MAlarmCleared.h \ - sources/model/hd/alarm/MAlarmClearedCondition.h \ - sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data - sources/model/hd/data/MHDOperationModeData.h \ - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ - sources/model/hd/data/treatment/MTreatmentStatesData.h \ - sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment - sources/model/hd/adjustment/MAdjustRequestsBase.h \ - sources/model/hd/adjustment/MAdjustPowerOff.h \ - sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h \ - sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment - sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Adjustment - End-Treatment - sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h \ \ # ---------- Models - HD - Adjustment - Post-Treatment - sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \ - sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \ - sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \ - sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h \ \ # ---------- Models - HD - Adjustment - Disinfeection - sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h \ - sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h \ - sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h \ - sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h \ \ # ---------- Models - HD - Data - Pre-Treatment - Progress - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \ - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data - sources/model/hd/data/MHDDebugText.h \ - sources/model/hd/data/MHDGeneralEvent.h \ - sources/model/hd/data/MHDAccelerometerData.h \ - sources/model/hd/data/MHDSyringePumpData.h \ - sources/model/hd/data/MHDAirBubbleData.h \ - sources/model/hd/data/MHDAirTrapData.h \ - sources/model/hd/data/MHDBloodLeakData.h \ - sources/model/hd/data/MTreatmentRangesData.h \ - sources/model/hd/data/treatment/MTreatmentTimeData.h \ - sources/model/hd/data/treatment/MTreatmentBloodFlowData.h \ - sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ - sources/model/hd/data/treatment/MTreatmentOutletFlowData.h \ - sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h \ - sources/model/hd/data/treatment/MTreatmentSalineData.h \ - sources/model/hd/data/treatment/MTreatmentHeparinData.h \ - sources/model/hd/data/treatment/MTreatmentRinsebackData.h \ - sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ - sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \ - sources/model/hd/data/treatment/MTreatmentStopData.h \ - sources/model/hd/data/post/MHDRTCEpochData.h \ - sources/model/hd/data/MHDUsageInfoResponse.h \ \ # ---------- Models - HD - Data - Treatment Log - sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h \ - sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \ - sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h \ \ # ---------- Models - DG - Adjustment - sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ - sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \ \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \ - sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress - sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ \ # ---------- Models - DG - Data - Disinfect - Progress \ # ---------- Models - DG - Data - sources/model/dg/data/MDGDebugText.h \ - sources/model/dg/data/MDGGeneralEvent.h \ - sources/model/dg/data/MDGDrainPumpData.h \ - sources/model/dg/data/MDGHeatersData.h \ - sources/model/dg/data/MDGLoadCellReadingsData.h \ - sources/model/dg/data/MDGOperationModeData.h \ - sources/model/dg/data/MDGPressuresData.h \ - sources/model/dg/data/MDGReservoirData.h \ - sources/model/dg/data/MDGROPumpData.h \ - sources/model/dg/data/MDGTemperaturesData.h \ - sources/model/dg/data/MDGValvesStatesData.h \ - sources/model/dg/data/MDGAccelerometerData.h \ - sources/model/dg/data/MDGConductivityData.h \ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ \ # Denali Message - sources/canbus/MessageGlobals.h \ sources/canbus/MessageAcknowModel.h \ sources/canbus/MessageBuilder.h \ sources/canbus/MessageInterpreter.h \ sources/canbus/MessageDispatcher.h \ \ # Gui - sources/gui/GuiGlobals.h \ - sources/gui/GuiView.h \ - sources/gui/GuiController.h \ \ # ---------- Views ---------- - sources/view/VTreatmentCreate.h \ - sources/view/VEventSpy.h \ - sources/view/VView.h \ - sources/view/VGeneralEvent.h \ - sources/device/DeviceView.h \ \ # ---------- Views - CONFIRM - sources/view/confirm/VConfirm.h \ \ # ---------- Views - POST - sources/view/dg/data/post/VDGPOSTData.h \ \ # ---------- Views - Settings - sources/view/settings/VDateTime.h \ - sources/view/settings/VSettings.h \ - sources/view/settings/VBluetooth.h \ - sources/view/settings/VNetworkModel.h \ - sources/view/settings/VAdjustmentVersions.h \ - sources/view/settings/VAdjustmentAlarmVolume.h \ - sources/view/settings/VAdjustmentServiceMode.h \ - sources/view/settings/VAdjustmentServiceDates.h \ - sources/view/settings/VAdjustmentDGCleaningUsage.h \ - sources/view/settings/VDuetRoWaterDG.h \ - sources/view/settings/VCloudSync.h \ - sources/view/settings/VHDUsageInfo.h \ - sources/view/settings/VAdjustmentInstitutionalRecord.h \ \ # ---------- Views - Alarm - sources/view/hd/alarm/VAlarmStatus.h \ - sources/view/hd/alarm/VAlarmActiveList.h \ \ # ---------- Views - HD - Adjustment - sources/view/VAdjustmentResponseBase.h \ \ # ---------- Views - HD - Adjustment - common - sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h \ \ # ---------- Views - HD - Adjustment - Pre-Treatment - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Adjustment - End-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h \ \ # ---------- Views - HD - Adjustment - Post-Treatment - sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \ - sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \ - sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h \ \ # ---------- Views - HD - Adjustment - Disinfection - sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ \ # ---------- Views - HD - Data - States - sources/view/hd/data/VHDOperationModeData.h \ - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ - sources/view/hd/data/treatment/VHDTreatmentStatesData.h \ - sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ \ # ---------- Views - HD - Data - Pre-Treatment - Progress - sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ - sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data - sources/view/hd/data/post/VHDPOSTData.h \ - sources/view/hd/data/VHDAccelerometerData.h \ - sources/view/hd/data/VHDSyringePumpData.h \ - sources/view/hd/data/VHDAirBubbleData.h \ - sources/view/hd/data/VHDAirTrapData.h \ - sources/view/hd/data/VHDBloodLeakData.h \ - sources/view/hd/data/VTreatmentRanges.h \ - sources/view/hd/data/treatment/VTreatmentTime.h \ - sources/view/hd/data/treatment/VTreatmentBloodFlow.h \ - sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ - sources/view/hd/data/treatment/VTreatmentUltrafiltration.h \ - sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h \ - sources/view/hd/data/treatment/VTreatmentSalineData.h \ - sources/view/hd/data/treatment/VTreatmentHeparinData.h \ - sources/view/hd/data/treatment/VTreatmentRinsebackData.h \ - sources/view/hd/data/treatment/VTreatmentRecirculateData.h \ - sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \ - sources/view/hd/data/treatment/VTreatmentStopData.h \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress - sources/view/dg/data/pretreatment/VDGFilterFlushData.h \ \ # ---------- Views - DG - Data - Disinfection - Progress \ # ---------- Views - DG - States \ # ---------- Views - DG - Data - sources/view/dg/data/VDGOperationModeData.h \ - sources/view/dg/data/VDGDrainPumpData.h \ - sources/view/dg/data/VDGHeatersData.h \ - sources/view/dg/data/VDGLoadCellReadingsData.h \ - sources/view/dg/data/VDGPressuresData.h \ - sources/view/dg/data/VDGROPumpData.h \ - sources/view/dg/data/VDGReservoirData.h \ - sources/view/dg/data/VDGTemperaturesData.h \ - sources/view/dg/data/VDGValvesStatesData.h \ - sources/view/dg/data/VDGAccelerometerData.h \ - sources/view/dg/data/VDGConductivityData.h \ \ # Storage - sources/storage/StorageGlobals.h \ - sources/storage/Logger.h \ - sources/storage/FileHandler.h \ \ # Utility sources/utility/crc.h \ sources/utility/format.h \ @@ -390,142 +177,30 @@ main.cpp \ sources/Threads.cpp \ sources/MainTimer.cpp \ - sources/AlarmGenerator.cpp \ - sources/ApplicationPost.cpp \ - sources/device/DeviceError.cpp \ \ # Controllers - sources/ApplicationController.cpp \ - sources/device/DeviceController.cpp \ - sources/model/ui/data/MUIBloodPressureData.cpp \ - sources/storage/Settings.cpp \ - sources/storage/TreatmentLog.cpp \ - sources/view/hd/data/post/VHDPOSTData.cpp \ - sources/wifi/WifiInterface.cpp \ - sources/bluetooth/BluetoothInterface.cpp \ - sources/cloudsync/CloudSyncController.cpp \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ sources/model/MAbstractDynamic.cpp \ - sources/device/DeviceModels.cpp \ \ # ---------- Models - CONFIRM - sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST - sources/model/dg/data/post/MDGPostFinalResultData.cpp \ - sources/model/dg/data/post/MDGPostSingleResultData.cpp \ - sources/model/hd/data/post/MHDPostFinalResultData.cpp \ - sources/model/hd/data/post/MHDPostSingleResultData.cpp \ - sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp \ \ # ---------- Models - settings - sources/model/settings/MSettings.cpp \ - sources/model/settings/MBluetooth.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ - sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \ - sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ \ # ---------- Models - Alarm - sources/model/hd/alarm/MAlarmStatusData.cpp \ - sources/model/hd/alarm/MAlarmMapping.cpp \ - sources/model/hd/alarm/MAlarmTriggered.cpp \ - sources/model/hd/alarm/MAlarmCleared.cpp \ - sources/model/hd/alarm/MAlarmClearedCondition.cpp \ - sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States - sources/model/hd/data/MHDOperationModeData.cpp \ - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ - sources/model/hd/data/treatment/MTreatmentStatesData.cpp \ - sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - HD - Adjustment - sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment - sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Adjustment - End-Treatment - sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \ \ # ---------- Models - HD - Adjustment - Post-Treatment - sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \ - sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \ - sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp \ \ # ---------- Models - HD - Adjustment - Disinfection - sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp \ - sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp \ \ # ---------- Models - HD - Data - sources/model/hd/data/MHDDebugText.cpp \ - sources/model/hd/data/MHDGeneralEvent.cpp \ - sources/model/hd/data/MHDAccelerometerData.cpp \ - sources/model/hd/data/MHDSyringePumpData.cpp \ - sources/model/hd/data/MHDAirBubbleData.cpp \ - sources/model/hd/data/MHDAirTrapData.cpp \ - sources/model/hd/data/MHDBloodLeakData.cpp \ - sources/model/hd/data/MTreatmentRangesData.cpp \ - sources/model/hd/data/treatment/MTreatmentTimeData.cpp \ - sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp \ - sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ - sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp \ - sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp \ - sources/model/hd/data/treatment/MTreatmentSalineData.cpp \ - sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \ - sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \ - sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \ - sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \ - sources/model/hd/data/treatment/MTreatmentStopData.cpp \ - sources/model/hd/data/post/MHDRTCEpochData.cpp \ - sources/model/hd/data/MHDUsageInfoResponse.cpp \ \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ \ # ---------- Models - HD - Data - Treatment Log - sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp \ - sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ - sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \ \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \ - sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \ - sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress - sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \ \ # ---------- Models - DG - Data - Disinfection - Progress \ # ---------- Models - DG - Data - sources/model/dg/data/MDGDebugText.cpp \ - sources/model/dg/data/MDGGeneralEvent.cpp \ - sources/model/dg/data/MDGDrainPumpData.cpp \ - sources/model/dg/data/MDGHeatersData.cpp \ - sources/model/dg/data/MDGLoadCellReadingsData.cpp \ - sources/model/dg/data/MDGOperationModeData.cpp \ - sources/model/dg/data/MDGPressuresData.cpp \ - sources/model/dg/data/MDGReservoirData.cpp \ - sources/model/dg/data/MDGROPumpData.cpp \ - sources/model/dg/data/MDGTemperaturesData.cpp \ - sources/model/dg/data/MDGValvesStatesData.cpp \ - sources/model/dg/data/MDGAccelerometerData.cpp \ - sources/model/dg/data/MDGConductivityData.cpp \ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ @@ -535,117 +210,28 @@ sources/canbus/MessageDispatcher.cpp \ sources/canbus/MessageInterpreter.cpp \ \ # Gui - sources/gui/GuiGlobals.cpp \ - sources/gui/GuiView.cpp \ - sources/gui/GuiController.cpp \ \ # ---------- Views ---------- - sources/view/VTreatmentCreate.cpp \ - sources/view/VEventSpy.cpp \ - sources/view/VGeneralEvent.cpp \ - sources/device/DeviceView.cpp \ \ # ---------- Views - CONFIRM - sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST - sources/view/dg/data/post/VDGPOSTData.cpp \ \ # ---------- Views - Alarm - sources/view/hd/alarm/VAlarmStatus.cpp \ - sources/view/hd/alarm/VAlarmActiveList.cpp \ \ # ---------- Views - Settings - sources/view/settings/VSettings.cpp \ - sources/view/settings/VDateTime.cpp \ - sources/view/settings/VBluetooth.cpp \ - sources/view/settings/VNetworkModel.cpp \ - sources/view/settings/VAdjustmentVersions.cpp \ - sources/view/settings/VAdjustmentAlarmVolume.cpp \ - sources/view/settings/VAdjustmentServiceMode.cpp \ - sources/view/settings/VAdjustmentServiceDates.cpp \ - sources/view/settings/VDuetRoWaterDG.cpp \ - sources/view/settings/VCloudSync.cpp \ - sources/view/settings/VAdjustmentDGCleaningUsage.cpp \ - sources/view/settings/VHDUsageInfo.cpp \ - sources/view/settings/VAdjustmentInstitutionalRecord.cpp \ \ # ---------- Views - HD - Adjustment - sources/view/VAdjustmentResponseBase.cpp \ \ # ---------- Views - HD - Adjustment - common - sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp \ \ # ---------- Views - HD - Adjustment - Pre-Treatment - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp \ \ # ---------- Views - HD - Adjustment - Post-Treatment - sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \ - sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \ - sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp \ \ # ---------- Views - HD - Adjustment - Disinfection - sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ \ # ---------- Views - HD - States Data - sources/view/hd/data/VHDOperationModeData.cpp \ - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ - sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp \ - sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data - sources/view/hd/data/VHDAccelerometerData.cpp \ - sources/view/hd/data/VHDSyringePumpData.cpp \ - sources/view/hd/data/VHDAirBubbleData.cpp \ - sources/view/hd/data/VHDAirTrapData.cpp \ - sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment - sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ - sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - HD - Data - In-Treatment - sources/view/hd/data/VTreatmentRanges.cpp \ - sources/view/hd/data/treatment/VTreatmentTime.cpp \ - sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp \ - sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ - sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp \ - sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp \ - sources/view/hd/data/treatment/VTreatmentSalineData.cpp \ - sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ \ # ---------- Views - HD - Data - End-Treatment - sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \ - sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \ - sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \ - sources/view/hd/data/treatment/VTreatmentStopData.cpp \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress - sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \ \ # ---------- Views - DG - Data - Disinfect - Progress \ # ---------- Views - DG - States \ # ---------- Views - DG - Data - sources/view/dg/data/VDGDrainPumpData.cpp \ - sources/view/dg/data/VDGHeatersData.cpp \ - sources/view/dg/data/VDGLoadCellReadingsData.cpp \ - sources/view/dg/data/VDGOperationModeData.cpp \ - sources/view/dg/data/VDGPressuresData.cpp \ - sources/view/dg/data/VDGROPumpData.cpp \ - sources/view/dg/data/VDGReservoirData.cpp \ - sources/view/dg/data/VDGTemperaturesData.cpp \ - sources/view/dg/data/VDGValvesStatesData.cpp \ - sources/view/dg/data/VDGAccelerometerData.cpp \ - sources/view/dg/data/VDGConductivityData.cpp \ \ # Storage - sources/storage/StorageGlobals.cpp \ - sources/storage/FileHandler.cpp \ - sources/storage/Logger.cpp \ \ # Utility sources/utility/crc.cpp \ sources/utility/format.cpp \ Index: main.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- main.cpp (.../main.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ main.cpp (.../main.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -41,19 +41,11 @@ #include "Compatible.h" // Project -#include "FileHandler.h" #include "MainTimer.h" #include "CanInterface.h" #include "FrameInterface.h" #include "MessageAcknowModel.h" #include "MessageDispatcher.h" -#include "ApplicationController.h" -#include "GuiController.h" -#include "Logger.h" -#include "DeviceController.h" -#include "WifiInterface.h" -#include "BluetoothInterface.h" -#include "CloudSyncController.h" #include "Threads.h" @@ -84,14 +76,14 @@ const char *gFakeData_default = "00" ; bool gSendEmptyKeepAwake = false ; bool gFakeSeqAtBegin = false ; -bool gDisableUnhandledReport = false ; bool gDisableDialinUnhandled = false ; bool gDisableTimeout = false ; bool gDisableAlarmNoMinimize = false ; bool gDisableSDCFailLogStop = false ; bool gDisableCloudSyncFailStop = false ; bool gDisableCheckInLog = false ; +bool gDisableUnhandledReport = false ; bool gDisableAcknowLog = false ; bool gConsoleoutLogs = false ; @@ -344,6 +336,7 @@ gDisableCloudSyncFailStop = parser.isSet(optionDisableCloudSyncFailStop ); gDisableCheckInLog = parser.isSet(optionDisableCheckInLog ); + gDisableAcknowLog = parser.isSet(optionDisableAcknowLog ); gEnableDryDemo = parser.isSet(optionEnableDryDemo ); @@ -486,20 +479,14 @@ // and all the files are copied to the /home/root/ to later be copied to secured locations // and that will be done by lockdown.sh script running within application after the user is done with the setup and QUIT s the application. if ( gEnableManufacturing || gEnableUpdating ) { - QString scriptName = Storage::Device_Lockdown; quint16 errorCode; + Q_UNUSED(errorCode); QString errorText; - errorCode = Device::DeviceError::checkScript (scriptName, Storage::Device_Lockdown ); - errorText = Device::DeviceError::deviceErrorText( static_cast(errorCode), 1); qDebug() << errorText; // since we are in the manufacturing mode it is possible to probably take a look at the serial, if not that is being logged. #ifdef BUILD_FOR_TARGET Storage::FileHandler::write("/home/root/lockdown.log" , errorText, false); #else - Storage::FileHandler::write("/home/denali/lockdown.log" , errorText, false); #endif - if ( ! errorCode ) { - QProcess::startDetached( scriptName, { qApp->applicationName() + ":" + QString::number(qApp->applicationPid()) }); - } } } @@ -556,29 +543,19 @@ //! - Initializing required thread types Threads::registerTypes(); - bool guiStarted = startGui(); - - //! - Initializing Logger - if(_Logger.init(Threads::_Logger_Thread)) { - _Logger.enableConsoleOut(gConsoleoutLogs); - } - _Logger.postInit(); - if (gFakeInterval) { QString msg = " ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ "; qDebug() << msg; - LOG_APPED(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ " - " \n " + msg + - " \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "); + // TODO is this needed? + //LOG_APPED(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ " + // " \n " + msg + + // " \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "); } if ( ! gParserErrorText.isEmpty() ) { - LOG_DEBUG(QString("Command-line arguments process failed:") + gParserErrorText); + //LOG_DEBUG(QString("Command-line arguments process failed:") + gParserErrorText); // TODO is this needed? } - //! - Initializing the Device Controller - _DeviceController.init(Threads::_DeviceController_Thread); - //! - Initializing the CANBus Interface if (_CanInterface.init(Threads::_CanFrame_Thread)) { _CanInterface.enableConsoleOut(gConsoleoutCanInterface); @@ -595,32 +572,16 @@ _MessageDispatcher.enableConsoleOut(gConsoleoutFrameInterface); } - //! - Initializing Application Controller - _ApplicationController.init(Threads::_Application_Thread); - - ////! - Initializing GUI Controller - _GuiController.init(Threads::_Gui_Thread); - //! - Initializing Main Timer _MainTimer.init(); - //! - Initializing WiFi Interface - _WifiInterface.init(Threads::_Wifi_Thread); - - //! - Initializing Bluetooth Interface - _BluetoothInterface.init(Threads::_Bluetooth_Thread); - - //! - Initializing the CloudSync controller - _CloudSyncController.init(Threads::_CloudSync_Thread); - //! - Initialize the QML Viewer and starts GUI int app_exec = -1; - LOG_DEBUG("UI Initializing"); - if ( guiStarted /*startGui()*/ ) { - LOG_DEBUG("UI Initialized"); - _ApplicationController .startPOST(); + //LOG_DEBUG("Dry Demo Initializing"); // TODO is this needed? + //if ( guiStarted /*startGui()*/ ) { + //LOG_DEBUG("UI Initialized"); // TODO is this needed? app_exec = app.exec(); - } + //} // Due to Qt Error the CAN Device cannot be disable/enable from withing another thread // (other than main thread which is the owner of the CanDevice). @@ -629,8 +590,6 @@ Threads::quitThreads(); - Gui::_viewer->deleteLater(); - #ifdef BUILD_FOR_TARGET lockdown(); #endif Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/AlarmGenerator.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/AlarmGenerator.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/ApplicationController.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/ApplicationController.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/ApplicationPost.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/ApplicationPost.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/MainTimer.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/MainTimer.cpp (.../MainTimer.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/MainTimer.cpp (.../MainTimer.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -18,8 +18,6 @@ #include //Project -#include "Logger.h" -#include "ApplicationController.h" /*! * \brief MainTimer::MainTimer @@ -44,7 +42,7 @@ } initConnections(); - LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); + //LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); // TODO uncomment return true; } @@ -55,8 +53,8 @@ */ void MainTimer::initConnections() { - connect(&_ApplicationController , SIGNAL(didKeepAliveBegin()), - this , SLOT( onKeepAliveBegin())); + //connect(&_ApplicationController , SIGNAL(didKeepAliveBegin()), + // this , SLOT( onKeepAliveBegin())); } /*! Index: sources/Threads.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/Threads.cpp (.../Threads.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/Threads.cpp (.../Threads.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -47,9 +47,6 @@ */ void registerTypes() { - // Logger : This is required for Signal/Slots in threading. - qRegisterMetaType("LogType"); - qRegisterMetaType("Logger::LogType"); // CanInterface : This is required for Signal/Slots in threading. qRegisterMetaType("QCanBusFrame"); Index: sources/Threads.h =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/Threads.h (.../Threads.h) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/Threads.h (.../Threads.h) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -24,11 +24,8 @@ extern QThread _CanMessage_Thread ; extern QThread _DeviceController_Thread ; extern QThread _Logger_Thread ; - extern QThread _Application_Thread ; - extern QThread _Gui_Thread ; - extern QThread _Wifi_Thread ; - extern QThread _Bluetooth_Thread ; - extern QThread _CloudSync_Thread ; + //extern QThread _Application_Thread ; + //extern QThread _Gui_Thread ; void registerTypes(); void quitThread (QThread &vThread); Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/bluetooth/BluetoothInterface.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/bluetooth/BluetoothInterface.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/bluetooth/readme.md'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/canbus/CanInterface.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -22,7 +22,6 @@ #include // Project -#include "Logger.h" #include "MessageGlobals.h" #include "FrameInterface.h" @@ -58,7 +57,7 @@ QString logMessage = QString("UI,%1,%2") .arg(tr("%1 Initialized").arg(metaObject()->className())) .arg(status()); - LOG_DEBUG(logMessage); + //OG_DEBUG(logMessage); // TODO is this needed? return true; } @@ -113,9 +112,9 @@ if (_enableConsoleOut == vEnabled) return; _enableConsoleOut = vEnabled; if (_enableConsoleOut) { - LOG_DEBUG("Console out CanInterface enabled"); + //LOG_DEBUG("Console out CanInterface enabled"); // TODO is this needed? } else { - LOG_DEBUG("Console out CanInterface disabled"); + //LOG_DEBUG("Console out CanInterface disabled"); // TODO is this needed? } } // disabled coco end @@ -190,7 +189,7 @@ // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (!_canDevice) { status(tr("Device Creation"), mError); - LOG_DEBUG(status()); + //LOG_DEBUG(status()); // TODO is this needed? return false; } // disabled coco end @@ -208,7 +207,7 @@ { if (!_canDevice->connectDevice()) { status(tr("Connection")); - LOG_DEBUG(status()); + //LOG_DEBUG(status()); // TODO is this needed? delete _canDevice; _canDevice = nullptr; return false; @@ -372,7 +371,7 @@ // log the error each 100k frame and if error is different if (_canStatus != _canDevice->errorString() || !(_erFrameCount % 100000)) { _canStatus = _canDevice->errorString(); - LOG_DEBUG(QString("%1 - %2").arg(_erFrameCount).arg(_canStatus)); + //LOG_DEBUG(QString("%1 - %2").arg(_erFrameCount).arg(_canStatus)); // TODO is this needed? } break; Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -20,7 +20,6 @@ #include // Project -#include "Logger.h" #include "MessageDispatcher.h" #include "CanInterface.h" @@ -47,7 +46,7 @@ startTimer(1, Qt::PreciseTimer); - LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); + //LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); // TODO is this needed? return true; } @@ -148,7 +147,7 @@ QCanBusFrame mFrame; mFrame.setFrameId(vCan_Id); if (vData.length() > Can::eLenCanFrame) { - LOG_DEBUG(QString("Payload cannot be larger than %1 bytes").arg(Can::eLenCanFrame)); + //LOG_DEBUG(QString("Payload cannot be larger than %1 bytes").arg(Can::eLenCanFrame)); // TODO is this needed? return; } mFrame.setPayload(vData); @@ -250,12 +249,12 @@ if ( debugChannel ) { logMessage = "Debug Channel\r\n" + Format::toHexString(mFrameId, false, eLenChannelDigits) + " -- " + vFrame.payload().toHex(' '); - LOG_DEBUG(logMessage); + //LOG_DEBUG(logMessage); // TODO is this needed? } if ( ! ok ) { logMessage = "Unexpected Channel\r\n" + Format::toHexString(mFrameId, false, eLenChannelDigits) + " -- " + vFrame.payload().toHex(' '); - LOG_DEBUG(logMessage); + //LOG_DEBUG(logMessage); // TODO is this needed? return; } @@ -361,7 +360,7 @@ if (_txFrameList.count() >= _txFrameList_Max) { static quint32 i = 0; if ( i % 60 == 0 ) { // log only for the first time and each minute. - LOG_DEBUG(QString("Transmit buffer overflow of %1").arg(_txFrameList_Max)); + //LOG_DEBUG(QString("Transmit buffer overflow of %1").arg(_txFrameList_Max)); // TODO is this needed? } if ( i < UINT32_MAX - 1 ) i++ ; else i = 0; Index: sources/canbus/MessageAcknowModel.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -44,7 +44,7 @@ // runs in MessageAcknowModel thread initConnections(); - LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); + //LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); // TODO is this needed? return true; } @@ -193,5 +193,5 @@ _acknowList[vSequence]->deleteLater(); _acknowList.remove(vSequence); emit didFailedTransmit(vSequence); - LOG_DEBUG( QString("Acknow retry failed for sequence %1").arg(vSequence) ); + //LOG_DEBUG( QString("Acknow retry failed for sequence %1").arg(vSequence) ); // TODO is this needed? } Index: sources/canbus/MessageBuilder.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -17,7 +17,6 @@ // Qt // Project -#include "Logger.h" #include "crc.h" #include "format.h" @@ -43,15 +42,15 @@ * \param vFrameList - The list of frames which has been created by vAction and vData to be sent. * \return true on successful to build a frame */ -bool MessageBuilder::buildFrames(Gui::GuiActionType vAction, const QByteArray &vData, FrameList &vFrameList, Sequence vSequence) +bool MessageBuilder::buildFrames(const QByteArray &vData, FrameList &vFrameList, Sequence vSequence) { QByteArray mPayload ; addSyncByte (mPayload); // Sync Byte addSequence (mPayload, vSequence); // adding sequence - if ( ! addActionId (mPayload, vAction ) ) { // MessageID + if ( ! addActionId (mPayload) ) { // MessageID return false; } - if ( ! addData (mPayload, vAction, vData) ) { // Regarding Payload Length, Adding required Data + if ( ! addData (mPayload, vData) ) { // Regarding Payload Length, Adding required Data return false; } addCRC (mPayload); // CRC @@ -103,15 +102,16 @@ * \param vAction - The ActionID of the message which needs to be appended * to the Payload vPayload */ -bool MessageBuilder::addActionId(QByteArray &vPayload, Gui::GuiActionType vAction) +bool MessageBuilder::addActionId(QByteArray &vPayload) { - if (vAction != Gui::GuiActionType::ID_Unknown) { - quint16 mAction = static_cast(vAction); + if ( false ) { + //if (vAction != Gui::GuiActionType::ID_Unknown) { // TODO is this needed? + quint16 mAction = static_cast(0); vPayload += (mAction >> 8) & 0xFF; // high byte vPayload += mAction & 0xFF; // low byte } else { - QString mHexString = Format::toHexString(vAction, false, eLenMessageIDDigits); - LOG_DEBUG(QString("Incorrect Action ID '%1'").arg(mHexString)); + //QString mHexString = Format::toHexString(vAction, false, eLenMessageIDDigits); + //LOG_DEBUG(QString("Incorrect Action ID '%1'").arg(mHexString)); // TODO is this needed? return false; } return true; @@ -125,9 +125,9 @@ * \param vData - The data which is going to be message payload. * \return false if the vData of type QByteArray is not sufficient regarding vAction */ -bool MessageBuilder::addData(QByteArray &vPayload, Gui::GuiActionType vAction, const QByteArray &vData) +bool MessageBuilder::addData(QByteArray &vPayload, const QByteArray &vData) { - quint8 len = payloadLen[vAction]; + quint8 len = 0; // if len has been set to max(255) // it means it has no limit and can be as long as 255 bytes if (len == eLenMaxData) { @@ -138,13 +138,14 @@ } } if (vData.length() < len) { - QString mHexMIdString = Format::toHexString(vAction, false, eLenMessageIDDigits); - QString mHexDatString = vData.toHex('.').toUpper(); - LOG_DEBUG(QString("Not enough data has been provided for the Message ID '%1'\r\n%2") - .arg(mHexMIdString) - .arg(mHexDatString) - ); - return false; + //QString mHexMIdString = Format::toHexString(vAction, false, eLenMessageIDDigits); + //QString mHexDatString = vData.toHex('.').toUpper(); + //LOG_DEBUG(QString("Not enough data has been provided for the Message ID '%1'\r\n%2") + // .arg(mHexMIdString) + // .arg(mHexDatString) + // ); + //return false; + // TODO is this needed? } vPayload += len; vPayload += vData.mid(0, len); // Adding required Data @@ -228,12 +229,13 @@ quint8 mBeenRead = 0; if ( ! checkCRC(crcData, mExpected, mBeenRead ) ) { // CRC is always next byte after Data static quint64 erCRC = 0; - LOG_DEBUG(QString("%1 - CRC error, expected %2 but got %3 : %4") - .arg(++erCRC) - .arg(Format::toHexString(mExpected, true, eLenCRCDigits)) - .arg(Format::toHexString(mBeenRead, true, eLenCRCDigits)) - .arg(Format::toHexString(vMessage.data)) - ); + Q_UNUSED(erCRC); + //LOG_DEBUG(QString("%1 - CRC error, expected %2 but got %3 : %4") + // .arg(++erCRC) + // .arg(Format::toHexString(mExpected, true, eLenCRCDigits)) + // .arg(Format::toHexString(mBeenRead, true, eLenCRCDigits)) + // .arg(Format::toHexString(vMessage.data)) + // ); // TODO is this needed? return false; } return true; @@ -258,12 +260,11 @@ vMessage.can_id = vCan_Id; vMessage.head = getHeader (mPayload); // keep header before taking it out of the payload. does not affect payload vMessage.sequence = getSequence (mPayload); - vMessage.actionId = static_cast(getActionId(mPayload)); vMessage.length = getLength (mPayload); vMessage.data = getData (mPayload, vMessage.length); vMessage.initialized = true; } else { // Expected Header but got pure data - LOG_DEBUG(QString("Expected Header, got frame without Sync byte")); + //LOG_DEBUG(QString("Expected Header, got frame without Sync byte")); // TODO is this needed? printPayload(vPayload, false ,vCan_Id); return false; } @@ -293,9 +294,9 @@ if (_enableConsoleOut == vEnabled) return; _enableConsoleOut = vEnabled; if (_enableConsoleOut) { - LOG_DEBUG("Console out MessageBuilder enabled"); + //LOG_DEBUG("Console out MessageBuilder enabled"); // TODO is this needed? } else { - LOG_DEBUG("Console out MessageBuilder disabled"); + //LOG_DEBUG("Console out MessageBuilder disabled"); // TODO is this needed? } } // disabled coco end @@ -355,7 +356,7 @@ { QByteArray headInfo; if (vPayload.length() < eLenHeaderInfo) { - LOG_DEBUG("Incorrect Message Header"); + //LOG_DEBUG("Incorrect Message Header"); // TODO is this needed? return headInfo; } for (int i = 0; i < eLenHeaderInfo; i++) { Index: sources/canbus/MessageBuilder.h =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageBuilder.h (.../MessageBuilder.h) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageBuilder.h (.../MessageBuilder.h) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -18,7 +18,6 @@ #include // Project -#include "GuiGlobals.h" #include "MessageGlobals.h" // forward declaration @@ -66,8 +65,8 @@ void addSyncByte ( QByteArray &vPayload); void addSequence (QByteArray &vPayload, Sequence vSequence); - bool addActionId ( QByteArray &vPayload, Gui::GuiActionType vAction) __attribute_warn_unused_result__; - bool addData ( QByteArray &vPayload, Gui::GuiActionType vAction, const QByteArray &vData) __attribute_warn_unused_result__; + bool addActionId ( QByteArray &vPayload) __attribute_warn_unused_result__; + bool addData ( QByteArray &vPayload, const QByteArray &vData) __attribute_warn_unused_result__; void addCRC ( QByteArray &vPayload); void addPadding ( QByteArray &vPayload); @@ -88,8 +87,8 @@ public: explicit MessageBuilder(QObject *parent = nullptr); - // build message to be sent frame by frame - bool buildFrames (Gui::GuiActionType vAction , const QByteArray &vData, FrameList &vFrameList, Sequence vSequence) __attribute_warn_unused_result__; + // build message to be sent frame by frame // TODO is this needed? + bool buildFrames (const QByteArray &vData, FrameList &vFrameList, Sequence vSequence) __attribute_warn_unused_result__; // build message from received frames bool buildMessage(const QByteArray &vPayload, Message &vMessage, Can_Id vCan_Id) __attribute_warn_unused_result__; Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -19,8 +19,6 @@ #include // Project -#include "Logger.h" -#include "ApplicationController.h" #include "FrameInterface.h" #include "MessageAcknowModel.h" @@ -48,7 +46,7 @@ // runs in the thread initConnections(); - LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); + //LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); // TODO is this needed? return true; } @@ -88,10 +86,6 @@ */ void MessageDispatcher::initConnections() { - // From GUI - connect(&_ApplicationController, SIGNAL(didActionTransmit(GuiActionType , const QVariantList &)), - this , SLOT( onActionTransmit(GuiActionType , const QVariantList &))); - // From HD connect(&_FrameInterface , SIGNAL(didFrameReceive (Can_Id , const QByteArray &)), this , SLOT( onFrameReceive (Can_Id , const QByteArray &))); @@ -102,14 +96,6 @@ connect(&_MessageAcknowModel , SIGNAL(didFailedTransmit( Sequence )), this , SLOT( onFailedTransmit( Sequence ))); - - // Application Settings are ready - connect(&_ApplicationController, SIGNAL(didSettingsDone ()), - this , SLOT( onSettingsDone ())); - - // ---- Signal/Slots - ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_ApplicationController) - ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_interpreter ) } /*! @@ -217,9 +203,9 @@ * \param vActionId - The ActionID of the message * \param vData - The data of the Message */ -void MessageDispatcher::onActionTransmit(GuiActionType vActionId, const QVariantList &vData) +void MessageDispatcher::onActionTransmit(const QVariantList &vData) { - actionTransmit(vActionId, vData); + actionTransmit(vData); } /*! @@ -233,626 +219,6 @@ // ---------------------------------------------------------------------------------------------------- -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vData - Data model contains Blood Flow Rate - and Dialysate Flow Rate - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustBloodDialysateRequestData &vData) -{ - QVariantList mData; - mData += vData.bloodFlow; - mData += vData.dialysateFlow; - onActionTransmit(GuiActionType::ID_AdjustBloodDialysateReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the treatment duration Adjustment Denali message. - * \param vData - Data model contains treatment duration adjustment value in minutes - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDurationRequestData &vData) -{ - QVariantList mData; - mData += vData.duration; - onActionTransmit(GuiActionType::ID_AdjustDurationReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration State Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration state adjustment - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationStateRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - actionTransmit(GuiActionType::ID_AdjustUltrafiltrationStateReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationEditRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationEditReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment User Selected Option Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume and user selected option. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - mData += vData.option; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Request Silence message. - * \param vData - Data model contains the silence request information. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmSilenceRequestData &vData) -{ - QVariantList mData; - mData += vData.silence; - onActionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); -} - -/** - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the User Action Denali message. - * \param vData - Data model contains User Action on the alarm dialog. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmUserActionRequestData &vData) -{ - QVariantList mData; - mData += vData.action; - onActionTransmit(GuiActionType::ID_AlarmUserActionReq, mData); -} - -/** - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Active List Request denali message. - * \param vData - Data model contains Alarm Active List payload. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmActiveListRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AlarmActiveListReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Set Date Time Denali message. - * \details This method transmits the request to set the alarm volume. - * \param vData - Data model contains the alarm volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData) -{ - QVariantList mData; - mData += vData.volume2HD(); - onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Acknowledge Request message. - * \param vData - Data model contains the user acknowledge request information. - * \return void - */ -/* // disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. -void MessageDispatcher::onAdjustment(const AlarmClearedConditionRequestData &vData) -{ - QVariantList mData; - mData += vData.alarmID; - onActionTransmit(GuiActionType::ID_AlarmClearedConditionReq, mData); -} -// disabled coco end */ - -/** - * \details This method transmits the Saline Bolus Adjustment Denali message. - * \param vData - Data model contains treatment Saline Bolus adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustSalineRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustSalineReq, mData); -} - -/** - * \details This method transmits the Heparin Adjustment Denali message. - * \param vData - Data model contains treatment Heparin adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHeparinRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustHeparinReq, mData); -} - -/** - * \details This method transmits the Rinseback Adjustment Denali message. - * \param vData - Data model contains treatment Rinseback adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustRinsebackRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRinsebackReq, mData); -} - -/** - * \details This method transmits the Recirculate Adjustment Denali message. - * \param vData - Data model contains treatment Recirculate adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustRecirculateRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRecirculateReq, mData); -} - -/** - * \details This method transmits the Treatment End Adjustment Denali message. - * \param vData - Data model contains treatment end adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Version Denali message. - * \param vData - Data model contains HD Version state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &vData) -{ - QVariantList mData; - mData += QVariant::fromValue(vData.ver_major); - mData += QVariant::fromValue(vData.ver_minor); - mData += QVariant::fromValue(vData.ver_micro); - mData += QVariant::fromValue(vData.ver_revis); - mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Version Denali message. - * \param vData - Data model contains HD Version state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustVersionsResponseData &vData) -{ - QVariantList mData; - mData += QVariant::fromValue(vData.ver_major); - mData += QVariant::fromValue(vData.ver_minor); - mData += QVariant::fromValue(vData.ver_micro); - mData += QVariant::fromValue(vData.ver_revis); - mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIRsp, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Set Date Time Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustServiceDatesRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceDatesReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. - * \param vData - Data model contains Service Mode adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustServiceModeRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceModeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Pressures Limits Adjustment Denali message. - * \param vData - Data model contains treatment Pressures Limits adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPressuresLimitsRequestData &vData) -{ - QVariantList mData; - mData += vData.mArterialPressureLimitWindow ; - mData += vData.mVenousPressureLimitWindow ; - mData += vData.mVenousPressureLimitAsymtrc ; - onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the InitTreatment request message. - * \param vData - Data model contains the init treatment request information. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustInitTreatmentRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); -} - -/** - * \details This method transmits the Treatment Parameter request message. - * \param vData - Data model contains treatment parameter adjustment data structure - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) -{ - QVariantList mData; - mData += vData.mBloodFlowRate ; - mData += vData.mDialysateFlowRate ; - mData += vData.mTreatmentDuration ; - mData += vData.mHeparinStopTime ; - mData += vData.mSalineBolus ; - mData += vData.mAcidConcentrate ; - mData += vData.mBicarbonateConcentrate ; - mData += vData.mDialyzerType ; - mData += vData.mHeparinType ; - mData += vData.mBloodPressureMeasureInterval ; - mData += vData.mRinsebackFlowRate ; - mData += vData.mArterialPressureLimitWindow ; - mData += vData.mVenousPressureLimitWindow ; - mData += vData.mVenousPressureLimitAsymtrc ; - mData += vData.mHeparinDispensingRate ; - mData += vData.mHeparinBolusVolume ; - mData += vData.mDialysateTemp ; - - onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Confirm Treatment request message. - * \param vData - Data model contains the confirm treatment request - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustParametersConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Water Sample Adjustment Denali message. - * \param vData - Data model contains Water Sample adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustWaterSampleRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Water Sample Result Adjustment Denali message. - * \param vData - Data model contains Water Sample Result adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustWaterSampleResultRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Consumables Confirm Adjustment Denali message. - * \param vData - Data model contains Consumables Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Confirm Adjustment Denali message. - * \param vData - Data model contains Disposables Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Prime Adjustment Denali message. - * \param vData - Data model contains Disposables Prime adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Connection Begin Adjustment Denali message. - * \param vData - Data model contains Patient Connection Begin adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Connection Confirm Adjustment Denali message. - * \param vData - Data model contains Patient Connection Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Start Treatment Adjustment Denali message. - * \param vData - Data model contains Start Treatment adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Disconnection Notify Adjustment Denali message. - * \param vData - Data model contains Patient Disconnection Notify adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectNotifyReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Disconnection Confirm Adjustment Denali message. - * \param vData - Data model contains Patient Disconnection Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. - * \param vData - Data model contains Disposables Removal Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesRemovalConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesRemovalConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Treatment Log Adjustment Denali message. - * \param vData - Data model contains Treatment Log adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustTreatmentLogRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustTreatmentLogReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Set Date Time Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHDDateTimeRequestData &vData) -{ - QVariantList mData; - mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustHDDateTimeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Set Date Time Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDGDateTimeRequestData &vData) -{ - QVariantList mData; - mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustDGDateTimeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Cleaning Usage request message. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDGCleaningUsageRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDGCleaningUsageReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disinfect request Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisinfectStartRequestData &vData) -{ - QVariantList mData; - mData += vData.mState; - onActionTransmit(GuiActionType::ID_AdjustDisinfectStartReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disinfect mode request Denali message. - * \param vData - Data model contains the initiate/cancel boolean disinfection mode - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisinfectModeRequestData &vData) -{ - QVariantList mData; - mData += vData.mInititate; - onActionTransmit(GuiActionType::ID_AdjustDisinfectModeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI power on self test final result - * \param vData - Data model contains the final result of the UI POST - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUIPostFinalResultRequestData &vData) -{ - QVariantList mData; - mData += vData.mResult; - onActionTransmit(GuiActionType::ID_UIPostFinalResultData, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI Generic User Confirmation result. - * \param vData - Data model contains the Generic User Confirmation result. - * \return void - */ -void MessageDispatcher::onAdjustment(const DuetConfirmUIrData &vData) -{ - QVariantList mData; - mData += vData.mId; - mData += vData.mConfirm; - onActionTransmit(GuiActionType::ID_DuetConfirmUIr, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI RO Water Mode adjustment request. - * \param vData - Data model contains the UI RO Water Mode adjustment request data. - * \return void - */ -void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData) -{ - QVariantList mData; - mData += vData.mStatus; - onActionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Usage Info Denali message. - * \param vData - - * \return void - */ -void MessageDispatcher::onAdjustment(const HDUsageInfoRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_HDUsageInfoReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD institutional record request to HD. - * \param vData - - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustInstitutionalRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. - * \param vData - Data model contains Service Mode adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHDResetInSrvcRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); -} // ---------------------------------------------------------------------------------------------------- /*! @@ -863,7 +229,7 @@ * \param vActionId - The ActionID of the message * \param vData - The data of the Message */ -void MessageDispatcher::actionTransmit(GuiActionType vActionId, const QVariantList &vData, Sequence vSequence, Can_Id vCanId) +void MessageDispatcher::actionTransmit(const QVariantList &vData, Sequence vSequence, Can_Id vCanId) { txCount(); if (vSequence == 0) { // initialize @@ -875,19 +241,19 @@ QByteArray mData; Can_Id canid = vCanId; - if (! _interpreter.interpretMessage(vActionId, vData, mData, canid)) { - LOG_DEBUG(QString("Incorrect Message, cannot be interpreted, %1").arg(Format::toHexString(vActionId))); // TODO : LogInfo Improvement + if (! _interpreter.interpretMessage(vData, mData, canid)) { + //LOG_DEBUG(QString("Incorrect Message, cannot be interpreted, %1").arg(Format::toHexString(vActionId))); // TODO : LogInfo Improvement // TODO is this needed? return; } // TODO : Create a buildFrames method FrameList frameList; Sequence mSequence = vSequence; - bool mNeedsAcknow = needsAcknow(vActionId); + bool mNeedsAcknow = needsAcknow(canid); if (mNeedsAcknow) { mSequence = -mSequence; if ( ! gDisableAcknowLog ) { - LOG_APPED_UI(tr("Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); + //LOG_APPED_UI(tr("Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); // TODO is this needed? } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence); @@ -896,8 +262,8 @@ // disabled coco begin validated: Has been tested manually but in this function this cannot be false because the message interpreter is doing the same validation. // still checking here in case the logic has changed therefore buildFrame should still validate the message for developer safety. - if ( ! _builder.buildFrames(vActionId, mData, frameList, mSequence) ) { - LOG_DEBUG(QString("Incorrect Message cannot be built")); // TODO : LogInfo Improvement + if ( ! _builder.buildFrames(mData, frameList, mSequence) ) { + //LOG_DEBUG(QString("Incorrect Message cannot be built")); // TODO : LogInfo Improvement // TODO is this needed? return; } // disabled coco end @@ -936,7 +302,7 @@ { if (vPayload.length() < eLenCanFrame) { // Each frame has to have exactly 8 (eLenCanFrame) bytes of data and unused bytes should be passed as 00. - LOG_DEBUG(QString("Incorrect frame length. Exp:%1,got:%2").arg(eLenCanFrame).arg(vPayload.length())); + //LOG_DEBUG(QString("Incorrect frame length. Exp:%1,got:%2").arg(eLenCanFrame).arg(vPayload.length())); return false; } if (! _builder.buildMessage(vPayload, _messageList[vCan_Id].last(), vCan_Id)) { @@ -955,13 +321,13 @@ */ bool MessageDispatcher::checkAcknowReceived(const Message &vMessage, const QString &vSrcText) { - GuiActionType mActionId = vMessage.actionId; + Q_UNUSED(vSrcText); Sequence mSequence = vMessage.sequence; bool ok = false; - if ( mActionId == GuiActionType::ID_Acknow ) { + if ( false ) { ok = true; if ( ! gDisableAcknowLog ) { - LOG_APPED(tr(" ,%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence)); + //LOG_APPED(tr(" ,%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence)); } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); @@ -980,8 +346,8 @@ */ bool MessageDispatcher::checkAcknowTransmit(const Message &vMessage, const QString &vSrcText) { + Q_UNUSED(vSrcText); bool ok = false; - GuiActionType mActionId = vMessage.actionId; Sequence mSequence = vMessage.sequence; // UI shall acknowledge the messages is intended for UI. @@ -990,17 +356,18 @@ if (mSequence < 0) { ok = true; if ( ! gDisableAcknowLog ) { - LOG_APPED(tr(" ,%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId))); + //LOG_APPED(tr(" ,%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId))); } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); #endif // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak is immediately handled at the same place. QString dstText; Can_Id dstID = MessageInterpreter::identifyDestination(vMessage.can_id, &dstText); - actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID); + Q_UNUSED(dstID); + //actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID); // TODO is this needed? if ( ! gDisableAcknowLog ) { - LOG_APPED_UI(tr("Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText)); + //LOG_APPED_UI(tr("Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText)); } #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId); @@ -1030,7 +397,7 @@ // disabled coco begin validated: Has been validated manually. If MessageInterpreter::interpretMessage fails, this also returns false if ( _interpreter.interpretMessage( vMessage, mData ) ) { ok = true; - emit didActionReceive(vMessage.actionId, mData); + emit didActionReceive(mData); } // disabled coco end @@ -1072,16 +439,6 @@ } // disabled coco end -/*! - * \brief MessageDispatcher::needsAcknow - * \details List of the Action types which need Acknow - * \param vActionId - Action Type id - * \return true if needs an Acknow - */ -bool MessageDispatcher::needsAcknow(GuiActionType vActionId) -{ - return _needsAcknow.contains(vActionId); -} /*! * \brief MessageDispatcher::needsAcknow Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -32,7 +32,7 @@ // since this class is the interface between GUI and Can // it needs to use Gui namespace otherwise it makes code hard to read. -using namespace Gui; +//using namespace Gui; namespace Can { /*! * \brief The MessageDispatcher class \n @@ -105,72 +105,6 @@ QThread *_thread = nullptr; bool _init = false; - // List of the transmit(request) only, messages which require acknowledge back(AckBack). - QList _needsAcknow { - // FIXME: check this on device first. It is not working with dialin. - GuiActionType::ID_KeepAlive , - // CONFIRM - GuiActionType::ID_DuetConfirmUIr , - // POST - GuiActionType::ID_UIPostFinalResultData , - // Alarm - GuiActionType::ID_AlarmUserActionReq , - GuiActionType::ID_AlarmSilenceReq , - GuiActionType::ID_AlarmClearedConditionReq , - GuiActionType::ID_AlarmActiveListReq , - GuiActionType::ID_AlarmVolumeSetReq , - // Pre-Treatment - GuiActionType::ID_AdjustInitTreatmentReq , - GuiActionType::ID_AdjustWaterSampleReq , - GuiActionType::ID_AdjustWaterSampleResultReq , - GuiActionType::ID_AdjustConsumablesConfirmReq , - GuiActionType::ID_AdjustDisposablesConfirmReq , - GuiActionType::ID_AdjustDisposablesPrimeReq , - GuiActionType::ID_AdjustPatientConnectionBeginReq , - GuiActionType::ID_AdjustUltrafiltrationInitReq , - GuiActionType::ID_AdjustPatientConnectionConfirmReq , - GuiActionType::ID_AdjustStartTreatmentReq , - // In-Treatment - GuiActionType::ID_AdjustBloodDialysateReq , - GuiActionType::ID_AdjustDurationReq , - GuiActionType::ID_AdjustUltrafiltrationStateReq , - GuiActionType::ID_AdjustUltrafiltrationEditReq , - GuiActionType::ID_AdjustUltrafiltrationConfirmReq , - GuiActionType::ID_AdjustSalineReq , - GuiActionType::ID_AdjustHeparinReq , - GuiActionType::ID_AdjustPressuresLimitsReq , - // End-Treatment - GuiActionType::ID_AdjustRinsebackReq , - GuiActionType::ID_AdjustRecirculateReq , - GuiActionType::ID_AdjustTreatmentEndReq , - // Post-Treatment - GuiActionType::ID_AdjustPatientDisconnectNotifyReq , - GuiActionType::ID_AdjustPatientDisconnectConfirmReq , - GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , - // Disinfect - GuiActionType::ID_AdjustDisinfectModeReq , - GuiActionType::ID_AdjustDisinfectStartReq , - // DG Cleaning - GuiActionType::ID_AdjustDGCleaningUsageReq , - // Settings - GuiActionType::ID_AdjustServiceModeReq , - GuiActionType::ID_AdjustVersionsUIReq , - GuiActionType::ID_AdjustVersionsUIRsp , - GuiActionType::ID_AdjustServiceDatesReq , - GuiActionType::ID_AdjustHDDateTimeReq , - GuiActionType::ID_AdjustDGDateTimeReq , - GuiActionType::ID_HDUsageInfoReq , - GuiActionType::ID_AdjustInstitutionalRecordReq , - // Treatment Log - GuiActionType::ID_AdjustTreatmentLogReq , - GuiActionType::ID_TreatmentLogAvrgeData , - GuiActionType::ID_TreatmentLogAlarmData , - GuiActionType::ID_TreatmentLogEventData , - - // HD reset request in service mode - GuiActionType::ID_ResetHDInServiceModeReq , - }; - public slots: bool init(); bool init(QThread &vThread); @@ -185,10 +119,9 @@ void initThread(QThread &vThread); void quitThread(); - void actionTransmit (GuiActionType vActionId, const QVariantList &vData, Sequence vSequence = 0, Can_Id vCanId = Can::Can_Id::eChlid_UI_HD); + void actionTransmit (const QVariantList &vData, Sequence vSequence = 0, Can_Id vCanId = Can::Can_Id::eChlid_UI_HD); void framesTransmit (Can_Id vCan_Id, const FrameList &vFrameList); - bool needsAcknow (GuiActionType vActionId); bool needsAcknow (Can_Id vCan_Id); bool buildMessage (Can_Id vCan_Id, const QByteArray &vPayload); @@ -209,7 +142,7 @@ * \param vAction - The action has been extracted from CANBus message header to be done * \param vData - The data has been collected from CANBus frame(s) */ - void didActionReceive (GuiActionType vAction , const QVariantList &vData); + void didActionReceive (const QVariantList &vData); /*! * \brief didActionReceive @@ -255,20 +188,12 @@ // A Frame has been received from CanInterface void onFrameReceive (Can_Id vCan_Id, const QByteArray &vPayload); + void onActionTransmit (const QVariantList &vData); + // void onFramesTransmit (Can_Id vCan_Id, Sequence vSequence, const FrameList &vFrameList); void onFailedTransmit ( Sequence vSequence); - // An Action has been requested to be transmitted. - void onActionTransmit (GuiActionType vActionId, const QVariantList &vData); - void onSettingsDone (); - - // ---- Signal/Slots - ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT - ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS - - ACTION_RECEIVE_PRIVATE_SLOT(UIPostFinalResultHDRequestData) - }; } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -18,7 +18,6 @@ #include // Project -#include "GuiGlobals.h" #include "types.h" namespace Can { @@ -38,247 +37,6 @@ typedef quint64 FrameCount; /*! - * \brief Payload Length - * \details List of each ActionID required data (in byte) length in the message. - * So the data collector has to collect this amount of bytes as payload of a message. - * - */ -const QHash payloadLen { - // FixMe: This has to be move to each model. - // it has been observed that these length can only check the payload length is correct. - // but if the model still needs more the model will fail. - // so it is better to keep them next to each other to make sure they are in sync. - // ---- - {Gui::GuiActionType::ID_PowerOff , 1 }, // 1 byte - {Gui::GuiActionType::ID_ShuttingDown , 0 }, - {Gui::GuiActionType::ID_KeepAlive , 255 }, // 0 => 255 to be able to run a multi-frame test. - - // Generic Confirm - {Gui::GuiActionType::ID_DuetConfirmHDi , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_DuetConfirmUIr , 2 * 4 }, // 2 parameters each 4bytes - - // POST - {Gui::GuiActionType::ID_HDPostSingleResultData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_HDPostFinalResultData , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_DGPostSingleResultData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_DGPostFinalResultData , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_UIPostFinalResultData , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_UIPostFinalResultHDReq , 0 * 4 }, // 0 parameters - {Gui::GuiActionType::ID_HDRTCEpochData , 1 * 4 }, // 1 parameters each 4bytes - - // Service Mode - {Gui::GuiActionType::ID_AdjustServiceModeReq , 0 * 4 }, // 0 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustServiceModeRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ----- - {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_BloodFlow , 10 * 4 }, //10 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateInletFlow , 10 * 4 }, //10 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes - {Gui::GuiActionType::ID_PressureOcclusion , 12 * 4 }, //12 parameters each 4bytes - {Gui::GuiActionType::ID_Saline , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_HDAirTrapData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_HDBloodLeakData , 10 * 4 }, //10 parameters each 4bytes - // ---- - {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_TreatmentStates , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes - - // DG Data Messages - {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_DGPressuresData , 5 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_DGDrainPumpData , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_DGReservoirData , 12 * 4 }, // 12 parameters each 4bytes - {Gui::GuiActionType::ID_DGValvesStatesData , 1 * 2 + 13 }, // 1 parameter 16bits & 13 parameters each 1 byte - {Gui::GuiActionType::ID_DGHeatersData , 13 * 4 }, // 13 parameters each 4bytes - {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DGTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes - {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_DGConductivityData , 13 * 4 }, // 13 parameters each 4bytes - // HD Data Messages - {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes - {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 3 }, // 3 parameters each 4bytes - - // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. - {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes - {Gui::GuiActionType::ID_AlarmTriggered , 8 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmClearedConditionReq , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 - {Gui::GuiActionType::ID_AlarmClearedConditionRsp , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 - {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 1bytes - {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmActiveListReq , 0 * 4 }, // 0 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmActiveListRsp , 12 * 4 }, //12 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmVolumeSetReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmVolumeSetRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_TreatmentRanges , 6 * 4 }, // 6 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustBloodDialysateReq , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustBloodDialysateRsp , 4 * 4 }, // 4 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustDurationReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustDurationRsp , 4 * 4 }, // 4 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 3 * 4 }, // 3 parameter each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 8 * 4 }, // 8 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 5 * 4 }, // 5 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 3 * 4 }, // 3 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 5 * 4 }, // 5 parameters each 4bytes - - // Pre-Treatment - // Create Parameters - // Pre-Treatment Initiate Treatment - {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes - // Pre-Treatment Treatment Parameters Validation/Confirm - {Gui::GuiActionType::ID_AdjustParametersValidationReq , 17 * 4 }, //17 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 18 * 4 }, //18 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersConfirmReq , 1 * 4 }, // 1 parameters each 4bytes - // Pre-Treatment Water Sample - {Gui::GuiActionType::ID_DGFilterFlushData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustWaterSampleReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustWaterSampleRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustWaterSampleResultReq , 1 * 4 }, // 1 parameters each 4bytes - // Pre-Treatment Consumables Installation Confirm - {Gui::GuiActionType::ID_AdjustConsumablesConfirmReq , 0 * 4 }, // 0 parameter - // Pre-Treatment SelfTest NoCartridge Progress Data - {Gui::GuiActionType::ID_SelfTestNoCartridgeData , 2 * 4 }, // 2 parameters each 4bytes - // Pre-Treatment Disposables Installation Confirm - {Gui::GuiActionType::ID_AdjustDisposablesConfirmReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp , 2 * 4 }, // 2 parameter - // Pre-Treatment SelfTest Dry Progress Data - {Gui::GuiActionType::ID_SelfTestDryData , 2 * 4 }, // 2 parameters each 4bytes - // Pre-Treatment Disposable Priming - {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_DisposablesPrimeData , 2 * 4 }, // 2 parameters each 4bytes - // Pre-Treatment Patient Connection Begin - {Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp , 2 * 4 }, // 2 parameters each 4bytes - // Pre-Treatment Ultrafiltration initial volume - {Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp , 3 * 4 }, // 3 parameters each 4bytes - // Pre-Treatment Patient Connection Confirm - {Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes - // Pre-Treatment Start Treatment - {Gui::GuiActionType::ID_AdjustStartTreatmentReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustStartTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustSalineReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustSalineRsp , 3 * 4 }, // 3 parameters each 4bytes - - // ---- - {Gui::GuiActionType::ID_AdjustHeparinReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustHeparinRsp , 2 * 4 }, // 3 parameters each 4bytes - - // ---- Rinseback - {Gui::GuiActionType::ID_AdjustRinsebackReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustRinsebackRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ---- Recirculate - {Gui::GuiActionType::ID_AdjustRecirculateReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustRecirculateRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ---- Treatment End - {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ---- Post-Treatment - // ---- Patient Disconnect - {Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp , 2 * 4 }, // 2 parameter each 4bytes - - // ---- Disposables Removal - {Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp , 2 * 4 }, // 2 parameter each 4bytes - - // ---- Treatment Log - {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 36 * 4 }, //36 parameter each 4bytes - {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes - {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes - {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes - - // ---- Versions - {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,1+1+1+2+1+1+1+1}, // variable length parameters - {Gui::GuiActionType::ID_AdjustSerialHDRsp , 1 * 1 }, // minimum 1 parameter 1 byte - {Gui::GuiActionType::ID_AdjustSerialDGRsp , 1 * 1 }, // minimum 1 parameter 1 byte - // ---- - {Gui::GuiActionType::ID_AdjustVersionsHDReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustVersionsUIRsp ,1+1+1+2+4 }, // variable length parameters - - // ---- Service Information - {Gui::GuiActionType::ID_AdjustServiceDatesReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustServiceDatesHDRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustServiceDatesDGRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ---- RTC - {Gui::GuiActionType::ID_AdjustHDDateTimeReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustHDDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDGDateTimeReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDGDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes - - // ---- Disinfect - {Gui::GuiActionType::ID_AdjustDisinfectModeReq , 1 * 4 }, // 1 parameter 4bytes - {Gui::GuiActionType::ID_AdjustDisinfectModeRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustDisinfectStartReq , 1 * 4 }, // 1 parameter 4bytes - {Gui::GuiActionType::ID_AdjustDisinfectStartRsp , 2 * 4 }, // 2 parameters each 4bytes - // ---- DG Cleaning Usage - {Gui::GuiActionType::ID_AdjustDGCleaningUsageReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp , 10 * 4 }, //10 parameters each 4bytes - // ---- RO Water - {Gui::GuiActionType::ID_DuetRoWaterStatDGq , 0 * 4 }, // 0 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes - // ---- - {Gui::GuiActionType::ID_CANBusFaultCount , 1 }, - {Gui::GuiActionType::ID_RawData , 255 }, - {Gui::GuiActionType::ID_Acknow , 0 }, - {Gui::GuiActionType::ID_AcknowGeneric , 1 }, - - {Gui::GuiActionType::ID_HDDebugText , 40 + 1 }, // ASCII text - 40 bytes + null term - {Gui::GuiActionType::ID_DGDebugText , 40 + 1 }, // ASCII text - 40 bytes + null term - - {Gui::GuiActionType::ID_HDGeneralEvent , 5 * 4 }, // 5 parameters each 4bytes - {Gui::GuiActionType::ID_DGGeneralEvent , 5 * 4 }, // 5 parameters each 4bytes - - {Gui::GuiActionType::ID_AdjustInstitutionalRecordReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp , 27 * 4 }, //27 parameters each 4 bytes - - // HD reset request in service mode - {Gui::GuiActionType::ID_ResetHDInServiceModeReq , 0 * 4 }, // 0 parameters each 4bytes -}; - -/*! * \brief The Payload_Data enum * \details Global information for message packet. */ @@ -367,7 +125,6 @@ struct Message { // TODO : Should be converted to MessageModel class // no time left for now !!! Can_Id can_id = eChlid_NONE; Sequence sequence = 0; // seq 0 is invalid - Gui::GuiActionType actionId = Gui::GuiActionType::ID_Unknown; int length = 0; QByteArray head; QByteArray data; Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -19,12 +19,9 @@ // #include // Project -#include "Logger.h" #include "format.h" -#include "Settings.h" using namespace Can; -using namespace Model; #define DISABLE_CHECKIN_LOG 0 #define DEBUG_SIGNAL(vID, vMODEL) // qDebug() << vID << vMODEL; @@ -33,7 +30,7 @@ // would be better later to be replaced by a template method // like the notify method of received messages #define INTERPRET_TRANSMIT_MESSAGE(vMODEL) \ - if ( ! length ) { logInvalidLength(vActionId); return false; } \ + if ( ! length ) { logInvalidLength(); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ LOG_APPED_MSG(vActionId, vMODEL::toString(vData)); \ @@ -42,7 +39,7 @@ // another version of the INTERPRET_TRANSMIT_MESSAGE for empty messages // same later improvements apply to this MACRO as well. #define INTERPRET_TRSMT_MT_MESSAGE(vMODEL) \ - if ( length ) { logInvalidLength(vActionId); return false; } \ + if ( length ) { logInvalidLength(); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ LOG_APPED_MSG(vActionId, vMODEL::toString(vData)); \ @@ -68,11 +65,10 @@ * \return true on successful check and prepare. */ template -bool MessageInterpreter::notify(const Message &vMessage, QVariantList &vData, Gui::GuiActionType vIdCheck) +bool MessageInterpreter::notify(const Message &vMessage, QVariantList &vData) { bool ok = false; TModel tModel; - if ( ! isValidMessage(vMessage, vIdCheck) ) return ok; ok = tModel.fromByteArray(vMessage.data); tModel.toVariantList(vData); // disabled coco begin validated : Tested manually. This code will never go false @@ -81,8 +77,8 @@ if ( ! ok ) return false; // disabled coco end emit didActionReceive(tModel.data()); - LOG_APPED_MSG(vIdCheck, tModel.toString()); - DEBUG_SIGNAL(vIdCheck, typeid(TModel).name()) + //LOG_APPED_MSG(vIdCheck, tModel.toString()); // TODO is this needed? + //DEBUG_SIGNAL(vIdCheck, typeid(TModel).name()) // TODO is this needed? return ok; } @@ -93,15 +89,18 @@ * \param vType - The type of the message to be checked against * \return true on correct type */ -bool MessageInterpreter::isType(const Message &vMessage, Gui::GuiActionType vType) const +bool MessageInterpreter::isType(const Message &vMessage) const { + Q_UNUSED(vMessage); + /* if ( vMessage.actionId != vType ) { LOG_DEBUG(QString("Incorrect expected ID '%1', got '%2'") .arg(vType) .arg(vMessage.actionId) ); return false; } + */ return true; } @@ -116,22 +115,25 @@ * \param vType - The type of the message to be checked against * \return true on correct data length for the type vType */ -bool MessageInterpreter::isPayloadLenValid(const Message &vMessage, Gui::GuiActionType vType) const +bool MessageInterpreter::isPayloadLenValid(const Message &vMessage) const { int len = vMessage.data.length(); - QString mActionIdHexString = Format::toHexString(vMessage.actionId); - if ( ! payloadLen.contains(vType) ) { - LOG_DEBUG(QString("Undefined data length for received Message with ID '%1'").arg(mActionIdHexString)); + QString mActionIdHexString = Format::toHexString(0); + Q_UNUSED(mActionIdHexString); + Q_UNUSED(len); + /*if ( ! payloadLen.contains(vType) ) { + LOG_DEBUG(QString("Undefined data length for received Message with ID '%1'").arg(mActionIdHexString)); // TODO is this needed? return false; } if ( len < payloadLen[vType] ) { - LOG_DEBUG(QString("Incorrect data length (%2 of %3) for received Message with ID '%1'") + LOG_DEBUG(QString("Incorrect data length (%2 of %3) for received Message with ID '%1'") // TODO is this needed? .arg(mActionIdHexString) .arg(len) .arg(payloadLen[vType]) ); return false; } + */ return true; } @@ -140,11 +142,10 @@ * \details Logs invalid data length for the message type vActionId * \param vActionId - Message Type */ -void MessageInterpreter::logInvalidLength(const Gui::GuiActionType &vActionId) +void MessageInterpreter::logInvalidLength() { - QString mActionIdHexString = Format::toHexString(vActionId); - LOG_DEBUG(QString("Incorrect data length for transmit message with ID '%1'") - .arg(mActionIdHexString)); + //LOG_DEBUG(QString("Incorrect data length for transmit message with ID '%1'") + // .arg(mActionIdHexString)); // TODO is this needed? } /*! @@ -154,10 +155,11 @@ * \param vType - The type of the message to be checked against * \return true on valid massage */ -bool MessageInterpreter::isValidMessage(const Message &vMessage, Gui::GuiActionType vType) const +bool MessageInterpreter::isValidMessage(const Message &vMessage) const { - if ( ! isType (vMessage, vType) ) return false; - if ( ! isPayloadLenValid(vMessage, vType) ) return false; + Q_UNUSED(vMessage); + //if ( ! isType (vMessage, vType) ) return false; + //if ( ! isPayloadLenValid(vMessage, vType) ) return false; return true; } @@ -171,14 +173,14 @@ void MessageInterpreter::printUnhandled(const Message &vMessage) const { if ( logUnhandledMessage(vMessage)) return; // the message is defined as unhandled and can still be handled and logged, return. - if ( gDisableUnhandledReport ) return; // if the unhandled message error has been disabled, return. - QString mActionIdHexString = Format::toHexString(vMessage.actionId, false, eLenMessageIDDigits); + //if ( gDisableUnhandledReport ) return; // if the unhandled message error has been disabled, return. + QString mActionIdHexString = Format::toHexString(0, false, 0); QString logMessage = tr("Unhandled Message ID (HD)") + '\n' + QString("%1 # %2 %3") - .arg(int(vMessage.can_id), 3, 16, QChar('0')) + .arg(int(0), 3, 16, QChar('0')) .arg(mActionIdHexString) .arg(QString(vMessage.data.toHex('.'))).toUpper(); - LOG_DEBUG(logMessage); + //LOG_DEBUG(logMessage); // TODO is this needed? } /*! @@ -193,109 +195,14 @@ * \return true if the vActionId is valid. * This return value will be used later for error handling. */ -bool MessageInterpreter::interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload, Can_Id &vCanId) +bool MessageInterpreter::interpretMessage(const QVariantList &vData, QByteArray &vPayload, Can_Id &vCanId) { + Q_UNUSED(vData); bool ok = true; if (vCanId == Can::Can_Id::eChlid_NONE ) vCanId = Can::Can_Id::eChlid_UI_HD ; vPayload.clear(); - int length = vData.length(); - // DEBUG: LOG_EVENT(QString("0x%0").arg(vActionId, 4, 16,QChar('0'))); - switch (vActionId) { // notice we are in transmit mode - case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len - break; // No data, Just registered - - case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len - if ( length ) { // this message has a variable length - vPayload = Format::fromVariant(vData.first()); - } - if ( ! gDisableCheckInLog ) { - LOG_APPED_UI(QString("CheckIn")); - } - break; - - case Gui::GuiActionType::ID_RawData: // len: 255, can have any len - if ( length ) { // this message has a variable length - vPayload = Format::fromVariant(vData.first()); - } - LOG_APPED_UI(QString("RawData")); - break; - - // Generic Confirm - case Gui::GuiActionType::ID_DuetConfirmUIr : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData ); break; - // RO Water - case Gui::GuiActionType::ID_DuetRoWaterModeUIi : INTERPRET_TRANSMIT_MESSAGE(DuetRoWaterModeUIiData ); break; - // Power Off - case Gui::GuiActionType::ID_PowerOff : INTERPRET_TRANSMIT_MESSAGE(AdjustPowerOffRequestData ); break; - // POST - case Gui::GuiActionType::ID_UIPostFinalResultData : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData ); break; - // Settings - case Gui::GuiActionType::ID_AdjustServiceModeReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceModeRequestData ); break; - case Gui::GuiActionType::ID_AdjustVersionsUIRsp : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsResponseData ); break; - case Gui::GuiActionType::ID_AdjustVersionsUIReq : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsRequestData ); break; - case Gui::GuiActionType::ID_AdjustHDDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData ); break; - case Gui::GuiActionType::ID_AdjustDGDateTimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData ); break; - case Gui::GuiActionType::ID_AdjustServiceDatesReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceDatesRequestData ); break; - case Gui::GuiActionType::ID_HDUsageInfoReq : INTERPRET_TRSMT_MT_MESSAGE(HDUsageInfoRequestData ); break; - case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustInstitutionalRequestData ); break; - // Pre-Treatment - case Gui::GuiActionType::ID_AdjustInitTreatmentReq : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData ); break; - case Gui::GuiActionType::ID_AdjustParametersValidationReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData ); break; - case Gui::GuiActionType::ID_AdjustParametersConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustWaterSampleReq : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleRequestData ); break; - case Gui::GuiActionType::ID_AdjustWaterSampleResultReq : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleResultRequestData ); break; - case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustConsumablesConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustDisposablesPrimeReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesPrimeRequestData ); break; - case Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionBeginRequestData ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationInitRequestData ); break; - case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustStartTreatmentReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustStartTreatmentRequestData ); break; - // in-treatment - case Gui::GuiActionType::ID_AdjustDurationReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationRequestData ); break; - case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData ); break; - case Gui::GuiActionType::ID_AdjustPressuresLimitsReq : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData ); break; - case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break; - case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData ); break; - // in-treatment - ultrafiltration - case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData ); break; - // End-Treatment - case Gui::GuiActionType::ID_AdjustRinsebackReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData ); break; - case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData ); break; - case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData ); break; - // Post-Treatment - case Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData ); break; - case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustTreatmentLogReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData ); break; - // Disinfection - case Gui::GuiActionType::ID_AdjustDisinfectModeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectModeRequestData ); break; - case Gui::GuiActionType::ID_AdjustDisinfectStartReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectStartRequestData ); break; - // DG Cleaning - case Gui::GuiActionType::ID_AdjustDGCleaningUsageReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDGCleaningUsageRequestData ); break; - - // alarms - case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; - case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDAlarmVolumeRequestData ); break; - // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. - case Gui::GuiActionType::ID_AlarmClearedConditionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData ); break; - case Gui::GuiActionType::ID_AlarmActiveListReq : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData ); break; - case Gui::GuiActionType::ID_AlarmTriggered : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData ); break; - - // HD reset in service mode - case Gui::GuiActionType::ID_ResetHDInServiceModeReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustHDResetInSrvcRequestData ); break; - - // disabled coco end - default: - QString mActionIdHexString = Format::toHexString(vActionId); - LOG_DEBUG(tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); - ok = false; - break; - } return ok; } @@ -421,117 +328,10 @@ { bool ok = false; vData.clear(); - switch (vMessage.actionId) { // notice we are in receive mode - // ----- Debug - case Gui::GuiActionType::ID_CANBusFaultCount : ok = canbusFaultCountData (vMessage, vData); /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_HDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDDebugText ); break; - case Gui::GuiActionType::ID_HDGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDGeneralEvent ); break; - // ----- Events - case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_PowerOff : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PowerOff ); break; - case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_APPED("HD,ShuttingDown"); /* TODO : implement notify<>() */ break; - - case Gui::GuiActionType::ID_DuetConfirmHDi : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmHDi ); break; - - // ----- POST - case Gui::GuiActionType::ID_HDPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDPostSingleResultData ); break; - case Gui::GuiActionType::ID_HDPostFinalResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDPostFinalResultData ); break; - case Gui::GuiActionType::ID_UIPostFinalResultHDReq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_UIPostFinalResultHDReq ); break; - case Gui::GuiActionType::ID_HDRTCEpochData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDRTCEpochData ); break; - - // ----- Settings - case Gui::GuiActionType::ID_AdjustServiceModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp ); break; - case Gui::GuiActionType::ID_AdjustVersionsHDReq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDReq ); break; - case Gui::GuiActionType::ID_AdjustVersionsHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp ); break; - case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp ); break; - case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; - case Gui::GuiActionType::ID_HDUsageInfoRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp ); break; - case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp ); break; - // ----- States - case Gui::GuiActionType::ID_HDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData ); break; - case Gui::GuiActionType::ID_PreTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates ); break; - case Gui::GuiActionType::ID_TreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates ); break; - case Gui::GuiActionType::ID_PostTreatmentStates : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PostTreatmentStates ); break; - - // ----- Datum - case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; - case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; - case Gui::GuiActionType::ID_HDAirBubbleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData ); break; - case Gui::GuiActionType::ID_HDAirTrapData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAirTrapData ); break; - case Gui::GuiActionType::ID_HDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDBloodLeakData ); break; - - // ----- Datum - Treatment - case Gui::GuiActionType::ID_TreatmentRanges : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges ); break; - - // ----- Pre-Treatment - Datum - Progress - case Gui::GuiActionType::ID_SelfTestNoCartridgeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridgeData ); break; - case Gui::GuiActionType::ID_SelfTestDryData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_SelfTestDryData ); break; - case Gui::GuiActionType::ID_DisposablesPrimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData ); break; - // ----- Pre-Treatment - Adjust - case Gui::GuiActionType::ID_AdjustInitTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp ); break; - case Gui::GuiActionType::ID_AdjustParametersValidationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp ); break; - case Gui::GuiActionType::ID_AdjustWaterSampleRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp ); break; - case Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp ); break; - case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp ); break; - case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp ); break; - case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break; - case Gui::GuiActionType::ID_AdjustStartTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp ); break; - - // ----- In-Treatment - Datum - case Gui::GuiActionType::ID_TreatmentTime : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime ); break; - case Gui::GuiActionType::ID_BloodFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_BloodFlow ); break; - case Gui::GuiActionType::ID_DialysateInletFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DialysateInletFlow ); break; - case Gui::GuiActionType::ID_DialysateOutletFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow ); break; - case Gui::GuiActionType::ID_PressureOcclusion : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion ); break; - case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break; - case Gui::GuiActionType::ID_Heparin : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Heparin ); break; - case Gui::GuiActionType::ID_Rinseback : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Rinseback ); break; - case Gui::GuiActionType::ID_Recirculate : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Recirculate ); break; - case Gui::GuiActionType::ID_BloodPrime : ok = notify(vMessage, vData, Gui::GuiActionType::ID_BloodPrime ); break; - case Gui::GuiActionType::ID_TreatmentStop : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentStop ); break; - // ----- In-Treatment Adjust - case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; - case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; - case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; - case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; - case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break; - case Gui::GuiActionType::ID_AdjustRinsebackRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp ); break; - case Gui::GuiActionType::ID_AdjustRecirculateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp ); break; - case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break; - - // ----- Post-Treatment Adjust - case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break; - case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp); break; - case Gui::GuiActionType::ID_AdjustTreatmentLogRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentLogRsp ); break; - // ----- Treatment Log - case Gui::GuiActionType::ID_TreatmentLogAvrgeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAvrgeData ); break; - case Gui::GuiActionType::ID_TreatmentLogAlarmData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAlarmData ); break; - case Gui::GuiActionType::ID_TreatmentLogEventData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogEventData ); break; - // ----- Disinfection - Adjust - case Gui::GuiActionType::ID_AdjustDisinfectModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectModeRsp ); break; - case Gui::GuiActionType::ID_AdjustDisinfectStartRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectStartRsp ); break; - // these need to be standard and use notify as well - case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); /* TODO : implement notify<>() */ break; - - // ----- Alarms - case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; - case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; - case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; - // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. - case Gui::GuiActionType::ID_AlarmClearedConditionRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp ); break; - case Gui::GuiActionType::ID_AlarmActiveListRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp ); break; - // disabled coco end - // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. - default : printUnhandled (vMessage ); break; - } + printUnhandled(vMessage); return ok; } @@ -553,44 +353,8 @@ { bool ok = false; vData.clear(); - switch (vMessage.actionId) { // notice we are in receive mode - case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_DGCheckIn : ok = true; /* TODO : implement notify<>() */ - LOG_APPED(QString("DG,CheckIn," + QVariant(vData).toStringList().join(','))); break; - // ----- POST - case Gui::GuiActionType::ID_DGPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData ); break; - case Gui::GuiActionType::ID_DGPostFinalResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData ); break; + printUnhandled(vMessage); - // DG data messages - case Gui::GuiActionType::ID_DGROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData ); break; - case Gui::GuiActionType::ID_DGPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPressuresData ); break; - case Gui::GuiActionType::ID_DGDrainPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData ); break; - case Gui::GuiActionType::ID_DGOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData ); break; - case Gui::GuiActionType::ID_DGReservoirData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData ); break; - case Gui::GuiActionType::ID_DGValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGValvesStatesData ); break; - case Gui::GuiActionType::ID_DGHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData ); break; - case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData ); break; - case Gui::GuiActionType::ID_DGTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData ); break; - case Gui::GuiActionType::ID_DGDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDebugText ); break; - case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; - case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; - case Gui::GuiActionType::ID_DGConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGConductivityData ); break; - // ----- Datum - Pre-Treatment progress - case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; - // DG Response Messages - case Gui::GuiActionType::ID_AdjustVersionsDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp ); break; - case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; - case Gui::GuiActionType::ID_AdjustDGDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp ); break; - case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; - // RO Water - case Gui::GuiActionType::ID_DuetRoWaterStatDGq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq ); break; - case Gui::GuiActionType::ID_DuetRoWaterModeDGr : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr ); break; - // unhandled messages: these will only be logged as received message - // there has nothing been defined for these messages. - default : printUnhandled (vMessage ); break; - } - return ok; } @@ -610,7 +374,7 @@ { // TODO : review other methods bool ok = false; - if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_CANBusFaultCount) ) return ok; + if ( ! isValidMessage(vMessage) ) return ok; QVariantList mData; int index = 0; @@ -624,56 +388,7 @@ return ok; } -// ---------- ---------- ---------- ---------- ---------- Adjustments ---------- ---------- ---------- ---------- ---------- // /*! - * \brief MessageInterpreter::adjustUltrafiltrationEditData - * \details This method interprets Treatment Ultrafiltration Volume Adjustment Response message data - * in vMessage of type Message. - * \param vMessage - The vMessage of type Message which contains all the data, - * require to be interpreted. - * \param vData - Treatment Ultrafiltration Volume Adjustment Response data - * \return true if the data can be extracted as defined for Treatment Ultrafiltration Volume Adjustment Response Message ID - */ -bool MessageInterpreter::adjustUltrafiltrationEdit(const Message &vMessage, QVariantList &vData) -{ - bool ok = false; - if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp) ) return ok; - - Model::MAdjustUltrafiltrationEditResponse mData; - ok = mData.fromByteArray(vMessage.data); - LOG_APPED("HD," + mData.toString()); // TODO : Not Standard - - mData.toVariantList(vData); - emit didActionReceive(mData.data()); - - return ok; -} - -/*! - * \brief MessageInterpreter::adjustUltrafiltrationConfirmData - * \details This method interprets Treatment Ultrafiltration Volume Adjustment Confirm Response message data - * in vMessage of type Message. - * \param vMessage - The vMessage of type Message which contains all the data, - * require to be interpreted. - * \param vData - Treatment Ultrafiltration Volume Adjustment Confirm Response data - * \return true if the data can be extracted as defined for Treatment Ultrafiltration Volume Adjustment Confirm Response Message ID - */ -bool MessageInterpreter::adjustUltrafiltrationConfirm(const Message &vMessage, QVariantList &vData) -{ - bool ok = false; - if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp) ) return ok; - - Model::MAdjustUltrafiltrationConfirmResponse mData; - ok = mData.fromByteArray(vMessage.data); - LOG_APPED("HD," + mData.toString()); // TODO : Not Standard - - mData.toVariantList(vData); - emit didActionReceive(mData.data()); - - return ok; -} - -/*! * \brief MessageInterpreter::updateUnhandledMessages * \return this method is converting the general settings messages/unhandled (Storage::Settings_Category_MessagesUnhandled) group of settings to the message interpreter specific map structure. * it is done for performance to keep the lookup table shorter and faster. @@ -682,16 +397,7 @@ */ void MessageInterpreter::updateUnhandledMessages() { - QString category = Storage::Settings_Category_MessagesUnhandled; - QStringList groups = _Settings.groups(category); - // DEBUG: qDebug() << groups; - for(const auto &group: qAsConst(groups)) { - bool ok; - quint16 id = QString(group).toUInt(&ok,16); - if (!ok) continue; - _messageList[ id ] = _Settings.keys(category, group); - // DEBUG: qDebug() << _Settings.keys(group); - } + // TODO is this needed? } /*! @@ -702,7 +408,7 @@ */ bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const { bool ok = false; - quint16 id = vMessage.actionId; + quint16 id = 0; // TODO what is instead? QString logString = QString("%1,").arg(id,4,16); if (_messageList.contains(id)) { ok = true; @@ -762,12 +468,12 @@ } } } - LOG_APPED(logString); + //LOG_APPED(logString); // TODO is this needed? } else { - if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return. - LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16)); - } + //if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return. + // LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16)); + //} // TODO is this needed? } return ok; } Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -19,7 +19,6 @@ // Project #include "MessageGlobals.h" -#include "MModel.h" // forward declaration class tst_messaging; @@ -48,17 +47,16 @@ // friend friend class ::tst_messaging; friend class ::tst_logging; - friend class ::tst_models; // list of the unhandled messages with their definition to be able to log them like the ones which are not unhandled and have models. // it is the quickest to add them to support the V&V team. QMap _messageList {}; - bool isType (const Message &vMessage, Gui::GuiActionType vType) const; - bool isPayloadLenValid (const Message &vMessage, Gui::GuiActionType vType) const; - bool isValidMessage (const Message &vMessage, Gui::GuiActionType vType) const; + bool isType (const Message &vMessage) const; + bool isPayloadLenValid (const Message &vMessage) const; + bool isValidMessage (const Message &vMessage) const; - void logInvalidLength (const Gui::GuiActionType &vActionId); + void logInvalidLength (); void printUnhandled (const Message &vMessage ) const; @@ -68,28 +66,23 @@ // ----- Debug bool canbusFaultCountData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ----- Adjustments - bool adjustUltrafiltrationEdit (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool adjustUltrafiltrationConfirm (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - template - bool notify (const Message &vMessage, QVariantList &vData, Gui::GuiActionType vIdCheck) __attribute_warn_unused_result__; - + bool notify (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool logUnhandledMessage (const Message &vMessage) const; public: explicit MessageInterpreter(QObject *parent = nullptr); // interpret the data into GUI understandable Actions/Data bool interpretMessage(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload, Can_Id &vCanId) __attribute_warn_unused_result__; + bool interpretMessage(const QVariantList &vData, QByteArray &vPayload, Can_Id &vCanId) __attribute_warn_unused_result__; void updateUnhandledMessages(); static Can_Source identifySource (Can_Id vCanId, QString *vText = nullptr); static Can_Id identifyDestination(Can_Id vCanId, QString *vText = nullptr); signals: - ACTION_RECEIVE_SIGNALS + //ACTION_RECEIVE_SIGNALS }; } Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/cloudsync/CloudSyncController.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/cloudsync/CloudSyncController.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceController.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceController.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceError.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceError.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceGlobals.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceModels.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceModels.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceView.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/device/DeviceView.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/gui/GuiController.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/gui/GuiController.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/gui/GuiGlobals.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/gui/GuiGlobals.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/gui/GuiView.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/gui/GuiView.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/MAbstractDynamic.cpp =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -16,11 +16,10 @@ // Qt // Project -#include "GuiGlobals.h" using namespace Model; -QVariantList MAbstractDynamic::parameters() const { +/*QVariantList MAbstractDynamic::parameters() const { Gui::GuiAlarmDataTypes fieldType; fieldType = static_cast(_data.mFieldDescriptor1.value); quint32 zero = 0; @@ -70,7 +69,7 @@ lOut: return params; -} +}*/ bool MAbstractDynamic::fromByteArray(const QByteArray &vByteArray, int *vIndex) { bool ok = true; @@ -89,7 +88,7 @@ if (GetValue(vByteArray, index, _data.mID )) if (GetValue(vByteArray, index, _data.mFieldDescriptor1 )) { - Gui::GuiAlarmDataTypes field1Type = static_cast(_data.mFieldDescriptor1.value); + /*Gui::GuiAlarmDataTypes field1Type = static_cast(_data.mFieldDescriptor1.value); switch (field1Type) { case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : ok = true ; goto lOut; @@ -116,10 +115,11 @@ default: return true; - } + }*/ if (GetValue(vByteArray, index, _data.mFieldDescriptor2 )) { + /* Gui::GuiAlarmDataTypes field2Type = static_cast(_data.mFieldDescriptor2.value); switch (field2Type) { case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE : @@ -149,7 +149,7 @@ ok = true; goto lOut; } ok = true; goto lOut; - + */ } else { ok = false; goto lOut; } } Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/MModel.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/confirm/MDuetConfirmHDi.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/confirm/MDuetConfirmHDi.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MDuetRoWaterDG.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGAccelerometerData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGAccelerometerData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGConductivityData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGConductivityData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGDebugText.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGDebugText.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGDrainPumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGDrainPumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGGeneralEvent.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGGeneralEvent.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGHeatersData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGHeatersData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGLoadCellReadingsData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGLoadCellReadingsData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGOperationModeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGOperationModeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGPressuresData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGPressuresData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGROPumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGROPumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGReservoirData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGReservoirData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGTemperaturesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGTemperaturesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGValvesStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/MDGValvesStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/post/MDGPostFinalResultData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/post/MDGPostFinalResultData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/post/MDGPostSingleResultData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/post/MDGPostSingleResultData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/dg/data/pretreatment/MDGFilterFlushData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/MAdjustPowerOff.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/MAdjustPowerOff.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/MAdjustRequestsBase.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmActiveList.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmActiveList.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmCleared.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmCleared.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmClearedCondition.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmClearedCondition.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmMapping.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmStatusData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmStatusData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmTriggered.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmTriggered.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDAccelerometerData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDAccelerometerData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDAirBubbleData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDAirBubbleData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDAirTrapData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDAirTrapData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDBloodLeakData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDBloodLeakData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDDebugText.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDDebugText.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDGeneralEvent.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDGeneralEvent.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDOperationModeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDOperationModeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDSyringePumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDSyringePumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDUsageInfoResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MHDUsageInfoResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MTreatmentRangesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/MTreatmentRangesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MHDPostFinalResultData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MHDPostFinalResultData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MHDPostSingleResultData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MHDPostSingleResultData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MHDRTCEpochData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MHDRTCEpochData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/post/MUIPostFinalResultHDRequest.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentBloodFlowData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentHeparinData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentHeparinData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentOutletFlowData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentRecirculateData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentRinsebackData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentSalineData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentSalineData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentStopData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentStopData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentTimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatment/MTreatmentTimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/settings/MBluetooth.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/settings/MBluetooth.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/settings/MSettings.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/settings/MSettings.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/settings/MWifiNetwork.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/ui/data/MUIBloodPressureData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/model/ui/data/MUIBloodPressureData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/FileHandler.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/FileHandler.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/Logger.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/Logger.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/Settings.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/Settings.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/StorageGlobals.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/StorageGlobals.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/TreatmentLog.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/storage/TreatmentLog.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/utility/types.h =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r80b8371f1a93481e05302cef6e474db802fda153 --- sources/utility/types.h (.../types.h) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ sources/utility/types.h (.../types.h) (revision 80b8371f1a93481e05302cef6e474db802fda153) @@ -24,7 +24,6 @@ // Project #include "format.h" -#include "Logger.h" // defines #define GetValue(vData, vIndex, vValue ) Types::getValue<>(vData, vIndex, vValue, QT_STRINGIFY(vValue)) @@ -154,7 +153,9 @@ bool Types::getValue(const QByteArray &vData, int &vStartIndex, T &vValue, QString vValueName) { int size = sizeof(T); int end = vStartIndex + size; - if (vData.length() < end) { + Q_UNUSED(vValueName); + Q_UNUSED(end); + /*if (vData.length() < end) { LOG_DEBUG(QString("Not enough data from position %1 to the length of %2 to get data of type '%3' in buffer %4 %5") .arg(vStartIndex) .arg(size) @@ -164,6 +165,7 @@ ); return false; } + */ // TODO is logigng needed int i = 0; while (i < size) { vValue.bytes[i] = vData[vStartIndex + i]; Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VAdjustmentResponseBase.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VAdjustmentResponseBase.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VEventSpy.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VEventSpy.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VGeneralEvent.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VGeneralEvent.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VTreatmentCreate.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VTreatmentCreate.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/VView.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/confirm/VConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/confirm/VConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGAccelerometerData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGAccelerometerData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGConductivityData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGConductivityData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGDrainPumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGDrainPumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGHeatersData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGHeatersData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGLoadCellReadingsData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGLoadCellReadingsData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGOperationModeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGOperationModeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGPressuresData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGPressuresData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGROPumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGROPumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGReservoirData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGReservoirData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGTemperaturesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGTemperaturesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGValvesStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/VDGValvesStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/post/VDGPOSTData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/post/VDGPOSTData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/dg/data/pretreatment/VDGFilterFlushData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/alarm/VAlarmActiveList.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/alarm/VAlarmActiveList.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/alarm/VAlarmStatus.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/alarm/VAlarmStatus.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDAccelerometerData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDAccelerometerData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDAirBubbleData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDAirBubbleData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDAirTrapData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDAirTrapData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDBloodLeakData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDBloodLeakData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDOperationModeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDOperationModeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDSyringePumpData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VHDSyringePumpData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VTreatmentRanges.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/VTreatmentRanges.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/post/VHDPOSTData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/post/VHDPOSTData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VHDTreatmentStatesData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentBloodFlow.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentDialysateFlow.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentHeparinData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentHeparinData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentRecirculateData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentRinsebackData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentSalineData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentSalineData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentStopData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentStopData.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentTime.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentTime.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/hd/data/treatment/VTreatmentUltrafiltration.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentAlarmVolume.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentAlarmVolume.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentDGCleaningUsage.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentDGCleaningUsage.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentInstitutionalRecord.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentInstitutionalRecord.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentServiceDates.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentServiceDates.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentServiceMode.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentServiceMode.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentVersions.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentVersions.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VBluetooth.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VBluetooth.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VCloudSync.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VCloudSync.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VDateTime.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VDateTime.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VDuetRoWaterDG.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VDuetRoWaterDG.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VHDUsageInfo.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VHDUsageInfo.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VNetworkModel.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VNetworkModel.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VSettings.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/view/settings/VSettings.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/wifi/WifiInterface.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 80b8371f1a93481e05302cef6e474db802fda153 refers to a dead (removed) revision in file `sources/wifi/WifiInterface.h'. Fisheye: No comparison available. Pass `N' to diff?