Controllers

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14999-alarm-table-updates-part-2' into develop

  1. … 2 more files in changeset.
DEN-14999 updated the code based on the alarms table

  1. … 2 more files in changeset.
Merge branch 'develop' of ssh://devapps.diality.us:7999/hd/hdfirmware into develop

Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

  1. … 1 more file in changeset.
DEN-14830: compiler fixes.

DEN-14830: Reworked dialysate temperature logic so persistence triggers do not cancel each other out. Fixed air pump not turning off when dry self tests are user stopped.

  1. … 1 more file in changeset.
Merge branch 'DEN-14999-alarm-table-updates-part-2' into develop

  1. … 2 more files in changeset.
DEN-14999-2: ignore venous occlusion alarm if venous pressure alarms disabled.

Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

DEN-14830: removed 2 dialysate temperature alarms.

DEN-14830: PRS alignments

Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

DEN-14999-2: Shortened a few alarm enum names.

DEN-14999-2: Use new CPLD A/C power loss input pin to detect power loss alarm quickly.

  1. … 9 more files in changeset.
Merged staging

  1. … 3 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 9 more files in changeset.
DEN-14999: merged staging

  1. … 1 more file in changeset.
DEN-14999: Removed BP and DPi flow range checks.

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

  1. … 1 more file in changeset.
DEN-14999: updates to pressure POST test and 24V range alarms.

DEN-14999: on blood leak detection, alarm, but then go to init state to prevent re-trigger after alarm cleared.

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. … 3 more files in changeset.
Fixed merge conflict from staging.

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.

Fixed merge conflicts from DEN-14999.

  1. … 1 more file in changeset.
DEN-14999: Log DG command ID for rejected DG command alarm.

Fixed merge conflicts.

  1. … 6 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 9 more files in changeset.
DEN-14906: fixed merge conflicts from staging.

  1. … 8 more files in changeset.
DEN-14999: Fixed issue with repeated trimmer heater commands being sent to DG.

  1. … 1 more file in changeset.