Index: cr_objectives.sh =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- cr_objectives.sh (.../cr_objectives.sh) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ cr_objectives.sh (.../cr_objectives.sh) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -15,5 +15,9 @@ # ############################################################################ branch=$1 -git log $branch..HEAD --pretty=format:"commit : [%h|http://192.168.10.132:7990/projects/UI/repos/application/commits/%h] - %B" --no-merges +git -C /home/denali/Projects/application/ \ + log $branch..HEAD \ + --pretty=format:"commit : [%h|http://192.168.10.132:7990/projects/UI/repos/application/commits/%h] - %B" \ + --no-merges \ + | grep -v "Bamboo Commit:" Index: denali.pro.user =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- denali.pro.user (.../denali.pro.user) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ denali.pro.user (.../denali.pro.user) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -97,7 +97,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 @@ -447,7 +447,7 @@ QtProjectManager.QMakeBuildStep false - true + false false false @@ -1230,7 +1230,7 @@ true false - /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 Index: sources/device/DeviceController.cpp =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -325,6 +325,9 @@ quint8 mPercent = 0; mCIsReady = driveSpaceCheck(Storage::USB_Mount_Point, mCTotal, mCAvailable, &mCIsReadOnly); +#if BUILD_FOR_DESKTOP + mCIsReady = true; // it is set to always true since on desktop a local folder is used for the USB folder which doesn't need (un)mount. +#endif if (mOIsReadOnly != mCIsReadOnly || mOIsReady != mCIsReady || ! mInitialized ) { mOIsReadOnly = mCIsReadOnly; mOIsReady = mCIsReady; Index: sources/gui/GuiView.h =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/gui/GuiView.h (.../GuiView.h) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/gui/GuiView.h (.../GuiView.h) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -52,7 +52,7 @@ PROPERTY(bool , sdIsLow , false ) // this property will be set if the sd-card space gets lower than required amount in percent that has been defined in DeviceController. - PROPERTY(qint8 , sdTooLowPecent, -1) // -1 means the event never happened + PROPERTY(qint8 , sdTooLowPecent, -1 ) // -1 means the event never happened // disabled coco end #ifdef BUILD_FOR_DESKTOP Index: sources/gui/qml/components/StackItem.qml =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -82,8 +82,9 @@ * \brief pushes the screen vScreen on the top of the stack */ function push (vScreen) { + if ( vScreen === undefined || vScreen === null ) return if ( _stackView.currentItem === vScreen) { - console.debug("same current screen didn't push" , vScreen.name) + console.debug("same current screen didn't push" , vScreen) } else { _stackView.push(vScreen) Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -36,7 +36,7 @@ StackItem { id : _root // DEBUG: this property can mostly be used for debugging to get pass the initial screen - property var initialItem: _initialModeScreen // _mainHome + property var initialItem: _postModeScreen // _mainHome stackView.initialItem : _root.initialItem @@ -73,11 +73,11 @@ onVisibleChanged: if (visible) _mainMenu.hidden = true } - ScreenItem { id: _initialModeScreen + ScreenItem { id: _postModeScreen onVisibleChanged: if (visible) _mainMenu.hidden = true Image { id: _dialityLogo Behavior on opacity { OpacityAnimator { duration: 1000 } } - opacity : _initialModeScreen.visible ? 1 : 0 + opacity : _postModeScreen.visible ? 1 : 0 anchors.centerIn: parent source : "qrc:/images/iLogoDiality" } @@ -110,7 +110,7 @@ // So we can show that POST has completed fail : ! vHDPOSTData.doneResult done : vHDPOSTData.done - pause : ! _initialModeScreen.visible + pause : ! _postModeScreen.visible } } @@ -129,9 +129,9 @@ onIsManagerChanged : { if( visManager ) _mainMenu.isManager () } onIsSettingsChanged : { if( visSettings ) _mainMenu.isSettings () } - onFaultChanged : { page( _faultModeScreen , vfault )} // may needed later. + onFaultChanged : { page( _faultModeScreen , vfault )} onServiceChanged : { page( _serviceModeScreen , vservice )} - onInitChanged : { page( _initialModeScreen , vinit ) + onInitChanged : { page( _postModeScreen , vinit ) if ( vinit ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run } @@ -159,7 +159,6 @@ vTreatmentVitals.doTimerStop() vTreatmentVitals.doReset() } - } } Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -276,7 +276,11 @@ Connections { target: vHDOperationMode onServiceChanged : { push( _settingsHome , vservice ) serviceMode = vservice - _mainMenu.hidden = vservice + if ( vservice ) + _mainMenu.hidden = true + else + if ( _settingsHome.visible ) + _mainMenu.hidden = false } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 27-Jun-2022 + * \date (last) 29-Jun-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -43,8 +43,8 @@ /*0007*/case GuiAlarmID::ALARM_ID_HD_RTC_BATTERY_LOW : { result = QObject::tr("HD RTC battery low." ); break; } /* 7*/ /*0008*/case GuiAlarmID::ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE : { result = QObject::tr("HD accelerometer failed POST." ); break; } /* 8*/ /*0009*/case GuiAlarmID::ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE : { result = QObject::tr("DG accelerometer failed POST." ); break; } /* 9*/ -/*0010*/case GuiAlarmID::ALARM_ID__AVAILABLE_2 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 10*/ -/*0011*/case GuiAlarmID::ALARM_ID__AVAILABLE_11 : { result = QObject::tr("Alarm ID available for use." ); break; } /* 11*/ +/*0010*/case GuiAlarmID::ALARM_ID_HD_BLOOD_LEAK_FAULT : { result = QObject::tr("Alarm ID available for use." ); break; } /* 10*/ +/*0011*/case GuiAlarmID::ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE : { result = QObject::tr("Alarm ID available for use." ); break; } /* 11*/ /*0012*/case GuiAlarmID::ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("HD firmware image integrity POST test failed." ); break; } /* 12*/ /*0013*/case GuiAlarmID::ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED : { result = QObject::tr("DG firmware image integrity POST test failed." ); break; } /* 13*/ /*0014*/case GuiAlarmID::ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION : { result = QObject::tr("HD blood flow invalid calibration." ); break; } /* 14*/ Index: sources/view/hd/data/VHDOperationModeData.cpp =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3caffb866d4c84ac6282dcd36fc2d8f7cad9584d --- sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision 3caffb866d4c84ac6282dcd36fc2d8f7cad9584d) @@ -43,9 +43,9 @@ standbyDGDisinfectChemical ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE ); } - isTreatment ( ! _service ); + // isTreatment ( ! _service ); // if enabled goes to home, fault from service, which shouldn't since the service is dead end. Maybe later investigate more when fault enabled. isSettings ( _service ); - isManager ( false ); // Always false, not used/implemented for now. + // isManager ( false ); // Always false, not used/implemented for now. // Go to home is kind of tricky and needs to be managed here in the backend. // It seems we need more states.