hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-14999

Merge branch 'staging' into DEN-15102-hd-continues-treatment-when-dg-is-at-fault

Merge branch 'staging' into DEN-14999-alarm-table-updates-part-2

    • -24
    • +41
    /firmware/App/Controllers/DGInterface.c
Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-14999-alarm-table-updates-part-2

DEN-14999-2: Restored a/c power loss alarm detection.

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
Merged DEN-14830

DEN-14999 updated the alarms table

    • -19
    • +19
    /firmware/App/Controllers/BloodFlow.c
    • -10
    • +10
    /firmware/App/Controllers/DGInterface.c
    • -7
    • +7
    /firmware/App/Controllers/DialInFlow.c
    • -7
    • +7
    /firmware/App/Controllers/DialOutFlow.c
    • -29
    • +29
    /firmware/App/Controllers/PresOccl.c
    • -4
    • +4
    /firmware/App/Modes/PreTreatmentRecirc.c
  1. … 6 more files in changeset.
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-14999-2: Addressed code review comment.

Has 0 persistence on trigger. I'll remove.

Has 0 persistence on trigger. I'll remove.

where?

where?

Fixed. Thanks!

Fixed. Thanks!

Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

DEN-14830: fixed alarm mgmt faulting on clear.

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

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

HD-DEN-15049_FW HD Voltage Not Trigger Alarm 76 When Voltage Out OF Range IN Line
HD-DEN-15049_FW HD Voltage Not Trigger Alarm 76 When Voltage Out OF Range IN Line
Merge branch 'DEN-14999-alarm-table-updates-part-2' into develop

DEN-14999-2: Temporarily disable AC power loss alarm until CPLDs are updated in lab.

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

Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

    • -43
    • +7
    /firmware/App/Controllers/DGInterface.c
DEN-14830: Fixed alarm mgmt not clearing alarm ids under 30. Fixed Dial temps

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c