application

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

DEN-12183 KBM: Implement the reqDeviceRegister

    • -10
    • +16
    /sources/cloudsync/CloudSyncController.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-12183 KBM: Credentials messaging

- Added Credential messages

| 2003 | req save credential |1639391827,1,0,2003,3,path_to_client_certificate_pem,path_to_client_private_key_pem,path_to_client_public_key_pem |

| 2004 | req credentials | 1639391827,1,0,2004,0 |

| 1004 | send credentials | 1639391827,1,0,1004,1,path_to_credentials="/tmp/credentials" |

    • -23
    • +32
    /sources/cloudsync/CloudSyncController.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +15
    /sources/storage/StorageGlobals.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
DEN-12121: Further linkage for updating values on screen relating to DEN-12118

DEN-12121: Updates per system team's feedback for DEN-12118

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
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.

    • -0
    • +1
    /sources/model/dg/data/MDGValvesStatesData.h
    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -12
    • +13
    /sources/view/dg/data/VDGValvesStatesData.h
    • -0
    • +26
    /sources/view/hd/data/VHDAirBubbleData.cpp
    • -3
    • +43
    /sources/view/hd/data/VHDAirBubbleData.h
    • -0
    • +26
    /sources/view/hd/data/VHDAirTrapData.cpp
    • -3
    • +43
    /sources/view/hd/data/VHDAirTrapData.h
    • -2
    • +2
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -3
    • +3
    /sources/view/hd/data/VHDBloodLeakData.h
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-12228: No difference between 80% and 100% brightness setting

- Since the brightness is not linear a map created and the code improved as well.

    • -26
    • +6
    /sources/device/DeviceController.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -8
    • +8
    /sources/canbus/MessageInterpreter.cpp
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.

    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +57
    /sources/model/dg/data/MDGConductivityData.cpp
    • -0
    • +90
    /sources/model/dg/data/MDGConductivityData.h
    • -0
    • +45
    /sources/model/hd/data/MHDAirBubbleData.cpp
    • -0
    • +84
    /sources/model/hd/data/MHDAirBubbleData.h
    • -0
    • +45
    /sources/model/hd/data/MHDAirTrapData.cpp
    • -0
    • +84
    /sources/model/hd/data/MHDAirTrapData.h
    • -0
    • +78
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -3
    • +75
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 12 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.

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-11972: Initial Patient ID entered text is displayed in red

- Set the keyboard locale to en_US

    • -0
    • +60
    /sources/gui/qml/KeyboardItem.qml
    • -55
    • +0
    /sources/gui/qml/VirtualKeyboard.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-12183: KBM: Usual Meetings/Support/Development

- added device register request

- added device factory reset ( UI factory reset has not implemented yet, it's only the UI/CS communication)

    • -3
    • +11
    /sources/cloudsync/CloudSyncController.h
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-12183: KBM: Usual Meetings/Support/Development

- Added the request device info message.

    • -6
    • +51
    /sources/cloudsync/CloudSyncController.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

Added Dialin to unhandled

- added the -d command-line argument to the run.sh for the development phase, to ease the updates and let them have it, without testers updating it all the time.

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-11980-sw_dev-sprint-64' into staging

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop