Clone
 

bill bracken <bill@criticalsoftwaresolutions.com> in hdfirmware

Revert "Merge branch 'DENBUG-101-dpi-does-not-run-when-blood-leak-sensor-fails-to-zero' into staging"

This reverts commit 4305d29abf3256f959aea88e5755bff15395e9fb, reversing

changes made to 8d632beee12193c2ae9aa899263b39e310bcdbf7.

    • -17
    • +4
    /firmware/App/Controllers/BloodLeak.c
Merge branch 'DENBUG-101-dpi-does-not-run-when-blood-leak-sensor-fails-to-zero' into staging

    • -4
    • +17
    /firmware/App/Controllers/BloodLeak.c
DENBUG-101 Update function header per code review comment

Merge branch 'DENBUG-101-dpi-does-not-run-when-blood-leak-sensor-fails-to-zero' into develop

DENBUG-101 Correct BLD zero retry count

    • -4
    • +15
    /firmware/App/Controllers/BloodLeak.c
Merge branch 'DEN-15979-fw-investigate-dg-rtc-synchronization-failure' into develop

# Conflicts:

# firmware/App/HDCommon.h

DEN-15979 Add isValidEpoch to HD set RTC

Merge branch 'STT-1965-srshd-1395-the-hd-software-shall-trigger-alarm-98-if-an-error-is-detected-on-the-battery' into staging

Merge branch 'STT-1965-srshd-1395-the-hd-software-shall-trigger-alarm-98-if-an-error-is-detected-on-the-battery' into develop

# Conflicts:

# firmware/App/Controllers/DGInterface.c

# firmware/App/HDCommon.h

    • -11
    • +11
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
    • -2
    • +2
    /firmware/App/Controllers/Temperatures.c
STT-1965 Update per code review comments

STT-1965 Allow reset of override state in getI2CStatusRegister

Merge branch 'STT-2897-bug-alarm-104-alarm_id_hd_air_trap_illegal_levels-triggers-before-2s' into staging

    • -20
    • +19
    /firmware/App/Controllers/AirTrap.c
Merge branch 'staging' into STT-1965-srshd-1395-the-hd-software-shall-trigger-alarm-98-if-an-error-is-detected-on-the-battery

STT-1965 batteryI2CStatusRegister overide now reasets when value is read and is in an overriden state.

Merge remote-tracking branch 'origin/staging' into staging

Merge branch 'DEN-16245-hd.valves.cmd_set_hd_valve_current_override-rejects-any-value' into staging

Merge branch 'STT-2897-bug-alarm-104-alarm_id_hd_air_trap_illegal_levels-triggers-before-2s' into develop

STT-2897 Replace alarm persistence counter with persistent alarm functions

    • -18
    • +16
    /firmware/App/Controllers/AirTrap.c
Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:

# firmware/App/HDCommon.h

Merge branch 'DEN-16245-hd.valves.cmd_set_hd_valve_current_override-rejects-any-value' into develop

# Conflicts:

# firmware/App/HDCommon.h

STT-2897 Correct alarm persistence

DEN-16245 Valve override valide for both RELEASE and DEBUG

Merge branch 'DEN-15993-during-treatment-alarms-167-and-door-and-latch-open-offer-resume-option-that' into staging

Merge branch 'DEN-15993-during-treatment-alarms-167-and-door-and-latch-open-offer-resume-option-that' into develop

DEN-15993 Make same logic change for cartridge level (AlarmID 85)

Merge branch 'DEN-15993-during-treatment-alarms-167-and-door-and-latch-open-offer-resume-option-that' into develop

# Conflicts:

# firmware/App/HDCommon.h

DEN-15993 Correct resume handling for front door

Merge branch 'DEN-15363-fw-handle-bld-sensor-communication-errors' into staging

    • -5
    • +12
    /firmware/App/Controllers/BloodLeak.c
Merge branch 'staging' into DEN-15363-fw-handle-bld-sensor-communication-errors

Merge remote-tracking branch 'origin/DEN-15363-fw-handle-bld-sensor-communication-errors' into develop

    • -5
    • +12
    /firmware/App/Controllers/BloodLeak.c