Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-12609-sw_dev-sprint-69_mg

code review changes

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

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

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

  1. … 18 more files in changeset.
DEN-12931 addressed the code review comment

DEN-12931 addressed the code review comments

DEN-12931 removed and old message

DEN-12931 addressed the code review comments

DEN-13167 Code review comment updates 1.

DEN-13167 Update Load Cell drift to use Start to Final only.

Merge branch 'staging' into DEN-13141-miscellaneous_hd_issues_bb

DEN-13141 DEN-13149 Resolved alarm 219 (ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED). Removed check for presence of syringe pump.

DEN-12931 added isnan math function to prevent NaN values to be used in HD

DEN-12931: Updated blood flow estimation parameters for new tubing.

Merged staging and resolved the conflicts

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

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