Index: denali.pro.user =================================================================== diff -u -r757a01c42a7a611704a67869a74c68f53edab20f -r0bde586566a8c0324fbc786690102b79a87afa4a --- denali.pro.user (.../denali.pro.user) (revision 757a01c42a7a611704a67869a74c68f53edab20f) +++ denali.pro.user (.../denali.pro.user) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 1 + 0 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 @@ -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 Index: sources/AlarmGenerator.cpp =================================================================== diff -u -r911882aaf10ee02ef646013914a2ddd6225224ca -r0bde586566a8c0324fbc786690102b79a87afa4a --- sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 911882aaf10ee02ef646013914a2ddd6225224ca) +++ sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -56,6 +56,7 @@ */ const AlarmStatusData AlarmGenerator::ALARM_ID_HD_COMM_TIMEOUT() { + // coco begin validated: Has been validated manually AlarmStatusData data; data.mState = GuiAlarmPriority::ALARM_PRIORITY_HIGH; // Alarm priority data.mTop = GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT; // Alarm ID @@ -64,6 +65,7 @@ data.mFlags = setBits(NO_BUTTON); // No button since there is no HD to communicate. return data; } +// coco end const AlarmStatusData AlarmGenerator::ALARM_ID_BLE_CUFF() { Index: sources/ApplicationController.cpp =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r0bde586566a8c0324fbc786690102b79a87afa4a --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -166,8 +166,10 @@ */ void ApplicationController::onFailedTransmit(Sequence seq) { + // coco begin validated: Has been validated manually emit didFailedTransmit(seq); } +// coco end /*! * \brief Process the requested action Index: sources/canbus/MessageAcknowModel.cpp =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r0bde586566a8c0324fbc786690102b79a87afa4a --- sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -188,8 +188,10 @@ */ void MessageAcknowModel::onFailedTransmit(Sequence vSequence) { + // coco begin validated: Has been validated manually _acknowList[vSequence]->deleteLater(); _acknowList.remove(vSequence); emit didFailedTransmit(vSequence); LOG_DEBUG( QString("Acknow retry failed for sequence %1").arg(vSequence) ); } +// coco end Index: sources/canbus/MessageAcknowModel.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r0bde586566a8c0324fbc786690102b79a87afa4a --- sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -73,13 +73,15 @@ */ void timerEvent(QTimerEvent *) override { + // coco begin validated: Has been validated manually if ( _retry -- ) { emit didFramesTransmit(_can_Id, _sequence, _frameList); } else { killTimer(_timerId); emit didFailedTransmit(_sequence); } } + // coco end signals: Index: sources/gui/GuiController.cpp =================================================================== diff -u -r54aae98b72e3804008acad0bbbb7573be8e35707 -r0bde586566a8c0324fbc786690102b79a87afa4a --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -312,10 +312,12 @@ */ void GuiController::onFailedTransmit(Sequence seq) { + // coco begin validated: Has been validated manually Q_UNUSED(seq); AlarmStatusData data = AlarmGenerator::ALARM_ID_HD_COMM_TIMEOUT(); emit didActionReceive(data); } +// coco end /*! * \brief GuiController::doAlertRequest Index: unittests/tst_models.h =================================================================== diff -u -r3d0a160e4e8c0348c688ed5efe4d86dc66121e6b -r0bde586566a8c0324fbc786690102b79a87afa4a --- unittests/tst_models.h (.../tst_models.h) (revision 3d0a160e4e8c0348c688ed5efe4d86dc66121e6b) +++ unittests/tst_models.h (.../tst_models.h) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -124,6 +124,7 @@ void tst_MAlarmStatus_text(); void tst_MAlarmClearedConditionRequest(); void tst_MAlarmUserActionRequest(); + void tst_MAlarmAcknowledgeRequest(); void tst_MAlarmStatus_data(); void tst_MAlarmStatus(); Index: unittests/tst_views.cpp =================================================================== diff -u -rfdb48ba3fba8e95027ebf573325c8f25db74c070 -r0bde586566a8c0324fbc786690102b79a87afa4a --- unittests/tst_views.cpp (.../tst_views.cpp) (revision fdb48ba3fba8e95027ebf573325c8f25db74c070) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 0bde586566a8c0324fbc786690102b79a87afa4a) @@ -761,6 +761,8 @@ view.onFinishedSaveNewTreatment(true); view.onFinishedSaveNewTreatment(false); + view._requestedSaveNewTreatmentProfile = true; + view.onFinishedSaveNewTreatment(false); view.doFinishedPrime(); QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate);