Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into DEN-4690_Doxygenization

  1. … 110 more files in changeset.
DEN-4790 Code Review 0

    • -1
    • +0
    ./hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h
  1. … 12 more files in changeset.
DEN-4690: Doxygenization

- Completed updating the messaging models

- Updated the view classes

    • -0
    • +3
    ./hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h
  1. … 41 more files in changeset.
DEN-4690: Doxygenization

- Added more comments

- Added message table template.

- ...

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

  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

  1. … 69 more files in changeset.
DEN-4690: Doxygenization

- Fixed a code typo

  1. … 4 more files in changeset.
DEN-4690: Doxygenization

- Doxygenization

- File Names Camel Case

- Spell Checks

  1. … 197 more files in changeset.
DEN-4445: Code Review 0

  1. … 1 more file in changeset.
EMC Support and SD-Card Notification

  1. … 17 more files in changeset.
DEN-4445: Code Review 0

    • -1
    • +0
    ./vtreatmentadjustmentultrafiltrationconfirm.h
  1. … 2 more files in changeset.
EMC Support - Code Coverage / Integration Testing

  1. … 2 more files in changeset.
EMC Support

  1. … 10 more files in changeset.
Merge branch 'DEN-3875_Logging_2of3' into DEN-4438_SalineBolus

- DEN-3884: Code Review 0 applied to on going Code Review of Saline Bolus as well.

    • -3
    • +3
    ./vtreatmentadjustmentultrafiltrationconfirm.h
  1. … 10 more files in changeset.
DEN-3884: Code Review 0

- fixed typos

    • -4
    • +4
    ./vtreatmentadjustmentultrafiltrationstate.cpp
    • -4
    • +4
    ./vtreatmentadjustmentultrafiltrationstate.h
  1. … 25 more files in changeset.
DEN-3884: Code Review 0

    • -4
    • +4
    ./vtreatmentadjustmentultrafiltrationconfirm.h
  1. … 21 more files in changeset.
DEN-4441: Implementation

- Implemented the SRSUI 256: Restrictions - Max Delivered

  1. … 5 more files in changeset.
DEN-4441: Implementation/Ultrafiltration

- Also did the :

- DEN-4442: Unit Testing

- DEN-4443: Integration Testing

- DEN-4444: Code Coverage

    • -0
    • +66
    ./hd/adjustment/VTreatmentAdjustmentSaline.cpp
    • -0
    • +54
    ./hd/adjustment/VTreatmentAdjustmentSaline.h
    • -0
    • +44
    ./hd/data/VHDOperationModeData.cpp
    • -0
    • +45
    ./hd/data/VHDOperationModeData.h
    • -0
    • +26
    ./hd/data/VHDTreatmentStatesData.cpp
    • -0
    • +43
    ./hd/data/VHDTreatmentStatesData.h
    • -0
    • +27
    ./hd/data/VTreatmentSalineData.cpp
    • -0
    • +38
    ./hd/data/VTreatmentSalineData.h
  1. … 16 more files in changeset.
DEN-4441: Implementation

- removed extra E in log as a work around the issue with the adjustment models which have not yet inherited from MAbstract.

- in the section notification if the image is empty then assign the image place to the text to be align at the left most of the section.

- added a reason text by default in the response base class.

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

- added functionalities.

- Qml

- Views

- ...

    • -0
    • +52
    ./VTreatmentAdjustmentSaline.cpp
    • -0
    • +53
    ./VTreatmentAdjustmentSaline.h
    • -0
    • +27
    ./VTreatmentSalineData.cpp
    • -0
    • +38
    ./VTreatmentSalineData.h
    • -1
    • +1
    ./vtreatmentadjustmentultrafiltrationconfirm.h
  1. … 19 more files in changeset.
DEN-3884: Code Review 0

- fixed some typo and white spaces.

  1. … 5 more files in changeset.
DEN-3883: Coverage

  1. … 14 more files in changeset.
Merge master into Logging (#1 successful build and run)

  1. … 9 more files in changeset.
Resolve the merge conflicts of master into logging (#1 pass)

- This the first pass of the merging otherwise the code cannot be merged and committed.

- Next need to look at the code completely and see what has been merged and resolved automatically by git.

    • -9
    • +10
    ./vtreatmentadjustmentresponsebase.h
    • -9
    • +10
    ./vtreatmentadjustmentultrafiltrationconfirm.cpp
  1. … 60 more files in changeset.
4246: Merge Newly added Squish API Messages into Dial-In

- Has not been merged yet but preparing for.

  1. … 15 more files in changeset.
FW Support for HD/DG Debug Text & HDOpMode.

- Added a newly added channel to the list of listened channels eChlid_DG_UI = 0x070

- The MessageBuilder::getActionId implementation has been improved.

- New Messages has been added and enum/length defined as well.

- Message interpreter code has been improved to be easily modifiable.

- Changed the message ID enum ID_PowerOffBroadcast to ID_ShuttingDown.

- Added HDOperationMode to the setting screen.

- Made the floating point rounding optional by a #define and disabled the rounding for now.

- Inherit the MPowerOff Model from MAbstract as a new design.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +44
    ./VHDOperationModeData.cpp
    • -0
    • +45
    ./VHDOperationModeData.h
  1. … 29 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -9
    • +10
    ./vtreatmentadjustmentresponsebase.cpp
    • -9
    • +10
    ./vtreatmentadjustmentresponsebase.h
    • -9
    • +10
    ./vtreatmentadjustmentultrafiltrationconfirm.cpp
  1. … 184 more files in changeset.
DEN-3880 : Implementation

- Added application name and version in the log.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 2 more files in changeset.
DEN-3874 : HW Support [Per Peman's Email]

- Reversed the ValvesState view order.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -12
    • +12
    ./dg/data/VDGValvesStatesData.cpp
DEN-3874 : HW Support [Per Peman's Email]

- Just to keep the code. Needs clean up.

- Don't forget Logs (DG, HD is different)

- So many more.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +25
    ./dg/data/VDGDrainPumpData.cpp
    • -0
    • +36
    ./dg/data/VDGDrainPumpData.h
    • -0
    • +26
    ./dg/data/VDGHeatersData.cpp
    • -0
    • +37
    ./dg/data/VDGHeatersData.h
    • -0
    • +27
    ./dg/data/VDGLoadCellReadingsData.cpp
    • -0
    • +38
    ./dg/data/VDGLoadCellReadingsData.h
    • -0
    • +44
    ./dg/data/VDGOperationModeData.cpp
    • -0
    • +45
    ./dg/data/VDGOperationModeData.h
    • -0
    • +27
    ./dg/data/VDGPressuresData.cpp
    • -0
    • +38
    ./dg/data/VDGPressuresData.h
    • -0
    • +26
    ./dg/data/VDGROPumpData.cpp
    • -0
    • +37
    ./dg/data/VDGROPumpData.h
    • -0
    • +26
    ./dg/data/VDGReservoirData.cpp
    • -0
    • +37
    ./dg/data/VDGReservoirData.h
    • -0
    • +35
    ./dg/data/VDGTemperaturesData.cpp
  1. … 127 more files in changeset.