common

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14999-alarm-table-updates' of ssh://dvm-linux02:7999/comm/common into DEN-14999-alarm-table-updates

DEN-14999 updated the alarms table

DEN-14999 updated the alarms table

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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

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

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

DEN-14646 Update removed alarms to available

I don't see it, but resolving anyway. RESOLVED in CODE WALKTHROUGH.

I don't see it, but resolving anyway.
RESOLVED in CODE WALKTHROUGH.

DEN-14999: Removed obsolete/redundant alarms.

DEN-14999: Removed alarm 116 - redundant with alarm 115.

DEN-14999: Updated properties for blood leak alarm. Removed alarm 203.

Spaces inside (). And explicit condition (i.e. ( TRUE == isConvNotValid ).

Spaces inside (). And explicit condition (i.e. ( TRUE == isConvNotValid ).

Corrected

Corrected

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

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

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

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

# Conflicts:

# AlarmDefs.h

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Done

Done

I did. I still see a call to sendAckResponseMsg() and I don't think it should be here.

I did. I still see a call to sendAckResponseMsg() and I don't think it should be here.

DEN-15014 merged staging

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Check the diff of the last two commits.

Check the diff of the last two commits.

What I meant is that we don't need to send anything other than response.

What I meant is that we don't need to send anything other than response.

Done

Done

Remove TODO?

Remove TODO?