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

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

it was a double include anyway. Fixed. Thanks!

it was a double include anyway. Fixed. Thanks!

DEN-14547: Addressing code review

Alphabetical ordering.

Alphabetical ordering.

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.

This is not going to work. Revisit. See code review for DEN-14749 for correct arrangement.

This is not going to work. Revisit. See code review for DEN-14749 for correct arrangement.

DEN-1561 Fix integrated volume calculation for reservoir transfers.

HD-DEN-14749_Syringe Pump Plunger Remains Extended During Pretreatment Causing HD Software Fault
HD-DEN-14749_Syringe Pump Plunger Remains Extended During Pretreatment Causing HD Software Fault
HD-DEN-14763_DG HD Dev HD DG Dvt Update Part 10
HD-DEN-14763_DG HD Dev HD DG Dvt Update Part 10
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

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DEN-14589: fixed syringe pump events.

This math no longer works because we changed the displacement time from 1 minute (which allowed for this simplified approach) to 30 seconds. Generalize the math. Suggested approach: -integrate vol...

This math no longer works because we changed the displacement time from 1 minute (which allowed for this simplified approach) to 30 seconds.
Generalize the math.

Suggested approach:
-integrate volume above properly (don't just sum rates over time).
-Should be: fmdIntegratedVolume += ( getMeasuredDialInFlowRate() / (F32)( ( SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) );
-Then we don't need to convert here at end of displacement - can just use fmdIntegratedVolume as is in verify state.

This simplified equation works because we added up flow (mL/min) measurements for 1 minute. If we change displacement time, it falls apart (not generalized) which happens in second displacement bel...

This simplified equation works because we added up flow (mL/min) measurements for 1 minute. If we change displacement time, it falls apart (not generalized) which happens in second displacement below (now that transfer time was reduced to 30 sec).
Let's generalize this math to clarify it and make it work regardless of time.

Suggested approach:
-integrate volume above properly (don't just sum rates over time).
-Should be: fmdIntegratedVolume += ( getMeasuredDialInFlowRate() / (F32)( ( SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) );
-Then we don't need to convert here at end of displacement - can just use fmdIntegratedVolume as is in verify state.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.