Clone
 

bill bracken <bill@criticalsoftwaresolutions.com> in common

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

# Conflicts:

# AlarmDefs.h

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

# Conflicts:

# AlarmDefs.h

DEN-15973 Merge staging

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

# Conflicts:

# AlarmDefs.h

DEN-15973 Update alarm tables

DEN-15973 Rename alarm

DEN-15973 Add RO Pump max PWM alarm. NOTE: Descriptive text needs to be verified

DEN-15363 Repurpose alarm ID 63

DEN-15363 Add initial alarm table entry

Merge branch 'DEN-14646-fpga-alarm-properties-and-timing-3' into staging

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

DEN-14646 Update removed alarms to available

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

# Conflicts:

# AlarmDefs.h

DEN-14646 Remove alarm 92

DEN-14646 Alarm update.

Merge branch 'DEN-13946-certain-temperature-sensors-trigger-wrong-alarm' into staging

Merge branch 'DEN-13946-certain-temperature-sensors-trigger-wrong-alarm' into develop

DEN-13946 Update per code review

Merge branch 'DEN-13786-hd_dg_dev-s78_bb' into staging

Merge branch 'DEN-13786-hd_dg_dev-s78_bb' into develop

Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

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

Merge branch 'DEN-13786-hd_dg_dev-s78_bb' into staging

DEN-13786 Correct alarm spelling error. Set DGFault to TRUE for alarm 102.

Merge branch 'staging' into develop