hdfirmware

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

code review changes

    • -13
    • +5
    /firmware/App/Controllers/PresOccl.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
code review changes

Merge branch 'DEN-13141-miscellaneous_hd_issues_bb' into staging

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

    • -3
    • +23
    /firmware/App/Controllers/PresOccl.c
    • -94
    • +32
    /firmware/App/Modes/ModePreTreat.c
DEN-12609: code review changes.

Merge branch 'staging' into DEN-13141-miscellaneous_hd_issues_bb

# Conflicts:

# firmware/App/Services/SystemCommMessages.c

    • -108
    • +141
    /firmware/App/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
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.h
    • -1
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
  1. … 18 more files in changeset.
DEN-12931 addressed the code review comment

DEN-12931 addressed the code review comments

    • -53
    • +53
    /firmware/App/Controllers/BloodLeak.c
DEN-12931 removed and old message

DEN-12931 addressed the code review comments

    • -52
    • +53
    /firmware/App/Controllers/BloodLeak.c
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.

Merge branch 'DEN-12931-dg_hd_dev-hd_dg_dvt-update' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12931-dg_hd_dev-hd_dg_dvt-update

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

    • -0
    • +8
    /firmware/App/Controllers/DGInterface.c
Merge branch 'DEN-12931-dg_hd_dev-hd_dg_dvt-update' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12931-dg_hd_dev-hd_dg_dvt-update

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