Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

  1. … 10 more files in changeset.
DEN-3884: Code Review 0

- fixed typos

    • -3
    • +3
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 20 more files in changeset.
DEN-4441: Implementation/Ultrafiltration

- Also did the :

- DEN-4442: Unit Testing

- DEN-4443: Integration Testing

- DEN-4444: Code Coverage

    • -1
    • +3
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 30 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

- ...

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

- Added required Models for 3 messages: req, res, data.

    • -3
    • +22
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +44
    ./hd/adjustment/MTreatmentAdjustSalineResponse.cpp
    • -0
    • +61
    ./hd/adjustment/MTreatmentAdjustSalineResponse.h
    • -0
    • +43
    ./hd/data/MTreatmentSalineData.cpp
    • -0
    • +63
    ./hd/data/MTreatmentSalineData.h
  1. … 1 more file in changeset.
DEN-3883: Coverage

  1. … 13 more files in changeset.
DEN-4246: Merge Newly added Squish API Messages into Dial-In

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

    • -0
    • +16
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 7 more files in changeset.
4246: Merge Newly added Squish API Messages into Dial-In

- Has not been merged yet but preparing for.

    • -6
    • +18
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -1
    • +6
    ./hd/data/MTreatmentPressureOcclusionData.h
  1. … 11 more files in changeset.
DEN-3881: Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 5 more files in changeset.
DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -3
    • +5
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 33 more files in changeset.
DEN-4002 : Implementation 2

- Improvements of log text and so .

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -6
    • +22
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
  1. … 5 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

    • -3
    • +5
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -29
    • +11
    ./hd/data/MHDOperationModeData.cpp
    • -22
    • +17
    ./hd/data/MHDOperationModeData.h
  1. … 19 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -9
    • +10
    ./mtreatmentadjustblooddialysateresponse.cpp
    • -9
    • +10
    ./mtreatmentadjustblooddialysateresponse.h
    • -9
    • +10
    ./mtreatmentadjustdurationresponse.cpp
    • -9
    • +10
    ./mtreatmentadjustdurationresponse.h
    • -9
    • +10
    ./mtreatmentadjustultrafiltrationconfirmresponse.cpp
  1. … 184 more files in changeset.
Updated alarm status messages and added newlines for long messages.

