Index: denali.pro =================================================================== diff -u -rf7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89 -r213ca3711cd2ea573946055137532abfb55f908b --- denali.pro (.../denali.pro) (revision f7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89) +++ denali.pro (.../denali.pro) (revision 213ca3711cd2ea573946055137532abfb55f908b) @@ -411,7 +411,7 @@ # 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 += Index: denali.pro.user =================================================================== diff -u -radf89000bad1a50ec33114ea76d65621a1d351d5 -r213ca3711cd2ea573946055137532abfb55f908b --- denali.pro.user (.../denali.pro.user) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) +++ denali.pro.user (.../denali.pro.user) (revision 213ca3711cd2ea573946055137532abfb55f908b) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 1 0 0 @@ -1176,7 +1176,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - -q + 3768 false true @@ -1185,7 +1185,7 @@ false true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release 1 @@ -1196,7 +1196,7 @@ Qt 5.12.5 (iMX8) Qt 5.12.5 (iMX8) {5d6458ef-f917-4aef-a092-c77bbe106149} - 1 + 0 0 0 @@ -1492,7 +1492,77 @@ :0 - 1 + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 1 + + + denali (on UI Test Board) + RemoteLinuxRunConfiguration:/home/denali/Projects/application/denali.pro + 1 + + false + + 3768 + false + true + false + false + true + false + + + :0 + + 2 Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -rbfde9964a92b954e7da925e0d04e797a225a5352 -r213ca3711cd2ea573946055137532abfb55f908b --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision bfde9964a92b954e7da925e0d04e797a225a5352) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 213ca3711cd2ea573946055137532abfb55f908b) @@ -370,20 +370,21 @@ mData += vData.bloodFlowRate ; mData += vData.dialysateFlowRate ; mData += vData.duration ; - mData += vData.heparinDispensingRate ; - mData += vData.heparinBolusVolume ; mData += vData.heparinStopTime ; mData += vData.salineBolus ; mData += vData.acidConcentrate ; mData += vData.bicarbonateConcentrate ; mData += vData.dialyzerType ; - mData += vData.dialysateTemp ; + mData += vData.bloodPressureMeasureInterval ; + mData += vData.rinsebackFlowRate ; mData += vData.arterialPressureLimitLow ; mData += vData.arterialPressureLimitHigh ; mData += vData.venousPressureLimitLow ; mData += vData.venousPressureLimitHigh ; - mData += vData.bloodPressureMeasureInterval ; - mData += vData.rinsebackFlowRate ; + mData += vData.heparinDispensingRate ; + mData += vData.heparinBolusVolume ; + mData += vData.dialysateTemp ; + onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData); }