Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

  1. … 1 more file in changeset.
DEN-12121: Updates per code review

  1. … 5 more files in changeset.
This needs to be updated to 10 * 4 if the change to the "TreatmentStates" is approved by Sean Nash. Also please remove the duplicate.

This needs to be updated to 10 * 4 if the change to the "TreatmentStates" is approved by Sean Nash.
Also please remove the duplicate.

Sean Nash, How the change to the TreatmentState message will affect the Application? This newly added parameter seems redundant to me. The change is the "Dialysis State" addition. 10 - (U32) Dial...

Sean Nash,
How the change to the TreatmentState message will affect the Application?
This newly added parameter seems redundant to me.

The change is the "Dialysis State" addition.

10 - (U32) Dialysis state
Unknown macro: { 0=start, 1=UF, 2=saline bolus }

0x0F00 15 0x040 4 Hz N HD All Treatment State sub-mode (U32-enum) (U32) UF state (U32) saline bolus state (U32) Hep state (U32) Rinseback state (U32) Recirc state 7 - (U32) Bld Prime state 8 - (U32) Tx End state 9 - (U32) Stop state 10 - (U32) Dialysis state
Please remove the box column, we decided not to use it in the Application documentation. Please do this for all the new models added.

Please remove the box column, we decided not to use it in the Application documentation.
Please do this for all the new models added.

It has been defined in the AlarmItem. Expose the VAlarmStatus property from AlarmItem.qml by adding this line: readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID then use the ...

It has been defined in the AlarmItem.
Expose the VAlarmStatus property from AlarmItem.qml by adding this line:

    readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID


then use the AlarmItem object, (which has been defined in the main.qml) to get the alarm id like the line below:

_alarmItem.alarm_AlarmID


Thanks,

Users can not see the alarm screen when the diagnostics screen is visible. This was a request by systems in DEN-12118. Is there another approach to this?

Users can not see the alarm screen when the diagnostics screen is visible. This was a request by systems in DEN-12118. Is there another approach to this?

it has already been defined, this would be a duplicate handler. why do we need to have the top on diagnostics while it has to always be on alarm dialog/bar on screen?

it has already been defined, this would be a duplicate handler.
why do we need to have the top on diagnostics while it has to always be on alarm dialog/bar on screen?

Required to display the Alarm Top on the diagnostic screen

Required to display the Alarm Top on the diagnostic screen

keep one line empty on top of the // HD Data Messages

keep one line empty on top of the // HD Data Messages

Why VAlarmStatus is added?

Why VAlarmStatus is added?

This message has been defined with 5xF32 parameters. 0x3100 49 0x080 1 Hz N DG All DG Conductivity Data (F32) RO rejection ratio (F32) CPi conductivity (F32) CPo conductivity (F32) CD1 conductivit...

This message has been defined with 5xF32 parameters.

0x3100 49 0x080 1 Hz N DG All DG Conductivity Data (F32) RO rejection ratio (F32) CPi conductivity (F32) CPo conductivity (F32) CD1 conductivity (F32) CD2 conductivity
UI-DEN-12121_SW Dev Sprint 65
UI-DEN-12121_SW Dev Sprint 65
DEN-12180: Internal general support

- investigate on the Begin Prime back to Cartridge installation

- Added objectName for easier debug.

- added the stack change for the Cartridge Installation in case FW wants to navigate back from Begin Prime to the beginning of Cartridge Installation.

  1. … 2 more files in changeset.
DEN-12121: Updated Models and views to latest messaging protocol. Fixed BLD to show detect counter. Updated get version to display compatibility revision.

  1. … 8 more files in changeset.
DEN-12180: INT: Alarm dialog body space [RC: 15*80]

- reduced the bottom margin of the Alarm Dialog bottoms.

- removed the space from the legacy files which caused issue with DevOps scripts.

  1. … 5 more files in changeset.
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

  1. … 5 more files in changeset.
DEN-12121: Further linkage for updating values on screen relating to DEN-12118

  1. … 2 more files in changeset.
DEN-12121: Updates per system team's feedback for DEN-12118

    • -15
    • +15
    ./qml/dialogs/DiagnosticsDialog.qml
DEN-12121: Implemented QML updates, proper view links for QML, and remaining implementation for new messages to the QML stack. All relate to DEN-12118.

    • -54
    • +101
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 12 more files in changeset.
Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

    • -10
    • +8
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 7 more files in changeset.
DEN-12121: Implemented Model and Views for BloodLeak, AirBubble, AirTrap and DG Conductvity for DEN-12118. Removed ODi and ODo in diagnostic dialog. Added isCompleted field in Rinseback Model for DEN-9932.

  1. … 24 more files in changeset.
DEN-10974: Syringe pump installation screen allows user to proceed before syringe installed

- Added the response message 0xAD00(173), for the request message of 0x6200(98):Pre-treatmetn disposables confirm.

  1. … 10 more files in changeset.
DEN-11972: Initial Patient ID entered text is displayed in red

- Set the keyboard locale to en_US

    • -0
    • +60
    ./qml/KeyboardItem.qml
  1. … 2 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 11 more files in changeset.
Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

  1. … 6 more files in changeset.
Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

  1. … 5 more files in changeset.
DEN-12106: Heparin Delivery Active Text Does Not Appear

  1. … 3 more files in changeset.