application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16924-Remove-QRCode-From-P1' into staging

DEN-16924: Remove QR Code for P1

- Added back the visible false for the both QR codes on the both treatment confirm/review screens.

DEN-16924: Remove QR Code for P1

- Added back the visible false for the both QR codes on the both treatment confirm/review screens.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'release/p1_staging' into release/p1

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/model/dg/data/MDGHeatersData.cpp
    • -1
    • +1
    /sources/model/dg/data/MDGHeatersData.h
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -1
    • +1
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 17 more files in changeset.
Merge branch 'release/stagingmerge-DEN-16899-UI-BN-R13-build' into release/p1_staging

DEN-16851: New Alarm for Increased Occlusion Sensitivity - Added the following fields to mssage 0x0009: arterial long filter, venous long filter, blood pump occl long filter, partial occl base line

DEN-16204: UI: FW: Pure Water mode turning on intermittently.

- Added a new payload to send the current firmware value with the response to a set from UI

- Changed the RO only mode code to not flip the UI RO only status if the firmware rejected the set value and just get the status in the firmware

DEN-16862: Add a command to reset HD during UI software install

- Added a command to request an HD reset during the UI software and while HD is in service mode.

DEN-16864: UI Bloodflow message is incomplete

- Updated the payload of the following messages: 0x002C, 0x0005, 0x0008, 0x006C.

DEN-16204: UI: FW: Pure Water mode turning on intermittently

- Changed the order of the UI response message from firmware so the accept is always the first field.

DEN-16204: UI: FW: Pure Water mode turning on intermittently

- Addressed the code review comments.

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +8
    /sources/model/dg/data/MDGHeatersData.cpp
    • -0
    • +6
    /sources/model/dg/data/MDGHeatersData.h
    • -4
    • +12
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -0
    • +6
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 16 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16872 Blood priming screen appeared during treatment

- Fixed the A/B buffer switch on each of the log categories (.log, .err) since their speed are not the same they switch on different timing.

    • -0
    • +10
    /sources/canbus/MessageDispatcher.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -17
    • +23
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16872 Blood priming screen appeared during treatment

- made the cache index atomic

- adjusted the buffersize and the timeut by some tests.

- added elapsed time for each log flush.

- separated each of the logs concurrent threads.

DEN-16872 Blood priming screen appeared during treatment

- reverted back a residual modification which caused to break the ACK

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16872 Blood priming screen appeared during treatment

- added caching to the UI application logs.

Merge branch 'DEN-16860-ui-dn-s122' into develop

    • -1096
    • +1108
    /sources/canbus/MessageDispatcher.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/model/dg/data/MDGHeatersData.cpp
    • -2
    • +2
    /sources/model/dg/data/MDGHeatersData.h
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 17 more files in changeset.
Merge branch 'DEN-16860-ui-dn-s122' into staging

DEN-16204: UI: FW: Pure Water mode turning on intermittently

- Addressed the code review comments.

    • -1
    • +0
    /sources/view/VAdjustmentResponseBase.h
    • -8
    • +3
    /sources/view/settings/VDuetRoWaterDG.cpp
    • -4
    • +4
    /sources/view/settings/VDuetRoWaterDG.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp