application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

DEN-12121: Adjustments to Dianogistic Dialog to fit new FW versions better. Moved Pressures to have a bit more room for 5 digit values.

Bamboo Commit: Updated MAlarmMapping.cpp

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

DEN-12121: Updates per code review

    • -3
    • +3
    /sources/model/dg/data/MDGConductivityData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirBubbleData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirTrapData.h
    • -3
    • +3
    /sources/model/hd/data/MHDBloodLeakData.h
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-10153: Treatment Log Comments Investigations

- Added the missing prescribed UF Volume, Rate to the log and review.

Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-12204 Code Analysis

- Broke the build and fixed.

Bamboo Commit: Updated MAlarmMapping.cpp

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

Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

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

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
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-12121: Updated Models and views to latest messaging protocol. Fixed BLD to show detect counter. Updated get version to display compatibility revision.

Bamboo Commit: Updated MAlarmMapping.cpp

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

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.

    • -577
    • +0
    /sources/view/VTreatmentCreate (legacy).cpp
    • -258
    • +0
    /sources/view/VTreatmentCreate (legacy).h
    • -0
    • +577
    /sources/view/VTreatmentCreate(legacy).cpp
    • -0
    • +258
    /sources/view/VTreatmentCreate(legacy).h
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