Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14344-sw-s85-mg-air-pump' into develop

DEN-14344: compiler fixes

DEN-14344: fixed merge conflict missing lines.

Merge branch 'staging' into DEN-14344-sw-s85-mg-air-pump

DEN-14099 Change PURGE_AIR_TIME_OUT_COUNT to 4min. Remove debug output.

DEN-14099 Bubble clear mods to state machine.

DEN-14344: Misc formatting fixes.

Can't have gaps in alarm enum/tables - will not compile. Need to pull in alarms from other branches if necessary to fill the gaps.

Can't have gaps in alarm enum/tables - will not compile. Need to pull in alarms from other branches if necessary to fill the gaps.

Set this to something between 0 and 19 (for staggering different broadcasts over typical 1 second interval). Use it to initialize data publication timer counter (which is currently not initialized ...

Set this to something between 0 and 19 (for staggering different broadcasts over typical 1 second interval).
Use it to initialize data publication timer counter (which is currently not initialized at all).

Remove blank line.

Remove blank line.

Keep blank line between functions.

Keep blank line between functions.

Need function header.

Need function header.

Remove extra blank line.

Remove extra blank line.

RESOLVED IN CODEWALKTHROUGH.

RESOLVED IN CODEWALKTHROUGH.

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

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

  1. … 6 more files in changeset.
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14344-sw-s85-mg-air-pump' into develop

DEN-14344: fixes for adjusted venous limits when air pump is on

DEN-14307: partial fix to DEN-14086.

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

DEN-14307 addressed a code review comment

RESOLVED IN CODEWALKTHROUGH.

RESOLVED IN CODEWALKTHROUGH.

DEN-14307 addressed the code review comments

Done

Done

Data is a local variable but added alarmButtonBlockers

Data is a local variable but added alarmButtonBlockers

RESOLVED IN CODEWALKTHROUGH.

RESOLVED IN CODEWALKTHROUGH.

RESOLVED IN CODEWALKTHROUGH.

RESOLVED IN CODEWALKTHROUGH.