Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into DEN-4598-Confirm-Priming-Begin

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

    • -2
    • +2
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustDurationResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustRequests.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  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
    ./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
    • +1
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -1
    • +1
    ./adjustment/MTreatmentAdjustDurationResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -1
    • +1
    ./adjustment/MTreatmentAdjustRequests.h
    • -1
    • +1
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -1
    • +1
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -1
    • +1
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 88 more files in changeset.
Merge master into DEN-4598-Confirm-Priming-Begin

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

    • -2
    • +2
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustDurationResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -3
    • +5
    ./adjustment/MTreatmentAdjustRequests.h
    • -1
    • +1
    ./adjustment/MTreatmentAdjustSalineResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustSalineResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -2
    • +2
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -1
    • +1
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 160 more files in changeset.
DEN-5171: Added blood flow and dialysate inlet flow signal percentage.

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

    • -2
    • +2
    ./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
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 3 more files in changeset.
Updated the Models messages documentations do to V&V request.

    • -5
    • +15
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -6
    • +15
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -24
    • +54
    ./adjustment/MTreatmentAdjustRequests.h
    • -3
    • +13
    ./adjustment/MTreatmentAdjustSalineResponse.h
    • -5
    • +17
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -5
    • +21
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -4
    • +11
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
    • -4
    • +16
    ./data/MTreatmentPressureOcclusionData.h
  1. … 16 more files in changeset.
DEN-4981: Create Treatment models subclass MModel and MAbstract now.

    • -11
    • +62
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 10 more files in changeset.
DEN-4787: Updated alarms messaging

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

    • -10
    • +29
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 29 more files in changeset.
DEN-4601, DEN-4598: Added confirm, priming, and begin pages and messaging.

    • -1
    • +51
    ./adjustment/MTreatmentAdjustRequests.h
    • -0
    • +30
    ./data/MPrimingData.cpp
    • -0
    • +46
    ./data/MPrimingData.h
  1. … 49 more files in changeset.
Make the Message tables payload vertical so can be fit in a page.

- That's an start and template not complete.

    • -0
    • +4
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -0
    • +5
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -0
    • +6
    ./adjustment/MTreatmentAdjustRequests.h
    • -0
    • +3
    ./adjustment/MTreatmentAdjustSalineResponse.h
    • -0
    • +4
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -0
    • +4
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -0
    • +4
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
    • -0
    • +3
    ./data/MTreatmentPressureOcclusionData.h
  1. … 15 more files in changeset.
DEN-4964: Made naming convention of HD Accelerometer model consistent with rest of code base

  1. … 1 more file in changeset.
DEN-4964: Finished implementation of HD Accelerometer

  1. … 4 more files in changeset.
DEN-4964: UI messaging initial push with HD Accelerometer

    • -0
    • +68
    ./data/MHDAccelerometerData.cpp
    • -0
    • +76
    ./data/MHDAccelerometerData.h
  1. … 10 more files in changeset.
Merge branch 'master' into DEN-4690_Doxygenization

    • -6
    • +7
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustDurationResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -3
    • +2
    ./adjustment/MTreatmentAdjustRequests.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustSalineResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustSalineResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 110 more files in changeset.
DEN-4690: Doxygenization

- made the saline bolus response message definition consistent.

    • -3
    • +3
    ./adjustment/MTreatmentAdjustSalineResponse.h
DEN-4690: Doxygenization

- Completed updating the messaging models

- Updated the view classes

    • -5
    • +5
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -5
    • +5
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -3
    • +70
    ./adjustment/MTreatmentAdjustRequests.h
    • -4
    • +4
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -4
    • +4
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -4
    • +4
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
    • -3
    • +3
    ./data/MTreatmentPressureOcclusionData.h
  1. … 41 more files in changeset.
DEN-4690: Doxygenization

- updated the models regarding the messages

    • -10
    • +10
    ./data/MTreatmentOutletFlowData.h
    • -10
    • +10
    ./data/MTreatmentPressureOcclusionData.h
  1. … 10 more files in changeset.
DEN-4690: Doxygenization

- Added more comments

- Added message table template.

- ...

    • -0
    • +5
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -0
    • +11
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -0
    • +5
    ./adjustment/MTreatmentAdjustDurationResponse.cpp
    • -0
    • +11
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -0
    • +9
    ./adjustment/MTreatmentAdjustRequests.h
    • -0
    • +5
    ./adjustment/MTreatmentAdjustSalineResponse.cpp
    • -2
    • +3
    ./adjustment/MTreatmentAdjustSalineResponse.h
    • -0
    • +5
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
    • -0
    • +11
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -0
    • +5
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
    • -0
    • +11
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -0
    • +5
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -0
    • +11
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 95 more files in changeset.
DEN-4690: Doxygenization

- Add messaging table as example

- Improve messaging diagram

- Add MAbstract methods comments.

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

    • -6
    • +7
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustDurationResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustRequests.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustSalineResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustSalineResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -6
    • +7
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 242 more files in changeset.
DEN-4690: Doxygenization

- Filename changed to Camel Case

- Diagrams updated

- Figured out how to set macro references in doxygen and updated the code dox

- Figured out how to draw diagrams in doxygen and updated the code dox

    • -4
    • +2
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 83 more files in changeset.
DEN-4690: Doxygenization

- Fixed a code typo

    • -3
    • +3
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -2
    • +2
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
  1. … 3 more files in changeset.
DEN-4690: Doxygenization

- Doxygenization

- File Names Camel Case

- Spell Checks

    • -1
    • +0
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -1
    • +0
    ./adjustment/MTreatmentAdjustDurationResponse.h
    • -4
    • +7
    ./adjustment/MTreatmentAdjustRequests.h
    • -1
    • +0
    ./adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -1
    • +0
    ./adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -1
    • +0
    ./adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
    • -1
    • +0
    ./data/MTreatmentPressureOcclusionData.h
  1. … 197 more files in changeset.
DEN-4445: Code Review 0

    • -1
    • +0
    ./adjustment/MTreatmentAdjustSalineResponse.h
  1. … 7 more files in changeset.
DEN-3884: Code Review 0

- fixed typos

    • -1
    • +1
    ./adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -3
    • +3
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 25 more files in changeset.