hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-16200: Removed obsolete #define.

Merged DEN-16239

Merge branch 'staging' into DEN-16239-add-a-test-configuration-to-disable-blood-leak-alarm

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

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'staging' into DEN-16239-add-a-test-configuration-to-disable-blood-leak-alarm

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

Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override' into staging

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

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

DEN-16239 added the blood leak alarm disable test configuration

Merge branch 'DEN-16200-syringe-pump-stuck-in-priming-state' into develop

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-16200: Addressed code review comment. Addressed DEN-16229 re: Heparin not dispensing after alarm w/ blood recirc.

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

Merge branch 'DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error' into staging

Merge remote-tracking branch 'origin/DEN-15994-rinseback-5-minute-timer-does-not-count-down' into develop

DEN-15994-rinseback-5-minute-timer-does-not-count-down

Typo. Corrected display enable logic.

DEN-14692: Implemented the message handling for HD RAM status override.

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

Merge branch 'DEN-16200-syringe-pump-stuck-in-priming-state' into develop

DEN-16200: Changed venous occlusion alarm to only trigger when in pre-tx mode per discussion with Blaine.

DEN-16200: Addressed DEN-15618 re: no resume option in treatment end states.

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

Merge remote-tracking branch 'origin/DEN-15994-rinseback-5-minute-timer-does-not-count-down' into develop

DEN-15994-rinseback-5-minute-timer-does-not-count-down

Moved fix to correct message.

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

Fixed merge conflicts.

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +13
    /firmware/App/Controllers/SyringePump.c
DEN-16200: Added timeout to Heparin prime which will trigger occlusion alarm.

    • -1
    • +12
    /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
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c