Index: denali.qrc
===================================================================
diff -u -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 -raf0eb3014623933ce3cffac481477d11b3b9c5b5
--- denali.qrc (.../denali.qrc) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
+++ denali.qrc (.../denali.qrc) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -244,6 +244,7 @@
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/EndTreatmentRinsebaReconnect.qml
Index: sources/ApplicationController.cpp
===================================================================
diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -raf0eb3014623933ce3cffac481477d11b3b9c5b5
--- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803)
+++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -623,7 +623,11 @@
/// in manufacturing mode the configurations must reside in /root/home
/// therefore the settings can be initialized after POST.
+#ifdef BUILD_FOR_DESKTOP
+ initSettings();
+#else
if ( gEnableManufacturing ) initSettings();
+#endif
}
void ApplicationController::onQuitApplication()
Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -raf0eb3014623933ce3cffac481477d11b3b9c5b5
--- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803)
+++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -233,8 +233,10 @@
*/
void DeviceController::timerEvent(QTimerEvent *)
{
+#ifdef BUILD_FOR_TARGET
usbCheck();
sdcardSpaceCheck();
+#endif
}
/*!
@@ -863,8 +865,6 @@
/// also for in manufacturing the partition is being set up
/// and is less steps for setup if the partition is not mounted.
if ( gEnableManufacturing ) return;
-
-
if ( ! ( _hasThread && _hasSalt ) ) return;
DeviceCryptSetupRequestData data;
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
===================================================================
diff -u -rbb93d05bea8defa9ff689ceda63d03e5233da855 -raf0eb3014623933ce3cffac481477d11b3b9c5b5
--- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision bb93d05bea8defa9ff689ceda63d03e5233da855)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -84,6 +84,7 @@
}
}
+
// Disconnect
RecirculateBase { id: _recirculateDisconnect
title.text : qsTr("Recirculate Disconnect")
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
===================================================================
diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -raf0eb3014623933ce3cffac481477d11b3b9c5b5
--- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -37,6 +37,7 @@
EndTreatmentRinseback { id: _endTreatmentRinseback }
EndTreatmentRinsebackComplete { id: _endTreatmentRinsebackComplete }
EndTreatmentAdditional { id: _endTreatmentAdditional }
+ EndTreatmentRinsebackReconnect { id: _endTreatmentRinsebackReconnect }
Connections { target: _endTreatmentRinsebackInit
function onRinsebackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doStart ()} //82.0
@@ -56,13 +57,19 @@
function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doConfirm ()} //82.7
function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8
}
+ Connections { target: _endTreatmentRinsebackReconnect
+ function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doResume ()} //82.4
+ function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9
+ function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8
+ }
Connections { target: vHDTreatmentStates
function onRbInitChanged ( vValue ) { page( _endTreatmentRinsebackInit , vValue )}
function onRbRunChanged ( vValue ) { page( _endTreatmentRinseback , vValue )}
function onRbPausedChanged ( vValue ) { page( _endTreatmentRinseback , vValue )}
function onRbStopChanged ( vValue ) { page( _endTreatmentRinsebackComplete , vValue )}
function onRbAdditionalChanged ( vValue ) { page( _endTreatmentAdditional , vValue )}
+ function onRbReconnectChanged ( vValue ) { page( _endTreatmentRinsebackReconnect , vValue )}
}
Connections { target: vTreatmentAdjustmentRinseback
@@ -74,6 +81,7 @@
_endTreatmentRinsebackInit .reasonText = vTreatmentAdjustmentRinseback.text();
_endTreatmentRinseback .reasonText = vTreatmentAdjustmentRinseback.text();
_endTreatmentRinsebackComplete .reasonText = vTreatmentAdjustmentRinseback.text();
+ _endTreatmentRinsebackReconnect .reasonText = vTreatmentAdjustmentRinseback.text();
}
}
}
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebaReconnect.qml
===================================================================
diff -u
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebaReconnect.qml (revision 0)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebaReconnect.qml (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -0,0 +1,66 @@
+/*!
+ *
+ * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file EndTreatmentRinsebackReconnect.qml
+ * \author (last) Behrouz NematiPour
+ * \date (last) 19-July-2023
+ * \author (original) Behrouz NematiPour
+ * \date (original) 19-July-2023
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/pages/endtreatment"
+
+/*!
+ * \brief the end treatment rinseback reconnect screen
+ */
+EndTreatmentBase { id: _root
+ objectName: "_EndTreatmentRinsebackReconnect"
+
+ signal treatmentBackClicked ()
+ signal treatmentEndClicked ()
+
+ title.text : qsTr("Rinseback Reconnect")
+ instructionBased : true
+
+ header.confirmEnabled : true
+ header.confirmVisible : vTreatmentTime .time_IsLeft
+
+ header.backEnabled : true
+ header.backVisible : vTreatmentTime .time_IsLeft
+ onBackClicked : treatmentBackClicked()
+
+ hasTimeout : vTreatmentRinseback .timeoutTotal
+ timeoutValue : vTreatmentRinseback .timeoutCountDown * 60
+
+ footer {
+ width : parent.width
+ height : Variables.touchRectHeight
+ }
+
+ FooterStatic {
+ childrenWidth : 300
+ anchors.fill : footer
+ children : [
+
+ TouchRect { id : _endTreatmentTouchRect
+ visible : true // after the rinseback complete user can always end the treatment, regardless of incomplete or compeleted treatment
+ text.text : qsTr("END TREATMENT")
+ isDefault : ! vTreatmentTime .time_IsLeft
+ onClicked : treatmentEndClicked()
+ },
+ Item {},
+ Item {}
+ ]
+ }
+}
Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
===================================================================
diff -u -re6751c7048908beab6a5572041bef62feaa4662f -raf0eb3014623933ce3cffac481477d11b3b9c5b5
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision e6751c7048908beab6a5572041bef62feaa4662f)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -150,12 +150,14 @@
ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE )
ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_STOP_STATE )
ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE )
+ ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE )
ENUM_CHECK_C( GuiRinsebackStates, NUM_OF_RINSEBACK_STATES ) }
ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE , rbInit );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_STATE , rbRun );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE , rbPaused );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_STATE , rbStop );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE , rbAdditional );
+ ENUM_READ ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE , rbReconnect );
}
txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to.
Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h
===================================================================
diff -u -re6751c7048908beab6a5572041bef62feaa4662f -raf0eb3014623933ce3cffac481477d11b3b9c5b5
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision e6751c7048908beab6a5572041bef62feaa4662f)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5)
@@ -102,6 +102,7 @@
PROPERTY( bool , rbPaused , false) ///< RINSEBACK_PAUSED_STATE = 2 # Rinseback paused state of the rinseback sub-mode state machine
PROPERTY( bool , rbStop , false) ///< RINSEBACK_STOP_STATE = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine
PROPERTY( bool , rbAdditional , false) ///< RINSEBACK_RUN_ADDITIONAL_STATE = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
+ PROPERTY( bool , rbReconnect , false) ///< RINSEBACK_RECONNECT_PATIENT_STATE = 5 # Rinseback reconnect state of the rinseback sub-mode state machine
// Recirculate states
PROPERTY( bool , rcDisconnect , true ) ///< TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine