canbus

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into DEN-6349_bp_hr_manual_entry

  1. … 10 more files in changeset.
DEN-6612 UI_DVT: Pre-Treatment Ultrafiltration

- This story wasn't part of the current sprint S37 but while I worked on it to be able to push it to master ASAP, so put the story as the commit comment.

  1. … 7 more files in changeset.
Merge branch 'master' into DEN-5751_Pre-TreatmentUltrafiltration

  1. … 9 more files in changeset.
Merge master into DEN-4860_BLE

  1. … 11 more files in changeset.
DEN-5836: Code Coverage

- 99.979% (4826/4827)

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

- commented as manually tested the AlarmClearedCondition.

  1. … 7 more files in changeset.
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

  1. … 5 more files in changeset.
DEN-4964: Addressed code review comments.

  1. … 1 more file in changeset.
DEN-4964: Addressed code review comments.

DEN-4964: Addressed code review comments.

DEN-4964: Addressed code review comments.

Resolved merge issue

Merge branch 'DEN-5830_AlarmDesign' into demo_test

  1. … 1 more file in changeset.
DEN-5754: Implementation

- cherry picked a fix from DEN-5830_AlarmDesign@51accb for the Treatment End message which has no payload.

- Also made the interpretMessage() for received messages to be more identical to the DEN-5830_AlarmDesign to hopefully help merging easier.

Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

  1. … 1 more file in changeset.
DEN-5833: Implementation

- Added a MACRO for convenience of empty payload messages handling.

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

  1. … 6 more files in changeset.
Merge DEN-4860_BLE into 2020_EOY_DEMO

  1. … 22 more files in changeset.
Merge master into DEN-4860_BLE

  1. … 21 more files in changeset.
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

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

- Added the message 63 (req/rsp)

  1. … 10 more files in changeset.
DEN-5833: Implementation

- fix a naming bug.

  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).

  1. … 3 more files in changeset.
DEN-5833: Implementation

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

- Cleaned up the VAlarmStatus class.

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

- Added User Action message response model.

  1. … 4 more files in changeset.
DEN-4964: Added DG Versions to Manager page.

  1. … 14 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. … 21 more files in changeset.
DEN-5754: Implementation

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

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

- reviewed the pre-treatment screens and modified

- added the double range slider for Arterial and Venous

- modified the treatmentBegin(ultrafiltration)

- so many other tweaks.

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

- reformat and commented out the message id debug log.

  1. … 1 more file in changeset.