Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13427: post merge changes for staging

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

    • -103
    • +135
    ./Services/SystemCommMessages.c
DEN-13427: Addressed code review comments

DEN-13427: Changed timing and tolerance values for new dry self test states.

DEN-13427: Fixed Stability self test to be 3 seconds instead of 1.

fixed merge conflict into develop. Fixed wet self test event to show res 2 displacement

DEN-13427: Fixed warnings

DEN-13427: compilation fixes for develop merge regarding dry self test rework

DEN-13427: reworked dry self tests to include 2 new states to verify pressures.

DEN-13427: Updated no cartridge self tests to no longer check the pump track switch before no cartridge tests start.

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

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

Merge branch 'staging' into DEN-12609-sw_dev-sprint-69_mg

code review changes

DEN-13427: minor refactor of dry pressure leak self-test changes.

DEN-13427: Addressed issues based on feedback. Changed alarm IDs for pressure sensor setup and formatting.

DEN-13427: changed pressure sensor test to compare both venous and arterial. Added alarms for when we read pressure readings between -10 and 10mmHg before we start pressure sensor tests.

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

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

code review changes

DEN-13167 Resolve merge issues.

DEN-12609: fixed code review comments. changed variable naming and fixed alarm log with proper time

Merge branch 'staging' into DEN-12609-sw_dev-sprint-69_mg

DEN-12609: code review changes.

Merge branch 'staging' into DEN-13141-miscellaneous_hd_issues_bb

# Conflicts:

# firmware/App/Services/SystemCommMessages.c

    • -108
    • +141
    ./Services/SystemCommMessages.c
DEN-13141 Changes per code review

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

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

DEN-13141 Changes per code review.

Merge branch 'staging' into DEN-13167-sw_dev_sprint_74_darren