hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11928 merged staging

    • -104
    • +77
    /firmware/App/Controllers/SyringePump.c
    • -9
    • +15
    /firmware/App/Modes/ConsumableSelfTest.c
    • -31
    • +32
    /firmware/App/Modes/ModePostTreat.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/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.h
    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.h
  1. … 29 more files in changeset.
Merge branch 'DEN-12215-sw_dev_sprint_65_darren' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12215-sw_dev_sprint_65_darren

DEN-10974 Remove Door check in Post Treat confirm cartride removed state. Not required.

    • -18
    • +11
    /firmware/App/Modes/ModePostTreat.c
DEN-12215 addressed the code review comment

    • -3
    • +3
    /firmware/App/Modes/ConsumableSelfTest.c
DEN11250 Added code to allow resume after syringe pump occlusion has been removed - moved here from commit 1bb17047684 in DEN-11250 branch

DEN-11250 Fixed syringe pump occlusion alarm not triggered - moved commit 269329748ff from DEN-11250 to here

    • -4
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-11928 Addressed peer review comments

DEN-11928 Fixed compile errors

DEN-11928 Merged commit 2df3175ad36 to DEN-11928 branch

staging branch merge to resolve compiler errors from common header files.

    • -2
    • +2
    /firmware/App/Modes/ConsumableSelfTest.c
DEN-10974 Fix Syringe Removed Alarm.

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

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

Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

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/Modes/ConsumableSelfTest.c
DEN-12224: Changed user ACK status bit and alarm property to Ok button only status bit and clear only alarm property

Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

DEN-12121: Unborked staging

cherry pick of "Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12224-dg_hd_dev-switches-monitor".

Sync'd hdfirmware with common defs that were in staging. Fixed compilation errors that occurred due to reorganization.

    • -3
    • +3
    /firmware/App/Modes/ConsumableSelfTest.c
Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

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

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

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

Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

DEN-12215 Merged Staging branch. Updated DG_FILL_ defs, WET_SELF_TESTS_ defs.

    • -43
    • +49
    /firmware/App/Controllers/AirTrap.c
    • -54
    • +91
    /firmware/App/Controllers/BloodFlow.c
    • -42
    • +139
    /firmware/App/Controllers/BloodLeak.c
    • -34
    • +40
    /firmware/App/Controllers/Bubble.c
    • -25
    • +26
    /firmware/App/Controllers/DGInterface.c
    • -49
    • +87
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +2
    /firmware/App/Controllers/DialInFlow.h
    • -36
    • +85
    /firmware/App/Controllers/DialOutFlow.c
    • -2
    • +3
    /firmware/App/Controllers/DialOutFlow.h
    • -46
    • +115
    /firmware/App/Controllers/Fans.c
    • -8
    • +10
    /firmware/App/Controllers/FluidLeak.c
    • -160
    • +320
    /firmware/App/Controllers/PresOccl.c
  1. … 37 more files in changeset.
DEN-10974 Code review updates

    • -21
    • +11
    /firmware/App/Controllers/Switches.c
Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

DEN-12121: updates per peer review.