Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14589-DIAL-211

DEN-14547: Addressing code review

Merge branch 'staging' into DEN-14547-incorrect-dg-event

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

Fixed merge conflicts.

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

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

DEN-14561 Updated for code review comments.

DEN-14749: Reset preload flag in standby mode instead of after retract/seek/prime operations. Increase alarm threshold for FMD vs. LC check in wet s.t. from 5% to 10%. Refactor alarm audio and 1 minute min tx time config flags. Removed test code in reservoir code.

DEN-1561 Fix integrated volume calculation for reservoir transfers.

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

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

DEN-14604 added code to not trigger the AC power loss if the safefy shutdown is enabled

DEN-14589: fixed syringe pump events.

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

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

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

Fixed merge conflicts. Re-applied recently rolled back pre-tx state changes.

DEN-14549: Fixed merge from staging merge conflicts.

  1. … 3 more files in changeset.
DEN-14561 Comments

Answered comments from code review

DEN-14556: updated alarm pressure occlusion alarm to 3s. HD now sends events when occlusion baseline is set. Alarm id 142 and 277 now send baseline occlusion value and trigger value.

DEN-14561 - returned useLastTrimmerHeaterDC logic

checkpoint, correction.

DEN-14589: implemented event for syringe pump state changes.

DEN-14561 - returned useLastTrimmerHeaterDC logic

Returned logic for trimmer heater

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

Merge branch 'DEN-14589-DIAL-211' into develop

DEN-14699: HD RTC control register 3 override message infrastructure

DEN-14651 - Trial simplification of complete state

corrected fillComplete timing, removed TrimmerHeater control change (toggled off/on again over 50ms)

DEN-14561 Reservoir switching corrected in all modes

An incorrect reservoir reference was shorting R2 one flush cycle.

DEN-14561 Wider wet selftest tolerance. Fix reservoir switch. Fix alarm value for venous pressure.