hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13167 Resolve merge issues.

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.

Merged staging and resolved the conflicts

    • -1
    • +4
    /firmware/App/Controllers/DGInterface.h
    • -11
    • +7
    /firmware/App/Controllers/SyringePump.c
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
DEN-12847 removed AC POST

DEN-12931: Removed POST test for checking if booting from battery.

DEN-12931: Changed syringe pump calibration to expected DAC voltage. Added verification of calibration.

    • -12
    • +12
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.h
DEN-12931: Refactored syringe detection alarm mgmt.

    • -16
    • +56
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +1
    /firmware/App/Controllers/SyringePump.h
    • -12
    • +3
    /firmware/App/Modes/ModePostTreat.c
DEN-12847 addressed code review comment

    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
DEN-12847 merged staging and addressed VectorCAST issues

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -6
    • +24
    /firmware/App/Controllers/PresOccl.c
    • -3
    • +14
    /firmware/App/Controllers/Switches.c
    • -2
    • +26
    /firmware/App/Controllers/SyringePump.c