application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12258-UI-BN-S66' into develop

Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -6
    • +6
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-12597 Code Review

http://dvm-linux02:8060/cru/UI-DEN-12258-1#c12773

Disabled the coco end as well, which caused the coco to log a lot of warnings.

    • -12
    • +12
    /sources/ApplicationController.cpp
    • -2
    • +2
    /sources/bluetooth/BluetoothInterface.cpp
    • -16
    • +16
    /sources/canbus/CanInterface.cpp
    • -2
    • +2
    /sources/canbus/MessageAcknowModel.cpp
    • -4
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -12
    • +12
    /sources/device/DeviceController.cpp
  1. … 66 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -12
    • +12
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -6
    • +6
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-12517 Code Analysis

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

DEN-12515: KBM: Usual Meetings/Support/Development [ CS/UI Integration on device , Tx Log ]

- implemented the TxLog change request during the meeting.

- Also updated the state changes in the FW.

    • -4
    • +4
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -23
    • +29
    /sources/storage/TreatmentLog.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

DEN-12515: KBM: TxLog implementation

- implemented the message 1007 for TxLog to be sent to the CS on HD TxLog received message.

    • -4
    • +1
    /sources/cloudsync/CloudSyncController.h
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12512: INT: Support/Meetings/Planning

DEN-09712 Date format between system date/time and BP/HP "Last Read" is not consistent

DEN-09929 Treatment Log shows "?C" instead of "°C"

PRS-35: Regarding Sean's point about the create treatment parameters, made the parameters dynamic by the Configurations/DataList.cfg in ui.config repository.

    • -2
    • +6
    /sources/gui/qml/components/GridSelection.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +31
    /sources/model/settings/MSettings.cpp
    • -0
    • +10
    /sources/model/settings/MSettings.h
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

    • -14
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-12514: LTS: Support/Development

========== DevTest

- Fixed the reported bugs from the LTTS team:

+ https://github.com/Diality/testsuites/issues/38: Rejection messages are not displayed for heparin under main-treatment screen 38

+ https://github.com/Diality/testsuites/issues/37: "Self Test Complete!" message is not displayed when "DRY_SELF_TESTS_COMPLETE_STATE" is simulated #37

+ https://github.com/Diality/testsuites/issues/36: Indicators are not displayed for 'Wet Self tests" when "HD_PRIME_WET_SELF_TESTS_STATE" is simulated #36

========== CloudSync

- Changed the order of the device registration request and the device info send, in the order above.

========== Internal

- removed the emoji and language globe buttons from the second keyboard layout.

    • -14
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

DEN-12424: INT

- Adding the new 3 params of the alarm trigger

- Adding Rejection

- prepare for the singletons quit which are not in order, the quit should be done manually to be in order.

    • -2
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -2
    • +2
    /sources/cloudsync/CloudSyncController.h
    • -15
    • +21
    /sources/model/MAbstractDynamic.cpp
  1. … 6 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

DEN-12427: KBM: UI modifications to match the CS needs

- Fixing the device info and version response/report.

    • -2
    • +2
    /sources/cloudsync/CloudSyncController.h
Merge remote-tracking branch 'origin/develop' into develop

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

- The UI will only send the 1006 (latest device state update) if only the state changes.

- Duplicate state updates will not log as an error and will only be ignore.

- The UI will always response back to 2006 (device state request) from CS with 1006 (latest device state) even if the state is the same as the last updated/requested.

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp