hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge DEN-14860 branch

    • -10
    • +10
    /firmware/App/Services/Reservoirs.c
DEN-14999: Removed obsolete/redundant alarms. Addressed code review comment.

    • -31
    • +2
    /firmware/App/Modes/TreatmentRecirc.c
DEN-14999: on blood leak detection, alarm, but then go to init state to prevent re-trigger after alarm cleared.

DEN-15016-system-faults-during-treatment-then-returns-to-the-standby-screen

Increased message ACK timeouts, for both DG and UI.

DEN-14860 Updated headers per code review comment.

    • -10
    • +10
    /firmware/App/Services/Reservoirs.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14999-alarm-table-updates' into develop

DEN-14999: Removed minimum UF change. Added 250ms of persistence to HD fluid leak alarm. Increased no ack retries from 8 to 10 because UI needed more time at startup. Accept UI check-in message regardless of payload size because UI is sending 2 different flavors of check-in message.

    • -1
    • +11
    /firmware/App/Controllers/FluidLeak.c
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.h
DEN-14999: Do not alarm after rinseback completed due to 15 min t/o.

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

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

Merge DEN-14860

    • -47
    • +86
    /firmware/App/Services/Reservoirs.c
Fixed merge conflict from staging.

    • -14
    • +7
    /firmware/App/Controllers/DialInFlow.c
    • -12
    • +77
    /firmware/App/Controllers/DialOutFlow.c
    • -26
    • +64
    /firmware/App/Controllers/PresOccl.c
DEN-14999: Removed alarm 306. Increased t/o on alarm 318 to 10 sec. Change alarm 141 to not clear immediate, but instead clear when low level sees fluid.

    • -27
    • +7
    /firmware/App/Controllers/AirTrap.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts from DEN-14999.

    • -3
    • +24
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -3
    • +18
    /firmware/App/Controllers/DialInFlow.c
    • -0
    • +1
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'develop' of ssh://devapps.diality.us:7999/hd/hdfirmware into develop

DEN-14999: Log DG command ID for rejected DG command alarm.

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
Reverted previous change to re-enable re-prime feature and allow zero UF rate.

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

Re-Prime feature re-enabled for this build. Minimum UF rate set back to zero for this build.

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

Fixed merge conflicts.

    • -3
    • +32
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +4
    /firmware/App/Controllers/DGInterface.h
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
    • -51
    • +220
    /firmware/App/Modes/ModeStandby.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
Merged DEN-14906 into staging.

DEN-14906: fixed merge conflicts from staging.

    • -1
    • +10
    /firmware/App/Controllers/BloodFlow.c
    • -7
    • +15
    /firmware/App/Controllers/DialInFlow.c
    • -2
    • +2
    /firmware/App/Modes/ModeTreatmentParams.c
    • -3
    • +35
    /firmware/App/Services/Reservoirs.c
    • -182
    • +322
    /firmware/App/Services/SystemCommMessages.c
Merge branch 'staging' into DEN-14999-alarm-table-updates

    • -10
    • +15
    /firmware/App/Modes/ModePreTreat.c
DEN-14999: Fixed issue with repeated trimmer heater commands being sent to DG.

    • -2
    • +24
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h