Index: denali.pro.user =================================================================== diff -u -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- denali.pro.user (.../denali.pro.user) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) +++ denali.pro.user (.../denali.pro.user) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/AlarmGenerator.cpp =================================================================== diff -u -r19092150c9343b729ad87be76805300417bfd68c -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 19092150c9343b729ad87be76805300417bfd68c) +++ sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -67,9 +67,10 @@ const AlarmStatusData AlarmGenerator::ALARM_ID_BLE_CUFF() { - // not implemented (PRS 395) + // coco begin validated: has been tested manually, not implemented (PRS 395) //DENALI_production-PRS 395;Alarm Details, No Blood Pressure Cuff AlarmStatusData data; data.mFlags.clear(); return data; } +// coco end Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r51accb0c8de0c3fd15b65c672dc348e99059597b -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 51accb0c8de0c3fd15b65c672dc348e99059597b) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -243,8 +243,9 @@ // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData ); break; + // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmClearedConditionReq : INTERPRET_RECEIVED_MESSAGE(AlarmClearedConditionRequestData ); break; - + // coco end default: QString mActionIdHexString = Format::toHexString(vActionId); LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); Index: sources/gui/GuiController.cpp =================================================================== diff -u -r19092150c9343b729ad87be76805300417bfd68c -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 19092150c9343b729ad87be76805300417bfd68c) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -306,9 +306,9 @@ // coco end /*! - * \brief GuiController::didFailedTransmit - * Raises an HD communication timeout alarm if communication with HD is lost. - * \param seq - Sequence that failed to transmit + * \brief GuiController::didFailedTransmit + * \details Raises an HD communication timeout alarm if communication with HD is lost. + * \param seq - Sequence that failed to transmit */ void GuiController::onFailedTransmit(Sequence seq) { Index: sources/gui/qml/components/TimeText.qml =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -79,7 +79,6 @@ horizontalAlignment: Text.AlignRight anchors.right : _timeSeparator.left anchors.baseline: _timeSeparator.baseline - } Text { id: _minuteText objectName: "_TimeText_minute" //SquishQt testability Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rcd769413344091cea88a30861b49188c8c147cba -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision cd769413344091cea88a30861b49188c8c147cba) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -84,7 +84,7 @@ onClicked : _root.minimizeClicked() } - UpDownButton { + UpDownButton { id: _minimizeButton isUp: false anchors { verticalCenter : _titleBar.verticalCenter Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r3e5cdca5de3ac46619325bf1e37c572d729d5fa9 -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 3e5cdca5de3ac46619325bf1e37c572d729d5fa9) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -378,7 +378,7 @@ * | #1:(U32) | \ref alarmID | * */ -// MAlarmAcknowledgeReq +// coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. class MAlarmClearedConditionReq : public MModel { public: GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; @@ -388,11 +388,12 @@ return toString({alarmID}); } // coco end + // coco begin validate : static QString toString(const QVariantList &vParameters) { return MModel::toString("AlarmCondition", vParameters); } }; - +// coco end /*! * \brief The MAlarmUserActionReq class * \details The model to tell HD an alarm action has been made by user Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r7ffe641e90fd076e4358d56ef9aa400e9a9c1f75 -r741b1c70f851810f2c265cdd38dfa158b7ee0c37 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7ffe641e90fd076e4358d56ef9aa400e9a9c1f75) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 741b1c70f851810f2c265cdd38dfa158b7ee0c37) @@ -90,10 +90,12 @@ */ void View::VAlarmStatus::doClearCondition() { + // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. AlarmClearedConditionRequestData data; data.alarmID = GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT; emit didAdjustment(data); } +// coco end /*! * \brief VAlarmStatus::onActionReceive