hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12845 resolved merge conflicts during cherry picking process

    • -0
    • +98
    /firmware/App/Controllers/Buttons.c
    • -1
    • +12
    /firmware/App/Controllers/Switches.c
    • -0
    • +5
    /firmware/App/Controllers/SyringePump.c
DEN-12847 Load cell drift check for stable reservoirs at full and empty.

    • -0
    • +32
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +2
    /firmware/App/Controllers/DGInterface.h
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 messages

Should we set this flag only if we are in normal state?

Should we set this flag only if we are in normal state?

Remove extra blank line.

Remove extra blank line.

Should this be set to FALSE?

Should this be set to FALSE?

"reset" should be "rest" I think.

"reset" should be "rest" I think.

Agree. Dara, make these look something like "C_CALIBRATION_CMD".

Agree. Dara, make these look something like "C_CALIBRATION_CMD".

We will want to tighten these eventually.

We will want to tighten these eventually.

It is used on lines 302, 1172, 1795, 1875.

It is used on lines 302, 1172, 1795, 1875.

We want release s/w to be fully enabled with no special test code. SW configs are structured such that a disabled config is what is wanted for release s/w and so forcing all s/w configs to be disab...

We want release s/w to be fully enabled with no special test code. SW configs are structured such that a disabled config is what is wanted for release s/w and so forcing all s/w configs to be disabled in a release build ensures we don't accidentally leave a config in the wrong state.

NoDRcr should be FALSE.

NoDRcr should be FALSE.

NoBRcr should be TRUE and NoDRcr should be FALSE.

NoBRcr should be TRUE and NoDRcr should be FALSE.

Do we need this state?

Do we need this state?

For all DG faults, the NoRes should be TRUE, but the NoRin and NoEnd should be FALSE so user can perform rinseback and/or end treatment.

For all DG faults, the NoRes should be TRUE, but the NoRin and NoEnd should be FALSE so user can perform rinseback and/or end treatment.

Do not monitor for user limits when in blood prime state

Corrected error in choosing states for applying alarms when not dialyzing

Added alarms for venous and arterial pressure whenn in treatment but not dialyzing

    • -2
    • +26
    /firmware/App/Controllers/PresOccl.c
DEN-12224: Moved some treatment definitions from HDDefs.h to ModeTreatment.h.

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/SyringePump.c
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.