common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts from DEN-14999.

Merge branch 'staging' into develop

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

Merged DEN-14906 into staging.

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

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

DEN-14999: Fixed alarms 171,172 text not fitting on screen issue.

DEN-15014 updated unused messages to support RO only mode

Can we rename variable to reflect it is a timer counter at least?

Can we rename variable to reflect it is a timer counter at least?

The variable that define is being compared to is valveStateMismatchCounter which is why I called it such.

The variable that define is being compared to is valveStateMismatchCounter which is why I called it such.

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into staging

Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into develop

Fixed.

Fixed.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Yes, and #define has "COUNT" in its name which was my point.

Yes, and #define has "COUNT" in its name which was my point.

DEN-14999: Removed alarm ID 258 (made available) as it was obsolete.

DEN-14999: Split alarm 46 (no ACK) into 2 alarms. 46 is for msg to UI w/ no ACK. 18 is for msg to DG w/ no ACK.

Should venPres < venLowLimit be done outside if statement?

Should venPres < venLowLimit be done outside if statement?

DG-DEN-15014_DG HD Dev HD DG Dvt Update Part 11
DG-DEN-15014_DG HD Dev HD DG Dvt Update Part 11
DEN-14646 Remove alarm 92

Corrected

Corrected

Alarm is based on a counter. The #define corresponds to a 100ms time.

Alarm is based on a counter. The #define corresponds to a 100ms time.