Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

    • -0
    • +28
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 8 more files in changeset.
DEN-4964: Added HD Blood/DialIn signal strengths to Manager page.

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

- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

DEN-5833: Implementation

- Added the message 63 (req/rsp)

    • -7
    • +8
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +41
    ./hd/alarm/MAlarmClearedCondition.cpp
    • -0
    • +79
    ./hd/alarm/MAlarmClearedCondition.h
  1. … 10 more files in changeset.
DEN-5833: Implementation

- fix a naming bug.

    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 1 more file 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).

    • -2
    • +2
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 3 more files in changeset.
DEN-5833: Implementation

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

- Cleaned up the VAlarmStatus class.

    • -13
    • +13
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 5 more files in changeset.
DEN-5833: Implementation

- Added User Action message response model.

    • -0
    • +28
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 4 more files in changeset.
DEN-4964: Added DG Versions to Manager page.

    • -0
    • +65
    ./dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp
    • -0
    • +71
    ./dg/adjustment/MTreatmentAdjustDGVersionsResponse.h
  1. … 11 more files 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. … 19 more files in changeset.
DEN-5754: Implementation

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

    • -0
    • +28
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +49
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp
    • -0
    • +86
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h
  1. … 15 more files in changeset.
DEN-5833: Implementation

- Updated the old Alarm model structure to used the notify in the Message Interpreter.

- Updated the Alarm Trigger,Clear,Status to inherit from MAbstract to be able to the above.

- Added a macro to make the request messages handling easier.

  1. … 4 more files in changeset.
DEN-5744: Code Review 0

- A typo to change the #3 to #4

DEN-5515: Added VAlert class to support BLE related alerts

    • -1
    • +0
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 23 more files in changeset.
DEN-5773: UI Unique Saline Bolus Start/Stop Enumerator

    • -11
    • +1
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 3 more files in changeset.
DEN-5739: Implementation

- reading the heparin data and connected tot the UI/QML

  1. … 6 more files in changeset.
DEN-5739: Implementation

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

    • -0
    • +49
    ./hd/adjustment/MTreatmentAdjustHeparinResponse.cpp
    • -0
    • +87
    ./hd/adjustment/MTreatmentAdjustHeparinResponse.h
    • -0
    • +32
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +41
    ./hd/data/MTreatmentHeparinData.cpp
    • -0
    • +82
    ./hd/data/MTreatmentHeparinData.h
  1. … 14 more files in changeset.
Merge Conflict fix

Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

    • -2
    • +202
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 27 more files in changeset.
DEN-4867: Refactored Pre-Treatment classes.

DEN-4860: Ensure error shows when bluetooth module is off

    • -9
    • +9
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 30 more files in changeset.
DEN-4860: Update to align better with coding standard, fixed docstring issues.

- Updated message ID to align with message lists

    • -3
    • +3
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 6 more files in changeset.
Merge master into DEN-4598-Confirm-Priming-Begin

    • -5
    • +8
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 14 more files in changeset.
DEN-4693: Update Design Documents

- Updated the messages MSG to hex for SDD.

    • -6
    • +6
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -3
    • +3
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 1 more file in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 4 more files in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

  1. … 1 more file in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

  1. … 1 more file in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -0
    • +65
    ./hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp
    • -2
    • +2
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 9 more files in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -45
    • +0
    ./hd/adjustment/MHDVersionResponse.cpp
    • -0
    • +65
    ./hd/adjustment/MTreatmentAdjustHDVersionResponse.cpp
  1. … 1 more file in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -0
    • +45
    ./hd/adjustment/MHDVersionResponse.cpp
    • -0
    • +71
    ./hd/adjustment/MTreatmentAdjustHDVersionsResponse.h
    • -4
    • +16
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +64
    ./hd/data/MHDVersionData.cpp
  1. … 16 more files in changeset.
DEN-4609: Addressed code review requests.

  1. … 8 more files in changeset.