Clone
 

bill bracken <bill@criticalsoftwaresolutions.com> in dgfirmware

Merge branch 'DEN-15979-fw-investigate-dg-rtc-synchronization-failure' into develop

Merge branch 'DEN-16466-alarm-282-dg-bicarbonate-concentration-bottle-low-volume-triggers-after-treatment' into develop

DEN-16466 Ignore bicarb/acid low volume alarms when at end of treatment or post,

Merge branch 'DEN-16466-alarm-282-dg-bicarbonate-concentration-bottle-low-volume-triggers-after-treatment' into develop

# Conflicts:

# firmware/App/DGCommon.h

DEN-16466 Allow alarm ID 282/281 to only occur in pre-treatment or treatment modes.

DEN-16466 Allow alarm ID 282 to only occur in pre-treatment or treatment modes.

DEN-16466 Allow alarm ID 282 to only occur in pre-treatment or treatment modes.

Merge branch 'DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment' into develop

    • -6
    • +16
    /firmware/App/Controllers/Pressures.c
DEN-15973 Code review changes

DEN-15973 Code review changes

DEN-15973 Remove unnecessary code per recent change.

DEN-15973 Change alarm 152 limits

    • -5
    • +13
    /firmware/App/Controllers/Pressures.c
DEN-15973 Surender changes.

DEN-15973 Update per code review comments

Merge branch 'DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment' into develop

DEN-15973 Requirements changes

DEN-15973 Change to alarm limits and persistence values

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

Merge branch 'DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment' into develop

DEN-15973 Move max pwm check to execROPumpMonitor

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

# Conflicts:

# firmware/App/DGCommon.h

Merge branch 'DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment' into develop

# Conflicts:

# firmware/App/DGCommon.h

Merge branch 'staging' into DEN-15979-fw-investigate-dg-rtc-synchronization-failure

Merge branch 'staging' into DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment

DEN-15973 Address code review comments

DEN-15973 Change persistence to 12 seconds

DEN-15973 Change #define name

DEN-15973 Correct #define name

DEN-13973 Rename alarm

DEN-15973 Add RO Pump max PWM alarm