hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
Added exception for Stopped sub states and before door should be closed.

Added exception for Stopped sub states and before door should be closed.

Added

Added

Added.

Added.

Added.

Added.

Good catch. Updated.

Good catch. Updated.

Moved and used getSwitchStatus to ensure overrides work.

Moved and used getSwitchStatus to ensure overrides work.

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

DEN-12224 updated the software configurations

DEN-12224: swap order of startup events.

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

DEN-12224: Fixed countdown portion of bug DEN-12345.

    • -0
    • +12
    /firmware/App/Modes/ModeTreatment.c
DEN-10974 Code review updates

    • -21
    • +11
    /firmware/App/Controllers/Switches.c
Sean said leave it as is. No harm to be done.

Sean said leave it as is. No harm to be done.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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

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

Fixed. Thanks!

Fixed. Thanks!

Double #include. It is already written in SystemCommMessages.h

Double #include. It is already written in SystemCommMessages.h

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

DEN-12121: updates per peer review.