Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge DEN-14860

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.

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

Fixed merge conflicts from DEN-14999.

Merge branch 'develop' of ssh://devapps.diality.us:7999/hd/hdfirmware into develop

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

Reverted previous change to re-enable re-prime feature and allow zero UF rate.

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.

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

Fixed merge conflicts.

    • -18
    • +146
    ./Services/SystemCommMessages.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

DEN-14906: fixed merge conflicts from staging.

    • -182
    • +322
    ./Services/SystemCommMessages.c
Merge branch 'staging' into DEN-14999-alarm-table-updates

DEN-14999: Fixed issue with repeated trimmer heater commands being sent to DG.

DEN-14906: Disabled re-prime feature.

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

Merge branch 'DEN-14906-dialyzer-de-prime' into develop

DEN-14906: re-enabled re-prime.

DEN-14906: Fixed arterial high pressure check while in adjunct treatment states.

DEN-14999: Dont trigger alarm 312 unless in treatment mode or pre-treatment mode after priming complete.

DEN-14906: Fixed isues that arose when disabling re-prime feature.

DEN-14906: Addressed code review comment.

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

Merge DEN-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off

Cherry picked merge, due to staging/develop conflicts

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

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

DEN-14999: Set UI as communicating on any msg received from UI (not just check-in) to address DEN-14928.