Index: denali.pro =================================================================== diff -u -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 -r757a01c42a7a611704a67869a74c68f53edab20f --- denali.pro (.../denali.pro) (revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1) +++ denali.pro (.../denali.pro) (revision 757a01c42a7a611704a67869a74c68f53edab20f) @@ -1,4 +1,4 @@ -QT += widgets qml quick serialbus concurrent +QT += widgets qml quick serialbus concurrent bluetooth CONFIG += c++17 warn_on QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii and .s files @@ -14,14 +14,22 @@ DEFINES += DISABLE_KEEP_ALIVE } -DEFINES += "\"QT_MESSAGE_PATTERN=[%{type}] (%{file}:%{line}) - %{message}\"" - # The following define makes your compiler emit warnings if you use # any Qt feature that has been marked deprecated (the exact warnings # depend on your compiler). Refer to the documentation for the # deprecated API to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS +linux-g++ { + message("Building for desktop") + DEFINES += BUILD_FOR_DESKTOP +} + +linux-oe-generic-g++ { + message("Building for target") + DEFINES += BUILD_FOR_TARGET +} + # You can also make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. @@ -33,6 +41,7 @@ sources/storage \ sources/gui \ sources/canbus \ + sources/bluetooth \ sources/utility \ sources/abstract \ sources/model \ @@ -42,6 +51,7 @@ sources/model/dg/data \ sources/view \ sources/view/hd/adjustment \ + sources/view/hd/alarm \ sources/view/hd/data \ sources/view/dg/data @@ -52,38 +62,37 @@ common/HDDefs.h \ common/MsgDefs.h \ \ # Main - sources/VTreatmentBegin.h \ sources/main.h \ - sources/model/MEndTreatmentResponse.h \ - sources/model/MStartTreatmentResponse.h \ - sources/model/hd/data/MPrimingData.h \ - sources/model/MTreatmentParameters.h \ - sources/model/MTreatmentParametersResp.h \ - sources/storage/filesaver.h \ - sources/model/MDGDebugText.h \ - sources/model/MHDDebugText.h \ - sources/storage/DriveWatcher.h \ - sources/threads.h \ - sources/maintimer.h \ - sources/applicationpost.h \ + sources/Threads.h \ + sources/MainTimer.h \ + sources/ApplicationPost.h \ \ # Controllers - sources/applicationcontroller.h \ + sources/ApplicationController.h \ \ # ---------- Models ---------- sources/model/MModel.h \ sources/model/MAbstract.h \ sources/model/MPowerOff.h \ + sources/model/MEndTreatmentResponse.h \ + sources/model/MStartTreatmentResponse.h \ + sources/model/MTreatmentParametersResp.h \ + sources/model/MDGDebugText.h \ + sources/model/MHDDebugText.h \ \ # ---------- Models - Alarm - sources/model/hd/alarm/MAlarmCleared.h \ - sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmStatusData.h \ + sources/model/hd/alarm/MAlarmTriggered.h \ + sources/model/hd/alarm/MAlarmCleared.h \ + sources/model/hd/alarm/MAlarmClearedCondition.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ @@ -93,6 +102,8 @@ sources/model/hd/data/MTreatmentStatesData.h \ sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ + sources/model/hd/data/MTreatmentHeparinData.h \ + sources/model/hd/data/MPrimingData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -104,44 +115,56 @@ sources/model/dg/data/MDGTemperaturesData.h \ sources/model/dg/data/MDGValvesStatesData.h \ \ # CANBus - sources/canbus/caninterface.h \ - sources/canbus/frameinterface.h \ + 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 \ + sources/canbus/MessageGlobals.h \ + sources/canbus/MessageAcknowModel.h \ + sources/canbus/MessageBuilder.h \ + sources/canbus/MessageInterpreter.h \ + sources/canbus/MessageDispatcher.h \ + \ # Bluetooth + sources/bluetooth/BLEScanner.h \ \ # Gui - sources/gui/guiglobals.h \ - sources/gui/guiview.h \ - sources/gui/guicontroller.h \ + sources/gui/GuiGlobals.h \ + sources/gui/GuiView.h \ + sources/gui/GuiController.h \ \ # ---------- Views ---------- + sources/view/VAlert.h \ + sources/view/VBluetooth.h \ + sources/view/VBluetoothDeviceInfo.h \ sources/view/VTreatmentCreate.h \ + sources/view/VTreatmentEnd.h \ + sources/view/VTreatmentBegin.h \ sources/view/VEventSpy.h \ - sources/view/hd/data/VHDTreatmentStatesData.h \ - sources/view/vview.h \ - sources/view/vpoweroff.h \ - \ # ---------- Views - Alarm - sources/view/valarmstatus.h \ + sources/view/VView.h \ + sources/view/VPowerOff.h \ sources/view/VPriming.h \ + sources/view/VVitals.h \ + \ # ---------- Views - Alarm + sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/vtreatmentadjustmentresponsebase.h \ - sources/view/vtreatmentadjustmentduration.h \ - sources/view/vtreatmentadjustmentflows.h \ - sources/view/vtreatmentadjustmentultrafiltrationstate.h \ - sources/view/vtreatmentadjustmentultrafiltrationedit.h \ - sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Data - sources/view/vtreatmenttime.h \ - sources/view/vtreatmentbloodflow.h \ - sources/view/vtreatmentdialysateflow.h \ - sources/view/vtreatmentultrafiltration.h \ - sources/view/vtreatmentranges.h \ - sources/view/vtreatmentpressureocclusion.h \ + sources/view/hd/data/VTreatmentTime.h \ + sources/view/hd/data/VTreatmentBloodFlow.h \ + sources/view/hd/data/VTreatmentDialysateFlow.h \ + sources/view/hd/data/VTreatmentUltrafiltration.h \ + sources/view/hd/data/VTreatmentRanges.h \ + sources/view/hd/data/VTreatmentPressureOcclusion.h \ sources/view/hd/data/VHDOperationModeData.h \ sources/view/hd/data/VTreatmentSalineData.h \ + sources/view/hd/data/VTreatmentHeparinData.h \ + sources/view/hd/data/VHDTreatmentStatesData.h \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.h \ sources/view/dg/data/VDGHeatersData.h \ @@ -153,9 +176,11 @@ sources/view/dg/data/VDGTemperaturesData.h \ sources/view/dg/data/VDGValvesStatesData.h \ \ # Storage - sources/storage/storageglobals.h \ - sources/storage/filehandler.h \ - sources/storage/logger.h \ + sources/storage/StorageGlobals.h \ + sources/storage/Logger.h \ + sources/storage/FileHandler.h \ + sources/storage/FileSaver.h \ + sources/storage/DriveWatcher.h \ \ # Utility sources/utility/crc.h \ sources/utility/format.h \ @@ -168,35 +193,34 @@ \ # common \ # Main main.cpp \ - sources/VTreatmentBegin.cpp \ - sources/model/MEndTreatmentResponse.cpp \ - sources/model/MStartTreatmentResponse.cpp \ - sources/model/hd/data/MPrimingData.cpp \ - sources/model/MTreatmentParameters.cpp \ - sources/model/MTreatmentParametersResp.cpp \ - sources/storage/filesaver.cpp \ - sources/model/MDGDebugText.cpp \ - sources/model/MHDDebugText.cpp \ - sources/storage/DriveWatcher.cpp \ - sources/threads.cpp \ - sources/maintimer.cpp \ - sources/applicationpost.cpp \ + sources/Threads.cpp \ + sources/MainTimer.cpp \ + sources/ApplicationPost.cpp \ \ # Controllers - sources/applicationcontroller.cpp \ + sources/ApplicationController.cpp \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ sources/model/MPowerOff.cpp \ + sources/model/MHDDebugText.cpp \ + sources/model/MEndTreatmentResponse.cpp \ + sources/model/MStartTreatmentResponse.cpp \ + sources/model/MTreatmentParametersResp.cpp \ + sources/model/MDGDebugText.cpp \ \ # ---------- Models - Alarm - sources/model/hd/alarm/MAlarmCleared.cpp \ - sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmStatusData.cpp \ + sources/model/hd/alarm/MAlarmTriggered.cpp \ + sources/model/hd/alarm/MAlarmCleared.cpp \ + sources/model/hd/alarm/MAlarmClearedCondition.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.cpp \ sources/model/hd/data/MTreatmentFlowsData.cpp \ @@ -206,6 +230,8 @@ sources/model/hd/data/MTreatmentStatesData.cpp \ sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentSalineData.cpp \ + sources/model/hd/data/MTreatmentHeparinData.cpp \ + sources/model/hd/data/MPrimingData.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ @@ -217,42 +243,54 @@ sources/model/dg/data/MDGTemperaturesData.cpp \ sources/model/dg/data/MDGValvesStatesData.cpp \ \ # CANBus - sources/canbus/caninterface.cpp \ - sources/canbus/frameinterface.cpp \ + 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 \ + sources/canbus/MessageAcknowModel.cpp \ + sources/canbus/MessageBuilder.cpp \ + sources/canbus/MessageDispatcher.cpp \ + sources/canbus/MessageInterpreter.cpp \ + \ # Bluetooth + sources/bluetooth/BLEScanner.cpp \ \ # Gui - sources/gui/guiglobals.cpp \ - sources/gui/guiview.cpp \ - sources/gui/guicontroller.cpp \ + sources/gui/GuiGlobals.cpp \ + sources/gui/GuiView.cpp \ + sources/gui/GuiController.cpp \ \ # ---------- Views ---------- + sources/view/VAlert.cpp \ + sources/view/VBluetooth.cpp \ + sources/view/VBluetoothDeviceInfo.cpp \ sources/view/VTreatmentCreate.cpp \ + sources/view/VTreatmentEnd.cpp \ + sources/view/VTreatmentBegin.cpp \ sources/view/VEventSpy.cpp \ - sources/view/hd/data/VHDTreatmentStatesData.cpp \ - sources/view/vpoweroff.cpp \ sources/view/VPriming.cpp \ + sources/view/VPowerOff.cpp \ + sources/view/VVitals.cpp \ \ # ---------- Views - Alarm - sources/view/valarmstatus.cpp \ + sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/vtreatmentadjustmentresponsebase.cpp \ - sources/view/vtreatmentadjustmentduration.cpp \ - sources/view/vtreatmentadjustmentflows.cpp \ - sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \ - sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \ - sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Data - sources/view/vtreatmenttime.cpp \ - sources/view/vtreatmentbloodflow.cpp \ - sources/view/vtreatmentdialysateflow.cpp \ - sources/view/vtreatmentultrafiltration.cpp \ - sources/view/vtreatmentranges.cpp \ - sources/view/vtreatmentpressureocclusion.cpp \ + sources/view/hd/data/VTreatmentTime.cpp \ + sources/view/hd/data/VTreatmentBloodFlow.cpp \ + sources/view/hd/data/VTreatmentDialysateFlow.cpp \ + sources/view/hd/data/VTreatmentUltrafiltration.cpp \ + sources/view/hd/data/VTreatmentRanges.cpp \ + sources/view/hd/data/VTreatmentPressureOcclusion.cpp \ sources/view/hd/data/VHDOperationModeData.cpp \ sources/view/hd/data/VTreatmentSalineData.cpp \ + sources/view/hd/data/VTreatmentHeparinData.cpp \ + sources/view/hd/data/VHDTreatmentStatesData.cpp \ \ # ---------- Views - DG - Data sources/view/dg/data/VDGDrainPumpData.cpp \ sources/view/dg/data/VDGHeatersData.cpp \ @@ -264,9 +302,11 @@ sources/view/dg/data/VDGTemperaturesData.cpp \ sources/view/dg/data/VDGValvesStatesData.cpp \ \ # Storage - sources/storage/storageglobals.cpp \ - sources/storage/filehandler.cpp \ - sources/storage/logger.cpp \ + sources/storage/StorageGlobals.cpp \ + sources/storage/FileHandler.cpp \ + sources/storage/Logger.cpp \ + sources/storage/DriveWatcher.cpp \ + sources/storage/FileSaver.cpp \ \ # Utility sources/utility/crc.cpp \ sources/utility/format.cpp \ @@ -281,11 +321,9 @@ VER_MINOR="\\\"${minorVersion}\\\"" \ VER_MICRO="\\\"${microVersion}\\\"" \ VER_REVIS="\\\"${buildNumber}\\\"" \ - VER_MAJOR_DEV=\\\"0\\\" \ - VER_MINOR_DEV=\\\"0\\\" \ - VER_MICRO_DEV=\\\"0\\\" \ VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\" \ - VER_APPLY=\\\"$$system( touch -m main.cpp)\\\" + VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ + VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\" CodeCoverage { message(Building with Squish Coco) @@ -413,7 +451,8 @@ # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin +else: unix:!android: target.path = /home/root !isEmpty(target.path): INSTALLS += target -DISTFILES += +DISTFILES += \ + README.md