Index: denali.pro.user =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -r8ec5969db5d688c89ff99a4911112da53e0a9408 --- denali.pro.user (.../denali.pro.user) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ denali.pro.user (.../denali.pro.user) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings Index: scripts/run.sh =================================================================== diff -u -rf92b8ac7ec04a5d4e6d33d6ae810bb3a8cb8ff59 -r8ec5969db5d688c89ff99a4911112da53e0a9408 --- scripts/run.sh (.../run.sh) (revision f92b8ac7ec04a5d4e6d33d6ae810bb3a8cb8ff59) +++ scripts/run.sh (.../run.sh) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) @@ -70,10 +70,13 @@ # echo ":: candump launched" #fi -#launching denali application, disable keep-alive -$HOME/denali -u 2>> $HOME/filesystem.err & - # setup bluetooth +mkdir -p "$SDCARD_MNT/treatment" +sleep 5 killall connmand /usr/share/silex-uart/silex-uart.sh start hciconfig hci0 up + +#launching denali application, disable keep-alive +$HOME/denali -u 2>> $HOME/filesystem.err & + Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -r8ec5969db5d688c89ff99a4911112da53e0a9408 --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) @@ -418,7 +418,7 @@ onReleased: { vTreatmentCreate.bloodPressureMeasureInterval = value vVitals.doUpdateBPMeasureInterval(value) - _flickable.setInteractive(true) + setInteractive(true) } } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -r8ec5969db5d688c89ff99a4911112da53e0a9408 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) @@ -130,10 +130,7 @@ TreatmentBegin { id: _treatmentBegin onBackClicked : {vTreatmentCreate.doRequestPop() } - onStartClicked : { - vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.volume) - vTreatmentBegin.doStartTreatment() - } + onStartClicked : { vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.ufVolume) } } //// Treatment Adjustment Dialogs @@ -244,7 +241,7 @@ _treatmentBegin.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume // but only if it has been accepted it will navigate if (vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted) { - vTreatmentCreate.doStartTreatment() + vTreatmentBegin.doStartTreatment() } else { _treatmentBegin.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text()