Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into develop

DEN-13801: Further merge fixes.

DEN-13460: Removed alarm 220 (battery charge low). Added battery remaining capacity monitor - use for blocking treatment start if < 10 min. For now, comment out blocking treatment, as most battery reads appear to not be working.

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into develop

DEN-13801: fixes for merge conflict

DEN-13801: DEN-13426: wrapped a new minimum occlusion sensor count behind the V3 SWConfig.

DEN-13460 added PiSquare VectorCAST

DEN-13801: updated pressure values for Dry Self Test for both arterial and venous that are achievable within the time frame that blood pump runs.

DEN-13801: Decay State of Dry Self Tests now updates the peak pressure value after pump has stopped due to filter lag.

DEN-13598 updated the code

Keep this blank line. Separate declarations from code.

Keep this blank line. Separate declarations from code.

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

DEN-13427: post merge changes for staging

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DEN-13598 Update code for new SRS with alarms.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Remove blank line.

Remove blank line.

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

DEN-13834 updated the blood leak self test status set

Merge branch 'staging' into DEN-13427-sw_dev-sprint-75_mg

    • -103
    • +135
    ./Services/SystemCommMessages.c
Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

DEN-13427: Addressed code review comments