Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

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

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

Fixed.

Fixed.

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

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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.

Changing from U32 to S32. It is a relative ms timer (so wouldn't be negative), but I needed to initialize this to something less than zero so that alarm ranking logic will be forced to rank a brand...

Changing from U32 to S32. It is a relative ms timer (so wouldn't be negative), but I needed to initialize this to something less than zero so that alarm ranking logic will be forced to rank a brand new alarm (triggered 0 ms ago).

What's the significance of changing to U32? Is this being used as a timer?

What's the significance of changing to U32? Is this being used as a timer?

DEN-14999: Fixed alarm mgmt issue where top alarm may not be set if LOW priority alarm triggered. Ensure HD pump on flag is set to FALSE when pump controller is in off state.