Index: denali.pro.user =================================================================== diff -u -r2fcd1a1722285e5e741b89176ad21989eb0f56f5 -r583d1953c783940c93f22c37b23daadb1ff3a09c --- denali.pro.user (.../denali.pro.user) (revision 2fcd1a1722285e5e741b89176ad21989eb0f56f5) +++ denali.pro.user (.../denali.pro.user) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings Index: sources/MainTimer.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r583d1953c783940c93f22c37b23daadb1ff3a09c --- sources/MainTimer.cpp (.../MainTimer.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/MainTimer.cpp (.../MainTimer.cpp) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -115,7 +115,9 @@ */ void MainTimer::timerEvent(QTimerEvent *) { +#ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG emit didTimeout(); +#endif // I'm not sure how often we need to check for this. // if it needs to be checked each second pass true // if it needs to be checked each day pass false Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -r583d1953c783940c93f22c37b23daadb1ff3a09c --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -618,7 +618,9 @@ bool mNeedsAcknow = needsAcknow(vActionId); if (mNeedsAcknow) { mSequence = -mSequence; + #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG LOG_EVENT(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); + #endif #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence); #endif @@ -696,7 +698,9 @@ GuiActionType mActionId = vMessage.actionId; switch (mActionId) { case GuiActionType::ID_Acknow: + #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG LOG_EVENT(tr("HD,Ack Bak, Sq:%1").arg(mSequence)); + #endif #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); #endif @@ -705,13 +709,17 @@ default: if (mSequence < 0) { + #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG LOG_EVENT(tr("HD,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(mActionId))); + #endif #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); #endif // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak is immediately handled at the same place. actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence); + #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG LOG_EVENT(tr("UI,Ack Bak, Sq:%1").arg(-mSequence)); + #endif #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId); #endif Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -r583d1953c783940c93f22c37b23daadb1ff3a09c --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -161,7 +161,7 @@ // ---- {Gui::GuiActionType::ID_AdjustHeparinReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustHeparinRsp , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustHeparinRsp , 2 * 4 }, // 3 parameters each 4bytes // ---- Rinseback {Gui::GuiActionType::ID_AdjustRinsebackReq , 1 * 4 }, // 1 parameter each 4bytes Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r583d1953c783940c93f22c37b23daadb1ff3a09c --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -27,6 +27,9 @@ */ TouchArea { id: _root property string buttonText : "" + property alias buttonEnabled : _startFluidButton.enabled + + property bool cumulativeVisible : true property bool targetVisible : true property bool progressBarVisible : true @@ -47,7 +50,6 @@ title: qsTr("FLUID MANAGEMENT") TouchRect { id: _startFluidButton - enabled : _root.isTouchable y : 45 width : 340 height : 55 Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml =================================================================== diff -u -r6581def57942b1c1ef56a2f2feb74559946517b9 -r583d1953c783940c93f22c37b23daadb1ff3a09c --- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 6581def57942b1c1ef56a2f2feb74559946517b9) +++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -42,35 +42,38 @@ readonly property string textPause : qsTr("PAUSE DELIVERY") readonly property string textResume : qsTr("RESUME DELIVERY") readonly property string textVolumeTarget : "(" + valueTarget + unit + ")" - readonly property string mesgBolus : qsTr("Heparin bolus is active") - readonly property string mesgCompleted : qsTr("Maximum cumulative heparin volume delivered") - readonly property string mesgEmpty : qsTr("Heparin syringe empty") - readonly property string mesgOff : qsTr("Heparin delivery Off") - readonly property string mesgStopped : qsTr("Heparin delivery Stopped") + readonly property string mesgBolus : qsTr("Heparin Bolus Active") + readonly property string mesgCompleted : qsTr("Maximum Cumulative Heparin Volume Delivered") + readonly property string mesgEmpty : qsTr("Heparin Syringe Empty") + readonly property string mesgOff : qsTr("Heparin Delivery Off") + readonly property string mesgStopped : qsTr("Heparin Delivery Stopped") readonly property string mesgRejectReason : vTreatmentAdjustmentHeparin.adjustment_ReasonText } title : qsTr("HEPARIN") - cumulativeVisible: false + cumulativeVisible : false + targetVisible : false + progressBarVisible : false - hasArrow : false - targetVisible: false - progressBarVisible: false + hasArrow : false + isTouchable : false + buttonEnabled : ! (isOff || isStopped || isBolus || isEmpty + || isCompleted // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick) + ) && ! isSBInProgress && isTxRunning + buttonText : ! isTxRunning ? _private.textHeparin : + isDispensing ? _private.textPause : + isPaused ? _private.textResume : + isCompleted ? _private.textHeparin : // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick) + // isCompleted ? _private.textResume : + _private.textHeparin + unit : Variables.unitTextSaline - isTouchable : ! (isOff || isStopped || isBolus || isEmpty) && ! isSBInProgress && isTxRunning - buttonText : ! isTxRunning ? _private.textHeparin : - isDispensing ? _private.textPause : - isPaused ? _private.textResume : - isCompleted ? _private.textResume : - _private.textHeparin - unit : Variables.unitTextSaline - valueDelivered: vTreatmentHeparin.cumulative.toFixed(1) // this is the cumulative volume of the Heparin bolus and despensing. VTreatmentHeparin { id: vTreatmentHeparin } onClicked: { - if ( isCompleted ) vTreatmentAdjustmentHeparin.doResume() + // if ( isCompleted ) vTreatmentAdjustmentHeparin.doResume() // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick) if ( isPaused ) vTreatmentAdjustmentHeparin.doResume() if ( isDispensing ) vTreatmentAdjustmentHeparin.doPause () } Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r6581def57942b1c1ef56a2f2feb74559946517b9 -r583d1953c783940c93f22c37b23daadb1ff3a09c --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 6581def57942b1c1ef56a2f2feb74559946517b9) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -43,11 +43,12 @@ readonly property string mesgRejectReason : vTreatmentAdjustmentSaline.adjustment_ReasonText } - hasArrow : false - isTouchable : ! ( _root.isDisabled || _root.isWaitPump ) - buttonText : ( _root.isDisabled || _root.isWaitPump ) ? _private.textStart : - _root.isStarted ? _private.textStop : - _private.textStart + hasArrow : false + isTouchable : false + buttonEnabled : ! ( _root.isDisabled || _root.isWaitPump ) + buttonText : ( _root.isDisabled || _root.isWaitPump ) ? _private.textStart : + _root.isStarted ? _private.textStop : + _private.textStart title : qsTr("SALINE BOLUS") unit : Variables.unitTextSaline Index: sources/storage/Logger.h =================================================================== diff -u -r2de712bc338440a4175002a73da38e7f55af3bac -r583d1953c783940c93f22c37b23daadb1ff3a09c --- sources/storage/Logger.h (.../Logger.h) (revision 2de712bc338440a4175002a73da38e7f55af3bac) +++ sources/storage/Logger.h (.../Logger.h) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) @@ -35,6 +35,8 @@ #define MIXED_EVENT_DATUM +#undef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG + // forward declarations class tst_logging;