hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14999-2: Fixed bug in UF rate alarm detection.

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 updated the code based on the alarms table

DEN-14999-2: Removed alarm escalation feature.

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

Merge branch 'develop' of ssh://devapps.diality.us:7999/hd/hdfirmware into develop

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

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

    • -10
    • +36
    /firmware/App/Controllers/DGInterface.c
DEN-14830: compiler fixes.

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
DEN-14830: Reworked dialysate temperature logic so persistence triggers do not cancel each other out. Fixed air pump not turning off when dry self tests are user stopped.

    • -10
    • +36
    /firmware/App/Controllers/DGInterface.c
Merge branch 'DEN-14999-alarm-table-updates-part-2' into develop

    • -8
    • +8
    /firmware/App/Controllers/DGInterface.c
    • -9
    • +14
    /firmware/App/Controllers/PresOccl.c
    • -26
    • +0
    /firmware/App/Services/Reservoirs.c
DEN-14999-2: prevent treatment resumption from rinseback/recirc states if an alarm that blocks resume has been triggered previously in the treatment.

    • -0
    • +21
    /firmware/App/Modes/ModeTreatment.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: ignore venous occlusion alarm if venous pressure alarms disabled.

    • -9
    • +14
    /firmware/App/Controllers/PresOccl.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -21
    • +16
    /firmware/App/Controllers/DGInterface.c
DEN-14830: removed 2 dialysate temperature alarms.

    • -20
    • +19
    /firmware/App/Controllers/DGInterface.c
DEN-14830: PRS alignments

    • -9
    • +5
    /firmware/App/Controllers/DGInterface.c
Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

    • -5
    • +26
    /firmware/App/Controllers/DGInterface.c
DEN-14999 removed the depletion alarm (alarm 168)

    • -26
    • +0
    /firmware/App/Services/Reservoirs.c
DEN-14999-2: Removed alarms 214, 215 and 217.

DEN-14999-2: Shortened a few alarm enum names.

    • -8
    • +8
    /firmware/App/Controllers/DGInterface.c
DEN-14999-2: Use new CPLD A/C power loss input pin to detect power loss alarm quickly.

    • -14
    • +16
    /firmware/App/Controllers/Voltages.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merged staging

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -3
    • +3
    /firmware/App/Controllers/SyringePump.c
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
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.h
  1. … 6 more files in changeset.
Merged DEN-14999

DEN-14999: merged staging

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