Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

  1. … 1 more file in changeset.
Merge master into DEN-4860_BLE

  1. … 12 more files in changeset.
DEN-5836: Code Coverage

- 99.979% (4826/4827)

  1. … 4 more files in changeset.
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

  1. … 7 more files in changeset.
DEN-4964: Addressed code review comments.

    • -60
    • +0
    ./adjustment/VTreatmentAdjustmentHDVersions.cpp
    • -0
    • +60
    ./adjustment/VTreatmentAdjustmentVersions.cpp
    • -3
    • +6
    ./adjustment/VTreatmentAdjustmentVersions.h
  1. … 5 more files in changeset.
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

  1. … 5 more files in changeset.
DEN-4964: Addressed code review comments.

    • -13
    • +32
    ./adjustment/VTreatmentAdjustmentHDVersions.cpp
    • -68
    • +0
    ./adjustment/VTreatmentAdjustmentHDVersions.h
    • -0
    • +78
    ./adjustment/VTreatmentAdjustmentVersions.h
  1. … 6 more files in changeset.
DEN-5836: Alarm:Code Coverage

- updated the alarm message table

- fixed the -q parameter

  1. … 2 more files in changeset.
DEN-4863, DEN-4865: Code Coverage and Unit Tests

    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentUltrafiltrationInit.h
  1. … 9 more files in changeset.
DEN-4964: Addressed code review comments.

    • -0
    • +7
    ./adjustment/VTreatmentAdjustmentHDVersions.h
  1. … 6 more files in changeset.
DEN-5833: Implementation

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

  1. … 4 more files in changeset.
DEN-6022: The ultrafiltration inconsistency

- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix and if that happens it would be the FW bug.

- The modification is that the main progress bar will always has VTreatmentUltratiltration.minimum as minimum (current;y always zero) and VTreatmentUltratiltration.maximum as maximum.

- The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to eachother.

- Removed the precision from VTreatmentUltrafiltration and moved into the Variables.

  1. … 7 more files in changeset.
Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

  1. … 1 more file in changeset.
DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

DEN-5833: Implementation

- The message 63 has been tested

  1. … 2 more files in changeset.
DEN-5833: Implementation

- Added the message 63 (req/rsp)

  1. … 12 more files in changeset.
DEN-5833: Implementation

- Fixed the bug of silence logic which was reverse

- Fixed the bug that length of the silence message payload was incorrectly set to 4 instead of 1.

- changed the name of the MAlarmSilenceReq member variable to silence instead of state which now implies it is silent (1) or not (0).

  1. … 3 more files in changeset.
DEN-5833: Implementation

- made the mute button click optional and currently enabled.

- made minimize on silent on the Notification Dialog optional and is disabled currently.

- made separate slots for each user actions instead of one for all with 4 parameter cause I think it's easier and more convenient to use this way.

- increased the Notification Bar height a little bit more.

  1. … 3 more files in changeset.
DEN-5833: Implementation

- Implementation of the message 64: 'Alarm User Action'

- Cleaned up the VAlarmStatus class.

  1. … 4 more files in changeset.
DEN-4964: Added DG Versions to Manager page.

    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentHDVersions.cpp
    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentHDVersions.h
  1. … 13 more files in changeset.
DEN-5833: Implementation

- Fixed a bouncing bug of the message when sent for the first time with silenced flag on to show the alarm not maximized.

  1. … 1 more file in changeset.
DEN-5833: Implementation

- Added 3 Alarm buttons

- created Mute Button

- created Up and Down Button (minimize/maximize)

- used FW alarm status flag enum (Alarm_State_Flag_Bit_Positions) instead of the UI version and removed UI one.

Code cleaned up

- modified and cleaned up Notification Dialog and Bar.

- modified Time Text component to be able to show sections with one zero only.

- cleaned up main.qml

  1. … 20 more files in changeset.
DEN-5754: Implementation

- Added the new MVC for initial UF Volume adjustment messages (79/80).

    • -0
    • +55
    ./adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp
    • -0
    • +66
    ./adjustment/VTreatmentAdjustmentUltrafiltrationInit.h
  1. … 17 more files in changeset.
DEN-4964: Added HDVersions major, minor, micro to Manager Screen.

    • -11
    • +12
    ./adjustment/VTreatmentAdjustmentHDVersions.h
  1. … 1 more file in changeset.
DEN-5773: UI Unique Saline Bolus Start/Stop Enumerator

    • -2
    • +2
    ./adjustment/VTreatmentAdjustmentSaline.cpp
  1. … 3 more files in changeset.
DEN-5739: Implementation

- Implemented the entire MVC for Heparin request/response/data.

    • -0
    • +56
    ./adjustment/VTreatmentAdjustmentHeparin.cpp
    • -0
    • +70
    ./adjustment/VTreatmentAdjustmentHeparin.h
    • -34
    • +59
    ./data/VHDTreatmentStatesData.cpp
    • -0
    • +25
    ./data/VTreatmentHeparinData.cpp
    • -0
    • +43
    ./data/VTreatmentHeparinData.h
  1. … 16 more files in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -2
    • +2
    ./adjustment/VTreatmentAdjustmentHDVersions.cpp
    • -2
    • +2
    ./adjustment/VTreatmentAdjustmentHDVersions.h
  1. … 6 more files in changeset.
DEN-4697: Static Code Analysis

    • -1
    • +0
    ./adjustment/VTreatmentAdjustmentPressuresLimits.cpp
  1. … 3 more files in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentHDVersions.cpp
  1. … 1 more file in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -5
    • +0
    ./adjustment/VTreatmentAdjustmentHDVersions.cpp
  1. … 1 more file in changeset.