sources

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-12204 Code Analysis

- cppcheck is confusing Message struct in different scopes and giving an error in CloudSync file about the struct in MessageGlobals, but the error has been fixed to avoid build fail.

  1. … 2 more files in changeset.
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. … 1 more file 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.

    • -4
    • +6
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -24
    • +28
    ./view/settings/VAdjustmentVersions.cpp
    • -18
    • +20
    ./view/settings/VAdjustmentVersions.h
Bamboo Commit: Updated MAlarmMapping.cpp

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
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
    • -577
    • +0
    ./view/VTreatmentCreate (legacy).cpp
    • -258
    • +0
    ./view/VTreatmentCreate (legacy).h
    • -0
    • +577
    ./view/VTreatmentCreate(legacy).cpp
    • -0
    • +258
    ./view/VTreatmentCreate(legacy).h
  1. … 1 more file in changeset.
DEN-12183 KBM: Implement the reqDeviceRegister

    • -4
    • +39
    ./cloudsync/CloudSyncController.cpp
    • -10
    • +16
    ./cloudsync/CloudSyncController.h
  1. … 2 more files in changeset.
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" |

    • -64
    • +132
    ./cloudsync/CloudSyncController.cpp
    • -23
    • +32
    ./cloudsync/CloudSyncController.h
  1. … 1 more file in changeset.
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

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

    • -3
    • +1
    ./gui/qml/dialogs/DiagnosticsDialog.qml
DEN-12121: Updates per system team's feedback for DEN-12118

    • -15
    • +15
    ./gui/qml/dialogs/DiagnosticsDialog.qml
Bamboo Commit: Updated 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.

    • -54
    • +101
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -1
    • +1
    ./view/dg/data/VDGConductivityData.cpp
    • -0
    • +1
    ./view/dg/data/VDGValvesStatesData.cpp
    • -12
    • +13
    ./view/dg/data/VDGValvesStatesData.h
    • -0
    • +26
    ./view/hd/data/VHDAirBubbleData.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

  1. … 1 more file in changeset.
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.

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

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

    • -10
    • +8
    ./gui/qml/dialogs/DiagnosticsDialog.qml
  1. … 1 more file 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.

    • -6
    • +2
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +57
    ./model/dg/data/MDGConductivityData.cpp
    • -0
    • +90
    ./model/dg/data/MDGConductivityData.h
    • -0
    • +45
    ./model/hd/data/MHDAirBubbleData.cpp
    • -0
    • +84
    ./model/hd/data/MHDAirBubbleData.h
    • -0
    • +45
    ./model/hd/data/MHDAirTrapData.cpp
    • -0
    • +84
    ./model/hd/data/MHDAirTrapData.h
    • -0
    • +78
    ./model/hd/data/MHDBloodLeakData.cpp
  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.

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

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

- Set the keyboard locale to en_US

    • -0
    • +60
    ./gui/qml/KeyboardItem.qml
  1. … 2 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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)

    • -5
    • +62
    ./cloudsync/CloudSyncController.cpp
DEN-12183: KBM: Usual Meetings/Support/Development

- Added the request device info message.

    • -66
    • +269
    ./cloudsync/CloudSyncController.cpp
  1. … 2 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +1
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    ./view/hd/data/treatment/VTreatmentBloodFlow.h
  1. … 1 more file in changeset.
Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

    • -4
    • +2
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -2
    • +2
    ./view/hd/data/treatment/VTreatmentBloodFlow.h
  1. … 1 more file in changeset.
Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

    • -4
    • +2
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -2
    • +2
    ./view/hd/data/treatment/VTreatmentBloodFlow.h
DEN-12106: Heparin Delivery Active Text Does Not Appear

  1. … 1 more file in changeset.