application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12438: The In-Treatment Dialysate Flow section value is not updated

During the change of the parent flow class to the Dialysate flow and Blood flow, one thing which has not been caught during the development and code review is that the length of the Dialysate flow has changed as well from 8 to 7.

It has been caught by LTTS during their regression testing.

Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12383: Heparin Volume Delivered Treatment Monitor Resolution Should Be 0.1 mL

Merge branch 'DEN-12258-UI-BN-S66' into develop

Fixed the build issue.

Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-11812 UI Keyboard displays text on the spacebar and has a wink emoji button

- added the keyboard layout and style to remove some buttons and remove the text on the spacebar.

- added DEBUG_DISABLE_MAXIMIZE, due to touch screen issue on some devices, the maximized alarm can't be minimized to see the screen underneath.

- While fixing some issues in the Dialin/Simulator, added the reject reason notification to the Treatment review screen and cleared the values on rejection.

- update the Dialysate Temperature max to the 37 from 38.

  1. … 26 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: Support and debugging

- updated/tested the alarmMapping with new changes.

- added the staging to the alamMapping.sh call to checkout always on staging as the mainsteam.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: Support and debugging

- Fixing the DG Valves/Temperature messages

- Fixing the CloudSync RegisterDeviceRequest

- Fixed/Cherry-Picked the Dialin-log conditions.

- Cleaned up the debug messages.

    • -23
    • +26
    /sources/model/dg/data/MDGTemperaturesData.h
    • -13
    • +14
    /sources/model/dg/data/MDGValvesStatesData.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 6 more files in changeset.
DEN-12262: INT: Log Dialin Messages

- Log Dialin messages as part of the unhandled messages.

    • -21
    • +46
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +4
    /sources/model/hd/data/MHDSyringePumpData.h
DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Reorganized the Diagnostics screen a little more.

DEN-12262: INT: FW Support (Reset Diagnostic Data)

    • -0
    • +101
    /sources/view/VGeneralEvent.cpp
    • -0
    • +84
    /sources/view/VGeneralEvent.h
    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.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
    • -1
    • +1
    /sources/cloudsync/CloudSyncController.h
  1. … 63 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -10
    • +10
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into staging

Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

    • -6
    • +6
    /sources/model/dg/data/MDGConductivityData.h
    • -9
    • +9
    /sources/model/hd/data/MHDAirBubbleData.h
    • -9
    • +9
    /sources/model/hd/data/MHDAirTrapData.h
    • -16
    • +16
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 18 more files in changeset.
DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

    • -6
    • +6
    /sources/model/dg/data/MDGConductivityData.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -9
    • +9
    /sources/model/hd/data/MHDAirBubbleData.h
    • -9
    • +9
    /sources/model/hd/data/MHDAirTrapData.h
    • -16
    • +16
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 19 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12258-UI-BN-S66' into develop

- merge conflict resolution.

    • -21
    • +46
    /sources/canbus/MessageInterpreter.cpp
DEN-12262: INT: Log Dialin Messages

- Log Dialin messages as part of the unhandled messages.

    • -21
    • +46
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +4
    /sources/model/hd/data/MHDSyringePumpData.h
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Reorganized the Diagnostics screen a little more.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Fixed HD version title.