Index: .gitignore =================================================================== diff -u -rc65859e54930664100dfdff13afa019e05ae23b6 -re21748fb21b8c964e51bb2f4be7faf699d30a057 --- .gitignore (.../.gitignore) (revision c65859e54930664100dfdff13afa019e05ae23b6) +++ .gitignore (.../.gitignore) (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) @@ -1,4 +1,3 @@ - etc/reports/alarms/AlarmMapping.csv - etc/reports/alarms/AlarmMapping.py +CMakeLists.txt.user Index: CMakeLists.txt =================================================================== diff -u --- CMakeLists.txt (revision 0) +++ CMakeLists.txt (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) @@ -0,0 +1,878 @@ +cmake_minimum_required(VERSION 3.15) + +project(leahi LANGUAGES CXX) + +include(cmake/Debug.cmake) + +option(BUILD_CPPCHECK "Run static code analysis (Cppcheck)" ON) +option(BUILD_GENERATE_ALARM_MAPPING "Generate MAlarmMapping.cpp" ON) +option(BUILD_DEBUG "Build debug" OFF) +option(BUILD_DOC "Build documentation" OFF) +option(BUILD_SQUISH_COCO "Compile flags for Squish Coco code coverage" OFF) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +if(CMAKE_CONFIGURATION_TYPES) + set(CMAKE_CONFIGURATION_TYPES Debug Profile Release) + set(CMAKE_CONFIGURATION_TYPES + "${CMAKE_CONFIGURATION_TYPES}" + CACHE STRING "Reset the configurations to what we need" FORCE) +endif() + +# add_custom_target(${PROJECT_NAME}-GitBranch ALL +# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +# COMMAND git rev-parse --abbrev-ref HEAD +# ) +# +# add_custom_target(${PROJECT_NAME}-Timestamp ALL +# COMMAND date "+%m%d%H%M" +# ) +# +add_compile_options(-Wall -Werror -Wextra -Wimplicit-fallthrough) # -save-temps # see .ii + +add_compile_definitions( + VER_MAJOR="" + VER_MINOR="" + VER_MICRO="" + VER_REVIS="" + VER_REVIS_DEV="" + VER_BRANCH="" +) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +set(RESOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC OFF) + +if(NOT CMAKE_BUILD_TYPE) + message(STATUS "CMAKE_BUILD_TYPE was not defined. Using Debug as a default.") + message( + STATUS "Available options are: ${CMAKE_CONFIGURATION_TYPES}") + set(CMAKE_BUILD_TYPE + Debug + CACHE STRING "Set the type of build" FORCE) +endif() + +find_package(Git) +find_package( + Qt5 COMPONENTS Core Quick Widgets SerialBus Concurrent Charts Bluetooth + REQUIRED +) + +# create the bin directory +# file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + +# add_subdirectory(sources) +add_subdirectory(resources) + +set(INCLUDES + # common + common/AlarmDefs.h + common/Compatible.h + common/DDDefs.h + common/TDDefs.h + common/MsgDefs.h + # Main + 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/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h + sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h + sources/model/dd/data/MDDBloodLeakData.h + sources/model/dd/data/MDDConcentratePumpData.h + sources/model/dd/data/MDDConductivityData.h + sources/model/dd/data/MDDDialysatePumpData.h + sources/model/dd/data/MDDGenDialysateData.h + sources/model/dd/data/MDDHeatersData.h + sources/model/dd/data/MDDLevelData.h + sources/model/dd/data/MDDPressuresData.h + sources/model/dd/data/MDDTemperaturesData.h + sources/model/dd/data/MDDValvesStatesData.h + sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h + sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h + sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h + sources/model/td/data/MTDAirBubbleData.h + sources/model/td/data/MTDAirPumpData.h + sources/model/td/data/MTDAirTrapData.h + sources/model/td/data/MTDBatteryData.h + sources/model/td/data/MTDEjectorData.h + sources/model/td/data/MTDSwitchesData.h + sources/model/td/data/MTDTemperatureData.h + sources/model/td/data/MTDValvesData.h + sources/model/td/data/MTDVoltageData.h + sources/model/td/data/treatment/MTreatmentBloodFlowData.h + sources/model/td/data/treatment/MTreatmentParametersSetPointData.h + sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h + sources/model/td/data/treatment/MTreatmentSalineData.h + sources/model/td/data/treatment/MTreatmentStatesData.h + sources/model/td/data/treatment/MTreatmentTimeData.h + sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h + sources/storage/Settings.h + sources/storage/TreatmentLog.h + sources/bluetooth/BluetoothInterface.h + sources/cloudsync/CloudSyncController.h + # ---------- Models ---------- + sources/model/MModel.h + sources/model/MAbstract.h + sources/model/MAbstractDynamic.h + sources/model/MListModel.h + sources/device/DeviceModels.h + # ---------- Models - TD - Data //// ----- @LEAHIZED + sources/model/td/data/MTDOpModeData.h + # ---------- Views - TD - Data - States //// ----- @LEAHIZED + sources/view/dd/data/VDDBloodLeakData.h + sources/view/dd/data/VDDConcentratePumpData.h + sources/view/dd/data/VDDConductivityData.h + sources/view/dd/data/VDDDialysatePumpData.h + sources/view/dd/data/VDDGenDialysateData.h + sources/view/dd/data/VDDHeatersData.h + sources/view/dd/data/VDDLevelData.h + sources/view/dd/data/VDDPressuresData.h + sources/view/dd/data/VDDTemperaturesData.h + sources/view/dd/data/VDDValvesStatesData.h + sources/view/hd/data/VTreatmentRanges.h + sources/view/td/data/VTDAirBubbleData.h + sources/view/td/data/VTDAirPumpData.h + sources/view/td/data/VTDAirTrapData.h + sources/view/td/data/VTDBatteryData.h + sources/view/td/data/VTDEjectorData.h + sources/view/td/data/VTDOpModeData.h + # ---------- Views - TD - Adjustment - In-Treatment + sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h + # ---------- Models - TD - Adjustment - In-Treatment + sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.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/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/MAlarmActiveList.h + # ---------- Models - States Data + sources/model/hd/data/pretreatment/MPreTreatmentStatesData.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/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/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/MHDBloodLeakData.h + sources/model/hd/data/MTreatmentRangesData.h + sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h + sources/model/hd/data/treatment/MTreatmentOutletFlowData.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/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/MDGLoadCellReadingsData.h + sources/model/dg/data/MDGOperationModeData.h + sources/model/dg/data/MDGReservoirData.h + sources/model/dg/data/MDGROPumpData.h + sources/model/dg/data/MDGAccelerometerData.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/VLocalization.h + sources/view/settings/VBluetooth.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/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/pretreatment/VPreTreatmentStatesData.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/VHDBloodLeakData.h + sources/view/hd/data/treatment/VTreatmentDialysateFlow.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/VDGLoadCellReadingsData.h + sources/view/dg/data/VDGROPumpData.h + sources/view/dg/data/VDGReservoirData.h + sources/view/dg/data/VDGAccelerometerData.h + # Storage + sources/storage/StorageGlobals.h + sources/storage/Logger.h + sources/storage/FileHandler.h + # Utility + sources/utility/crc.h + sources/utility/format.h + sources/utility/types.h + sources/utility/encryption.h + sources/utility/qrcodegen.h + sources/view/td/data/VTDSwitchesData.h + sources/view/td/data/VTDTemperatureData.h + sources/view/td/data/VTDValvesData.h + sources/view/td/data/VTDVoltageData.h + sources/view/td/data/treatment/VTDTreatmentStatesData.h + sources/view/td/data/treatment/VTreatmentBloodFlow.h + sources/view/td/data/treatment/VTreatmentParametersSetPointData.h + sources/view/td/data/treatment/VTreatmentPressureOcclusion.h + sources/view/td/data/treatment/VTreatmentSalineData.h + sources/view/td/data/treatment/VTreatmentTime.h + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h +) + +set(SRCS + # common + # Main + 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/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp + sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp + sources/model/dd/data/MDDBloodLeakData.cpp + sources/model/dd/data/MDDConcentratePumpData.cpp + sources/model/dd/data/MDDConductivityData.cpp + sources/model/dd/data/MDDDialysatePumpData.cpp + sources/model/dd/data/MDDGenDialysateData.cpp + sources/model/dd/data/MDDHeatersData.cpp + sources/model/dd/data/MDDLevelData.cpp + sources/model/dd/data/MDDPressuresData.cpp + sources/model/dd/data/MDDTemperaturesData.cpp + sources/model/dd/data/MDDValvesStatesData.cpp + sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp + sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp + sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp + sources/model/td/data/MTDAirBubbleData.cpp + sources/model/td/data/MTDAirPumpData.cpp + sources/model/td/data/MTDAirTrapData.cpp + sources/model/td/data/MTDBatteryData.cpp + sources/model/td/data/MTDEjectorData.cpp + sources/model/td/data/MTDSwitchesData.cpp + sources/model/td/data/MTDTemperatureData.cpp + sources/model/td/data/MTDValvesData.cpp + sources/model/td/data/MTDVoltageData.cpp + sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp + sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp + sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp + sources/model/td/data/treatment/MTreatmentSalineData.cpp + sources/model/td/data/treatment/MTreatmentStatesData.cpp + sources/model/td/data/treatment/MTreatmentTimeData.cpp + sources/model/td/data/treatment/MTreatmentUltrafiltrationData.cpp + sources/model/ui/data/MUIBloodPressureData.cpp + sources/storage/Settings.cpp + sources/storage/TreatmentLog.cpp + sources/view/dd/data/VDDBloodLeakData.cpp + sources/view/dd/data/VDDConcentratePumpData.cpp + sources/view/dd/data/VDDConductivityData.cpp + sources/view/dd/data/VDDDialysatePumpData.cpp + sources/view/dd/data/VDDGenDialysateData.cpp + sources/view/dd/data/VDDHeatersData.cpp + sources/view/dd/data/VDDLevelData.cpp + sources/view/dd/data/VDDPressuresData.cpp + sources/view/dd/data/VDDTemperaturesData.cpp + sources/view/dd/data/VDDValvesStatesData.cpp + sources/view/hd/data/post/VHDPOSTData.cpp + sources/bluetooth/BluetoothInterface.cpp + sources/cloudsync/CloudSyncController.cpp + # ---------- Models ---------- + sources/model/MAbstract.cpp + sources/model/MAbstractDynamic.cpp + sources/model/MListModel.cpp + sources/device/DeviceModels.cpp + # ---------- Models - TD - Data - States + sources/model/td/data/MTDOpModeData.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/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/MAlarmActiveList.cpp + # ---------- Models - Data - States + sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp + sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp + # ---------- Models - TD - Adjustment - In-Treatment + sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp + # ---------- Models - HD - Adjustment + sources/model/hd/adjustment/MAdjustPowerOff.cpp + # ---------- Models - HD - Adjustment - Settings + 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/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/MHDBloodLeakData.cpp + sources/model/hd/data/MTreatmentRangesData.cpp + sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp + sources/model/hd/data/treatment/MTreatmentOutletFlowData.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/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/MDGLoadCellReadingsData.cpp + sources/model/dg/data/MDGOperationModeData.cpp + sources/model/dg/data/MDGReservoirData.cpp + sources/model/dg/data/MDGROPumpData.cpp + sources/model/dg/data/MDGAccelerometerData.cpp + # CANBus + sources/canbus/CanInterface.cpp + sources/canbus/FrameInterface.cpp + # Denali Message + sources/canbus/MessageAcknowModel.cpp + sources/canbus/MessageBuilder.cpp + 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 - TD - States Data + sources/view/td/data/VTDAirBubbleData.cpp + sources/view/td/data/VTDAirPumpData.cpp + sources/view/td/data/VTDAirTrapData.cpp + sources/view/td/data/VTDBatteryData.cpp + sources/view/td/data/VTDEjectorData.cpp + sources/view/td/data/VTDOpModeData.cpp + # ---------- Views - TD - Adjustment - In-Treatment + sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.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/VLocalization.cpp + sources/view/settings/VDateTime.cpp + sources/view/settings/VBluetooth.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/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/pretreatment/VPreTreatmentStatesData.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/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/VTreatmentDialysateFlow.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/VDGLoadCellReadingsData.cpp + sources/view/dg/data/VDGOperationModeData.cpp + sources/view/dg/data/VDGROPumpData.cpp + sources/view/dg/data/VDGReservoirData.cpp + sources/view/dg/data/VDGAccelerometerData.cpp + # Storage + sources/storage/StorageGlobals.cpp + sources/storage/FileHandler.cpp + sources/storage/Logger.cpp + # Utility + sources/utility/crc.cpp + sources/utility/format.cpp + sources/utility/types.cpp + sources/utility/encryption.cpp + sources/utility/qrcodegen.cpp + sources/view/td/data/VTDSwitchesData.cpp + sources/view/td/data/VTDTemperatureData.cpp + sources/view/td/data/VTDValvesData.cpp + sources/view/td/data/VTDVoltageData.cpp + sources/view/td/data/treatment/VTDTreatmentStatesData.cpp + sources/view/td/data/treatment/VTreatmentBloodFlow.cpp + sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp + sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp + sources/view/td/data/treatment/VTreatmentSalineData.cpp + sources/view/td/data/treatment/VTreatmentTime.cpp + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp + main.cpp +) + +set(QRCS + qml.qrc +) + +if(BUILD_GENERATE_ALARM_MAPPING) + add_custom_target(${PROJECT_NAME}-common ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/common + COMMENT "Git fetching and pulling common" + COMMAND ${GIT_EXECUTABLE} checkout `${GIT_EXECUTABLE} symbolic-ref --short HEAD` && ${GIT_EXECUTABLE} pull + ) + + add_custom_command( + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts + OUTPUT + ${CMAKE_CURRENT_SOURCE_DIR}/sources/model/hd/alarm/MAlarmMapping.cpp + BYPRODUCTS + ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/alarmMapping.err + ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/alarmMapping.log + ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/AlarmMapping.csv + ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/AlarmMapping.py + COMMAND + ./alarmMapping ${CMAKE_CURRENT_SOURCE_DIR}/common ${CMAKE_CURRENT_SOURCE_DIR}/sources/model/hd/alarm + 2> ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/alarmMapping.err + | tee ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/alarmMapping.log + && mv ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts/AlarmMapping.py ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/AlarmMapping.py + && mv ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts/AlarmMapping.csv ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/alarms/AlarmMapping.csv + ) +else() + message("Skipping MAlarmMapping.cpp generation") +endif() + +if(BUILD_CPPCHECK) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/cppcheck) + add_custom_target(${PROJECT_NAME}-cppcheck ALL + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/etc/scripts + BYPRODUCTS + ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/cppcheck/cppcheck.log + ${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/cppcheck/cppcheck.err + COMMENT + "Running static analysis (Cppcheck)" + COMMAND ${CMAKE_COMMAND} -E + env FOLDER_PROJECT=${CMAKE_CURRENT_SOURCE_DIR} + env FOLDER_CPPCHECK=${CMAKE_CURRENT_SOURCE_DIR}/etc/reports/cppcheck + ./cppcheck.sh + ) + add_dependencies(${PROJECT_NAME}-cppcheck ${PROJECT_NAME}-common) +endif() + +qt_add_resources(RCCS ${QRCS}) + +add_executable(${PROJECT_NAME} ${INCLUDES} ${SRCS} ${RCCS}) + +if(BUILD_GENERATE_ALARM_MAPPING) + add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}-common) +endif() + +target_sources(${PROJECT_NAME} PRIVATE ${INCLUDES} ${SRCS}) + +target_compile_definitions( + ${PROJECT_NAME} + PRIVATE $<$,$>:QT_QML_DEBUG> +) + +target_link_libraries( + ${PROJECT_NAME} + PRIVATE + Qt::Core + Qt::Quick + Qt::Widgets + Qt::SerialBus + Qt::Concurrent + Qt::Charts + Qt::Bluetooth +) + +target_include_directories(${PROJECT_NAME} PRIVATE + common + sources + sources/device + sources/storage + sources/canbus + sources/model + sources/model/td + sources/model/td/data + sources/model/td/data/treatment + sources/model/td/alarm + sources/model/td/adjustment + sources/model/td/adjustment/settings + sources/model/td/adjustment/treatment + sources/model/dd + sources/model/dd/data + sources/model/dd/adjustment + sources/model/dd/adjustment/settings + sources/view + sources/view/td + sources/view/td/data + sources/view/td/data/treatment + sources/view/td/adjustment/treatment + sources/view/dd + sources/view/dd/data + sources/view/confirm + sources/view/settings + # + sources/gui + sources/utility + sources/wifi + sources/bluetooth + sources/cloudsync + sources/abstract + sources/model/confirm + sources/model/settings + sources/model/ui/data + sources/model/hd/adjustment + sources/model/hd/adjustment/disinfect + sources/model/hd/adjustment/settings + sources/model/hd/adjustment/pretreatment + sources/model/hd/adjustment/treatment + sources/model/hd/adjustment/posttreatment + sources/model/hd/alarm + sources/model/hd/data + sources/model/hd/data/post + sources/model/hd/data/pretreatment + sources/model/hd/data/treatment + sources/model/hd/data/posttreatment + sources/model/hd/data/treatmentlog + sources/model/dg/data + sources/model/dg/data/post + sources/model/dg/data/pretreatment + sources/model/dg/data/disinfect + sources/model/dg/adjustment + sources/model/dg/adjustment/settings + sources/view/pretreatment + sources/view/ui/data + sources/view/hd/adjustment/common + sources/view/hd/adjustment + sources/view/hd/adjustment/pretreatment + sources/view/hd/adjustment/treatment + sources/view/hd/adjustment/posttreatment + sources/view/hd/adjustment/disinfect + sources/view/hd/alarm + sources/view/hd/data + sources/view/hd/data/post + sources/view/hd/data/pretreatment + sources/view/hd/data/treatment + sources/view/hd/data/posttreatment + sources/view/dg/data + sources/view/dg/data/post + sources/view/dg/data/pretreatment + sources/view/dg/data/disinfect +) + +# check if Doxygen is installed +find_package(Doxygen COMPONENTS dot) +if(DOXYGEN_FOUND AND BUILD_DOC) + add_subdirectory(docs) +elseif(BUILD_DOC) + message("Doxygen needs to be installed to generate the doxygen documentation") +endif(DOXYGEN_FOUND AND BUILD_DOC) + +# build type for instrumented compilation _RELEASE or _DEBUG +if(BUILD_SQUISH_COCO) + # Use "--cs-output" to specify the file the execution report is written to + set(COVERAGE_FLAGS + "--cs-on --cs-count --cs-mcdc --cs-exclude-file-abs-wildcard=*/moc_* --cs-exclude-file-abs-wildcard=*/qrc_* --cs-exclude-path=C:/Qt --cs-compilation-retry=2" + ) + set(CMAKE_CXX_FLAGS_COVERAGE + "${CMAKE_CXX_FLAGS_RELEASE} ${COVERAGE_FLAGS}" + CACHE STRING "Flags used by the C++ compiler during coverage builds." + FORCE) + set(CMAKE_C_FLAGS_COVERAGE + "${CMAKE_C_FLAGS_RELEASE} ${COVERAGE_FLAGS}" + CACHE STRING "Flags used by the C compiler during coverage builds." FORCE) + set(CMAKE_EXE_LINKER_FLAGS_COVERAGE + "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${COVERAGE_FLAGS}" + CACHE STRING "Flags used for linking binaries during coverage builds." + FORCE) + set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE + "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${COVERAGE_FLAGS}" + CACHE STRING "Flags used by the shared libraries linker during coverage builds." + FORCE) + set(CMAKE_STATIC_LINKER_FLAGS_COVERAGE + "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} ${COVERAGE_FLAGS}" + CACHE STRING "Flags used by the static libraries linker during coverage builds." + FORCE) + mark_as_advanced( + CMAKE_CXX_FLAGS_COVERAGE CMAKE_C_FLAGS_COVERAGE + CMAKE_EXE_LINKER_FLAGS_COVERAGE CMAKE_SHARED_LINKER_FLAGS_COVERAGE + CMAKE_STATIC_LINKER_FLAGS_COVERAGE COMPILE_DEFINITIONS_COVERAGE) +endif() + +# dump_cmake_variables() Index: cmake/Debug.cmake =================================================================== diff -u --- cmake/Debug.cmake (revision 0) +++ cmake/Debug.cmake (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) @@ -0,0 +1,15 @@ +# This function is used for debugging and will dump every variable that is set in the cmake context. +function(dump_cmake_variables) + get_cmake_property(_variableNames VARIABLES) + list(SORT _variableNames) + foreach(_variableName ${_variableNames}) + if(ARGV0) + unset(MATCHED) + string(REGEX MATCH ${ARGV0} MATCHED ${_variableName}) + if(NOT MATCHED) + continue() + endif() + endif() + message(STATUS "${_variableName}=${${_variableName}}") + endforeach() +endfunction() Index: qml.qrc =================================================================== diff -u --- qml.qrc (revision 0) +++ qml.qrc (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) @@ -0,0 +1,295 @@ + + + sources/gui/qml/pages/MainStack.qml + sources/gui/qml/pages/MainHome.qml + sources/gui/qml/pages/ManagerStack.qml + sources/gui/qml/pages/UserConfirmation.qml + sources/gui/qml/pages/TreatmentFlowBase.qml + + + sources/gui/qml/pages/settings/SettingsBase.qml + sources/gui/qml/pages/settings/SettingsStack.qml + sources/gui/qml/pages/settings/SettingsHome.qml + sources/gui/qml/pages/settings/SettingsDateTime.qml + sources/gui/qml/pages/settings/SettingsWiFi.qml + sources/gui/qml/pages/settings/SettingsDGCleaning.qml + sources/gui/qml/pages/settings/SettingsDGScheduling.qml + sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml + sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml + sources/gui/qml/pages/settings/SettingsExportLogs.qml + sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml + sources/gui/qml/pages/settings/SettingsInformation.qml + sources/gui/qml/pages/settings/SettingsROInput.qml + sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml + sources/gui/qml/pages/settings/SettingsServicePassword.qml + sources/gui/qml/pages/settings/SettingsManufacturingSetup.qml + sources/gui/qml/pages/settings/SettingsFactoryReset.qml + sources/gui/qml/pages/settings/SettingsDecommission.qml + sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml + sources/gui/qml/pages/settings/SettingsLocalization.qml + + + sources/gui/qml/dialogs/ConfirmDialog.qml + sources/gui/qml/dialogs/AutoHideInfo.qml + sources/gui/qml/dialogs/NotificationDialog.qml + sources/gui/qml/dialogs/AlarmListDialog.qml + sources/gui/qml/dialogs/LockDialog.qml + + + sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml + sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml + sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml + sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml + sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml + + + sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml + sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml + sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml + sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml + + + resources/images/Logo d.png + resources/images/Logo DialityT.png + resources/images/diality-splash.png + resources/images/ArrowRight.png + resources/images/ArrowLeft.png + resources/images/logo d Dark Transparent.png + resources/images/Close.png + resources/images/bell-on.png + resources/images/bell-off.png + resources/images/Back.png + resources/images/PauseDarkBlue.png + resources/images/PauseLightBlue.png + resources/images/PauseGray.png + resources/images/Resume.png + resources/images/Clock-Minus.png + resources/images/Clock-Plus.png + resources/images/Wave-Minus.png + resources/images/Wave-Plus.png + resources/images/check.png + resources/images/chevron-down.png + resources/images/chevron-up.png + resources/images/list.png + resources/images/End.png + resources/images/Accelerate.png + resources/images/Decelerate.png + resources/images/Busy.png + resources/images/BusyDone.png + resources/images/BusyFail.png + resources/images/EjectEnabled.png + resources/images/EjectDisabled.png + resources/images/eye.png + resources/images/Omron-bp7000.png + resources/images/chevron-left.png + resources/images/chevron-right.png + resources/images/DenaliDevice.png + resources/images/edit.png + resources/images/edit-disabled.png + resources/images/Lock.png + resources/images/Prescription.png + resources/images/Settings.png + resources/images/Unlock.png + resources/images/Wifi.png + resources/images/PauseOrange.png + resources/images/arrowsExpanding.png + resources/images/HomeBackground.png + resources/images/Bluetooth.png + resources/images/CloudSync.png + resources/images/Information.png + resources/images/Storage.png + resources/images/help.png + + + sources/gui/qml/components/MainMenu.qml + sources/gui/qml/components/TouchRect.qml + sources/gui/qml/components/TitleText.qml + sources/gui/qml/components/ImageLogoD.qml + sources/gui/qml/components/ScreenItem.qml + sources/gui/qml/components/IconButton.qml + sources/gui/qml/components/StackItem.qml + sources/gui/qml/components/ModalDialog.qml + sources/gui/qml/components/BackButton.qml + sources/gui/qml/components/USBButton.qml + sources/gui/qml/components/ExportButton.qml + sources/gui/qml/components/TouchArea.qml + sources/gui/qml/components/TextRect.qml + sources/gui/qml/components/Background.qml + sources/gui/qml/components/Line.qml + sources/gui/qml/components/PlaceHolderText.qml + sources/gui/qml/components/ProgressBar.qml + sources/gui/qml/components/RangeMarker.qml + sources/gui/qml/components/ProgressRect.qml + sources/gui/qml/components/RangeRect.qml + sources/gui/qml/components/RangeBar.qml + sources/gui/qml/components/Circle.qml + sources/gui/qml/components/StepBullet.qml + sources/gui/qml/components/StepIndicator.qml + sources/gui/qml/components/TimeText.qml + sources/gui/qml/components/ProgressCircle.qml + sources/gui/qml/components/Slider.qml + sources/gui/qml/components/SliderCreateTreatment.qml + sources/gui/qml/components/ConfirmTreatmentTable.qml + sources/gui/qml/components/ConfirmTreatmentSubTable.qml + sources/gui/qml/components/GridSelection.qml + sources/gui/qml/components/ProgressBarEx.qml + sources/gui/qml/components/CloseButton.qml + sources/gui/qml/components/ConfirmButton.qml + sources/gui/qml/components/TickMarks.qml + sources/gui/qml/components/NotificationBar.qml + sources/gui/qml/components/NotificationBarSmall.qml + sources/gui/qml/components/UltrafiltrationButton.qml + sources/gui/qml/components/ImageWave.qml + sources/gui/qml/components/ImageClock.qml + sources/gui/qml/components/ImageLogoDDarkTransparent.qml + sources/gui/qml/components/ConfirmTreatmentTableEntry.qml + sources/gui/qml/components/DebugDataColumn.qml + sources/gui/qml/components/RangeSlider.qml + sources/gui/qml/components/MuteButton.qml + sources/gui/qml/components/ImageText.qml + sources/gui/qml/components/WaitDone.qml + sources/gui/qml/components/TimeCircle.qml + sources/gui/qml/components/Footer.qml + sources/gui/qml/components/TextEntry.qml + sources/gui/qml/components/ScrollBar.qml + sources/gui/qml/components/FooterStatic.qml + sources/gui/qml/components/TimeEntry.qml + sources/gui/qml/components/Label.qml + sources/gui/qml/components/EntryDialog.qml + sources/gui/qml/components/SliderArrows.qml + sources/gui/qml/components/QRCode.qml + sources/gui/qml/components/ContentArea.qml + sources/gui/qml/components/LabelValue.qml + sources/gui/qml/components/ArrowButton.qml + sources/gui/qml/components/HeaderBar.qml + sources/gui/qml/components/HeaderBarPopup.qml + sources/gui/qml/components/AlarmButtonRow.qml + + + sources/gui/qml/compounds/PressureRangeSlider.qml + sources/gui/qml/compounds/StepNavigationTitleBar.qml + sources/gui/qml/compounds/InstructionView.qml + sources/gui/qml/compounds/CheckListView.qml + sources/gui/qml/compounds/TouchGrid.qml + sources/gui/qml/compounds/BPHREntry.qml + + + qtquickcontrols2.conf + sources/gui/qml/main.qml + sources/gui/qml/AlarmItem.qml + sources/gui/qml/PowerItem.qml + sources/gui/qml/KeyboardItem.qml + sources/gui/qml/SDCProgressItem.qml + sources/gui/qml/USBProgressItem.qml + + + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/backspace.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/check.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/enter.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/globe.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/handwriting.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/hidekeyboard.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/search.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/selectionhandle.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-normal.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-active.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-capslock.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/textmode.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/style.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/dialpad.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/digits.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/handwriting.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/main.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/numbers.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/symbols.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/dialpad.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/digits.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/handwriting.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/main.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/numbers.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/symbols.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/dialpad.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/digits.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/handwriting.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/main.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/numbers.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml + + + sources/gui/qml/globals/Variables.qml + sources/gui/qml/globals/Colors.qml + sources/gui/qml/globals/qmldir + sources/gui/qml/globals/Fonts.qml + + + sources/gui/qml/pages/disinfect/DisinfectBase.qml + sources/gui/qml/pages/disinfect/DisinfectStack.qml + + + sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml + sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml + + + sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml + sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml + sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml + + + sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml + sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml + + + sources/gui/qml/pages/treatment/TreatmentStack.qml + sources/gui/qml/pages/treatment/TreatmentHome.qml + sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml + sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml + sources/gui/qml/pages/treatment/TreatmentSection.qml + sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml + + + sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml + sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml + sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml + sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml + sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml + sources/gui/qml/pages/treatment/sections/TreatmentTime.qml + sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml + sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml + sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml + sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml + + + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml + + + sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml + sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml + sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml + sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml + + + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml + + + + + sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml + sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml + sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml + + Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -re21748fb21b8c964e51bb2f4be7faf699d30a057 --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) @@ -995,6 +995,7 @@ switch(_device->state()) { case QLowEnergyController::ConnectingState : SKIPPER_TRY; + Q_FALLTHROUGH(); // FALLTHROUGH case QLowEnergyController::DiscoveredState : Index: sources/storage/FileHandler.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -re21748fb21b8c964e51bb2f4be7faf699d30a057 --- sources/storage/FileHandler.h (.../FileHandler.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/storage/FileHandler.h (.../FileHandler.h) (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) @@ -97,7 +97,7 @@ QFile dstFile = QFile (vDestination + vFileName); qint64 totalSize = 0; qint64 copySize = 0; - quint32 chunkSize = 1024 * 2; + const quint32 chunkSize = 1024 * 2; bool createFolder = true; static quint8 mO_CopyPercent = 0; quint8 mC_CopyPercent = 0; Index: sources/storage/Settings.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -re21748fb21b8c964e51bb2f4be7faf699d30a057 --- sources/storage/Settings.h (.../Settings.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/storage/Settings.h (.../Settings.h) (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) @@ -101,7 +101,7 @@ if ( settingsError_Message.contains(vErr) ) { if ( ! vArg1.isEmpty() ) return QString(settingsError_Message[vErr]).arg(vArg1); if ( ! vArg2.isEmpty() ) return QString(settingsError_Message[vErr]).arg(vArg1).arg(vArg2); - /* default */ return QString(settingsError_Message[vErr]); + /* default */ return QString(settingsError_Message[vErr]); } return "[unknown]"; }