Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge Conflict fix

Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

    • -2
    • +202
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 27 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-4609: Addressed code review requests.

  1. … 8 more files in changeset.
DEN-5034: Implementation [ Messaging ] (2 of 2)

- Added adjustment Request Response in the UI

- Added Logging console out which is more descriptive only for debugging.

- Added multiple different min/max limit/ranges for pressures adjustments.

- Added auto calculate the adjustable low/high limit margin.

- Added a CONSTANT property #define

    • -25
    • +11
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 11 more files in changeset.
DEN-4609: Added class documentation and messaging information.

    • -10
    • +91
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 4 more files in changeset.
DEN-4609: Removed newline characters. Fixed orgnization in denali.pro

  1. … 3 more files in changeset.
DEN-5033: Implementation [ Messaging ] (1 of 2)

- improving and testing the Arterial/Venous pressure values

- using the doAdjustment of the venousPressureMinimum : vTreatmentAdjustmentPressuresLimits.venousLimitMin

in the QML.

    • -8
    • +30
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 9 more files in changeset.
DEN-4695: Integration Testing

- Fixed broken names in SquishQt

    • -2
    • +2
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 8 more files in changeset.
Removed extra empty lines

    • -1
    • +0
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -1
    • +0
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
  1. … 29 more files in changeset.
DEN-5033: DEN-5034: Implementation [ Messaging ]

- Back end implementation of the messaging.

    • -0
    • +61
    ./hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp
    • -0
    • +96
    ./hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h
    • -0
    • +42
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 21 more files in changeset.
DEN-4598, DEN-4609, DEN-4607: Added VTreatmentEnd.cpp/.h, Added end treatment button to settings page, misc. cleanup.

  1. … 16 more files in changeset.
DEN-5341: Code Analysis

- some dox updated as well.

  1. … 1 more file in changeset.
DEN-5340 Code Coverage [100%]

- Coverage to 100%

- Added "Profile" build setup for Code Coverage Instrumentation and build in the workspace_UI with the output name of denaliSquish

- Modified the Pressure/Occlusion message to have new structure (last 3 of 5 fields changed to U32 from F32)

    • -9
    • +9
    ./hd/data/MTreatmentPressureOcclusionData.h
  1. … 5 more files in changeset.
DEN-4605: Updated unit tests

  1. … 5 more files in changeset.
DEN-5339: Integration Testing

- Debugging, Refactoring, Testing

    • -5
    • +8
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -3
    • +11
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -9
    • +13
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 28 more files in changeset.
Merge master into DEN-4598-Confirm-Priming-Begin

    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 4 more files in changeset.
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

  1. … 86 more files in changeset.
DEN-4601, DEN-4606: Added parameter to confirm message, updated tst_views, ensure value is set upon press and released in Slider.qml

    • -2
    • +6
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 13 more files in changeset.
5284: Implementation

Story related fixes:

- Used FW enum for Saline Bolus in Common repo

- txPaused modified the way FW understands and transmits.

Extra fixes:

- Changed the Ultrafiltration ref/meas vol to 3 decimal.

- Application version wasn't correctly shown

- Added a #define for the mouse event spy since on target it's not usually happening and is not useful neither on target nor on desktop for now.

- Fixed the author typo

  1. … 88 more files in changeset.
Merge master into DEN-4598-Confirm-Priming-Begin

    • -8
    • +132
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 41 more files in changeset.
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

  1. … 45 more files in changeset.
Merge master into DEN-3605_Create_Treatment

  1. … 26 more files in changeset.
DEN-5169: (Create Treatment Sliders) Updated RangeRect to use pressed and released instead of pressChanged

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

  1. … 160 more files in changeset.
DEN-3605, DEN-3726: Removed QThread from tst_views. Updated treatment parameter response ordering.

  1. … 5 more files in changeset.
DEN-4601: Renamed request model to keep it consistent.

    • -2
    • +2
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 1 more file in changeset.
Merge DEN-4787_bugfix_alarm_persists_after_hd_reboot to DEN-4598-Confirm-Priming-Begin

    • -1
    • +16
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 2 more files in changeset.
Updated the Models messages documentations do to V&V request.

    • -5
    • +15
    ./hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -24
    • +54
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 16 more files in changeset.