hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14547-incorrect-dg-event' into staging

Merge branch 'staging' into DEN-14547-incorrect-dg-event

DEN-14310 added code to prevent the trigger of the valves alarms in case any of the voltages alarms are active

HD-DEN-14561_Release Preprocessor Flag Specifies Code That Conflicts With SW Config Debug
HD-DEN-14561_Release Preprocessor Flag Specifies Code That Conflicts With SW Config Debug
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
    • -74
    • +122
    /firmware/App/Modes/ModePreTreat.c
RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

DEN-14310 merged staging

DEN-14561-2: Prevent pre-tx res mgr from switching to final fill for R2 until prime state machine is ready to use it.

    • -12
    • +26
    /firmware/App/Modes/ModePreTreat.c
DEN-14310 merged staging

    • -1
    • +11
    /firmware/App/Controllers/Voltages.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/SyringePump.c
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-14561: Addressed code review comment.

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DEN-14561: Have pre-tx res mgr switch to R2 after final fill before going to complete state.

DEN-14561: Addressed code review comments.

Fixed.

Fixed.

Fixed.

Fixed.