application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
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.

    • -1
    • +1
    /sources/view/settings/VDuetRoWaterDG.cpp
DEN-16864: UI Bloodflow message is incomplete

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

    • -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
    • -0
    • +2
    /sources/view/dg/data/VDGHeatersData.cpp
    • -0
    • +2
    /sources/view/dg/data/VDGHeatersData.h
    • -0
    • +2
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -0
    • +2
    /sources/view/hd/data/VHDBloodLeakData.h
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.

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
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

    • -0
    • +1
    /sources/view/VAdjustmentResponseBase.h
    • -4
    • +3
    /sources/view/settings/VDuetRoWaterDG.cpp
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

Bamboo Commit: Updated MAlarmMapping.cpp

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

CS-10: The Log upload to the cloud

- removing the log watch before adding it. found out some situations it could cause watch not work properly.

- Added log for the CS received message

CS-10: The Log upload to the cloud

- Fixed a typo in read file error.

- Changed the logic for the dissdcardspacechanged to be an OR instead of and, so either of the available and percent change of the sd-card can now trigger the signal, although it may get higher frequency but seems like necessary.

CS-10: The Log upload to the cloud

- empty out the out.buf with echo "" > could cause the application to assert out, and seems the "" is not empty in "QString.isEmpty()"

CS-10: The Log upload to the cloud

- Reformat some event logs (Acks) to be aligned with the others format.

- Made the USB Drive status log to be one time log for each mount, unmount and removed events, and not to fill in the service log in each second.

    • -320
    • +320
    /sources/ApplicationPost.cpp
    • -1096
    • +1096
    /sources/canbus/MessageDispatcher.cpp
    • -1311
    • +1315
    /sources/device/DeviceController.cpp
CS-10: The Log upload to the cloud

- Adding error handling

- Adding an easier testability to the UI and CS, since CS needs the out buf to be emptied out or to be deleted, made UI to retry to add the watch in that case when the out buff is recreated.

    • -1329
    • +1362
    /sources/cloudsync/CloudSyncController.cpp
    • -336
    • +345
    /sources/cloudsync/CloudSyncController.h
Merge branch 'DEN-16657-UI-BN-S116-LogUpload-Compression' into DEN-16839-UI-BN-Whitney-1B1

Bamboo Commit: Updated MAlarmMapping.cpp

    • -16
    • +22
    /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

    • -16
    • +22
    /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 'DEN-16657-UI-BN-S116-LogUpload-Compression' into develop

CS-10: The Log upload to the cloud

- Fixed the issue with the log name Time section.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16657-UI-BN-S116-LogUpload-Compression' into develop

CS-10: The Log upload to the cloud

- the uploadOldestFirst logic was reverse.

Merge branch 'DEN-16657-UI-BN-S116-LogUpload-Compression' into develop