DEN-3874 : HW Support [Per Peman's Email]

- Unified All the Data messages to use the newly created parent model MAbstract.

- Cleaned up the logging class.

- Removed log_once macros.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -17
    • +11
    ./hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -15
    • +15
    ./hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -6
    • +4
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -12
    • +12
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
    • -36
    • +24
    ./hd/data/MTreatmentFlowsData.cpp
    • -20
    • +10
    ./hd/data/MTreatmentOutletFlowData.cpp
    • -18
    • +20
    ./hd/data/MTreatmentOutletFlowData.h
    • -15
    • +8
    ./hd/data/MTreatmentPressureOcclusionData.cpp
  1. … 17 more files in changeset.
DEN-3874 : HW Support [Per Peman's Email]

- Another try to make the code more clean.

- Qml doesn't accept enums with first letter non-capital [id => ID_]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -13
    • +7
    ./dg/data/MDGLoadCellReadingsData.cpp
  1. … 17 more files in changeset.
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
    • +43
    ./dg/data/MDGDrainPumpData.cpp
    • -0
    • +56
    ./dg/data/MDGDrainPumpData.h
    • -0
    • +48
    ./dg/data/MDGHeatersData.cpp
    • -0
    • +58
    ./dg/data/MDGHeatersData.h
    • -0
    • +53
    ./dg/data/MDGLoadCellReadingsData.cpp
    • -0
    • +60
    ./dg/data/MDGLoadCellReadingsData.h
    • -0
    • +38
    ./dg/data/MDGOperationModeData.cpp
    • -0
    • +54
    ./dg/data/MDGOperationModeData.h
    • -0
    • +53
    ./dg/data/MDGPressuresData.cpp
    • -0
    • +60
    ./dg/data/MDGPressuresData.h
    • -0
    • +48
    ./dg/data/MDGROPumpData.cpp
  1. … 127 more files in changeset.
DEN-3880 : Implementation

- Added Alarm Triggered Model

- Added Alarm Cleared Model

- Added Treatment State Model

- "UI," as Event Source to the Initialized and Some Other Event Messages for better logging

- Updated Ack messages and made them nicer for logging.

- Added DGCheckIn as a message to be logged.

- Stored Unit texts as a read only property in Variables qml file which had multiple definition multiple places.

- Changed the toString of models to use comma instead of parenthesis to be easily used in Excel as a CSV file format.

- Found a bug in TreatmentAdjustmentUltrafiltrationConfirm Screen slot which had volume defined as int that actually is a float value and causes the float to be truncated also the volume should be traslated int the VTreatmentAdjustmentUltrafiltratinConfirm to mL from Liter. Although HD wasn't using that value and was not complaining about it.

- Changed the current pew-set Volume value in the TreatmentAdjustmentUltrafiltrationEdit screen to be the current max value which is actually going to be changed by user.

- Changed to use the reference Volume to be used as the current collected volume in the Ultrafiltration section of the main treatment screen and the other Ultrafiltration adjustment screen that using it (Start. Paused, Edit).

- Added toString to the request models to be used for logging.

- Refactored the Message Interpreter response methods to be unique like the other improved latest methods (get<Method>s removed) [Reordered, Document cleanup, and so].

- Updated the manual in the MModel header for creating a model in regards to refactoring above.

- Updated Response Models in regards to the refactoring above.

- Made each byte space separator in Flags class in Types class for cleaner logging (will be used empty string in Alarm Status for logging).

- Changed the logging folder to be log folder (not event, error) and changed the log file extension for events/data to be .log and for errors to be .err.

- log file format modified to be CSV.

- Removed a not used fromByteArrayState method of mtreatmentadjustmentultrafiltrationconfirmresponse , mtreatmentadjustmentultrafiltrationeditresponse.

________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +38
    ./malarmtriggered.cpp
    • -1
    • +1
    ./mtreatmentadjustblooddialysateresponse.cpp
    • -1
    • +1
    ./mtreatmentadjustdurationresponse.cpp
    • -1
    • +1
    ./mtreatmentadjustultrafiltrationconfirmresponse.cpp
  1. … 48 more files in changeset.
Updated models and messaging tests for 100% code coverage. Fixed alarm status spacing.

  1. … 5 more files in changeset.
Updated alarm ID an messages

Merged master into UI Alarms.

  1. … 25 more files in changeset.
DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    ./mtreatmentadjustultrafiltrationstateresponse.h
  1. … 5 more files in changeset.
DEN-3157 : Code Coverage

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 3 more files in changeset.
DEN-3157 : Code Coverage

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    ./mtreatmentadjustultrafiltrationstateresponse.h
  1. … 11 more files in changeset.
DEN-3628 : EMC Test Support

- Adding Temperature sensors values on the settings diagnostic page.

- Applied Code Review comments.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +93
    ./mtemperaturesensors.cpp
    • -0
    • +70
    ./mtemperaturesensors.h
  1. … 20 more files in changeset.
DEN-3628 : EMC Test Support

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +53
    ./mloadcellreadings.cpp
    • -0
    • +54
    ./mloadcellreadings.h
  1. … 13 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- The third Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -3
    • +0
    ./mtreatmentadjustultrafiltrationconfirmresponse.h
    • -3
    • +0
    ./mtreatmentadjustultrafiltrationeditresponse.h
    • -4
    • +4
    ./mtreatmentadjustultrafiltrationstateresponse.cpp
    • -3
    • +3
    ./mtreatmentadjustultrafiltrationstateresponse.h
  1. … 20 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- The second Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 13 more files in changeset.