hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-7605-hd_dg_dev-self-tests' into develop

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

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

Fixed merge conflicts.

DEN-7605: Increased alarm persistence for syringe pump speed alarm.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
Removed.

Removed.

DEN-8103: Moved integrity module to fwcommon

    • -135
    • +0
    /firmware/App/Services/Integrity.c
I think rather than 37, these should be the lowest high priority rank (i.e. 49) so we can add new alarms and not have to renumber these. Also, I think the range for high priority alarms should have...

I think rather than 37, these should be the lowest high priority rank (i.e. 49) so we can add new alarms and not have to renumber these. Also, I think the range for high priority alarms should have room for more than 50 alarms. Maybe high priority could be 1..499, medium priority 500..599, and low priority 600..699.

Dara, do we need these handlers or not?

Dara, do we need these handlers or not?

We should delete this dead code as well.

We should delete this dead code as well.

DEN-7605: Minor fixes.

    • -1
    • +2
    /firmware/App/Controllers/DGInterface.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts.

    • -9
    • +24
    /firmware/App/Controllers/BloodFlow.c
    • -1
    • +2
    /firmware/App/Controllers/DGInterface.c
DEN-7605: Fixed syringe pump speed issue.

    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-7605: Added flow sensor comm errors.

    • -9
    • +17
    /firmware/App/Controllers/BloodFlow.c
    • -9
    • +17
    /firmware/App/Controllers/DialInFlow.c
    • -11
    • +21
    /firmware/App/Controllers/PresOccl.c
DEN-8103: Implementation for alarm list

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

Pressure alarm fixes.

    • -5
    • +0
    /firmware/App/Controllers/DGInterface.h
    • -11
    • +21
    /firmware/App/Controllers/PresOccl.c
DEN-8103: Added mismatch check for alarm enum and alarm table

    • -0
    • +28
    /firmware/checkAlarms.sh
DEN-7605: Removed obsolete build switches.

    • -5
    • +0
    /firmware/App/Controllers/DGInterface.h
    • -4
    • +0
    /firmware/App/Controllers/SyringePump.c
DEN-8534: Initial push

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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

Merge branch 'DEN-7605-hd_dg_dev-self-tests' into develop

DEN-8103: Initial alarm list implementation

    • -20
    • +35
    /firmware/App/Services/AlarmMgmt.c
DEN-7605: Fixed speed calc for syringe pump.

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +3
    /firmware/App/Controllers/SyringePump.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop