firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14344-sw-s85-mg-dpi-pwmflow-fix' into develop

    • -18
    • +112
    ./App/Controllers/DialInFlow.c
i think there's a conflict between staging and develop. fixed for staging merge. thanks!

i think there's a conflict between staging and develop. fixed for staging merge. thanks!

originally wanted to change setDialInPumpTargetFlowRate() to have the same conditions as testSetDialInPWM but we can integrate it later pending Darren's results.

originally wanted to change setDialInPumpTargetFlowRate() to have the same conditions as testSetDialInPWM but we can integrate it later pending Darren's results.

Fixed. Thanks!

Fixed. Thanks!

Fixed. moved to testSetDialInPumpWithPWM(). Thanks!

Fixed. moved to testSetDialInPumpWithPWM(). Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. This condition requires that the Pump is flagged off. that same condition is also used below. we will always be true in the first condition below if we satisfy this condition. If we try to c...

Fixed. This condition requires that the Pump is flagged off. that same condition is also used below. we will always be true in the first condition below if we satisfy this condition. If we try to change direction when the pump is on, both this condition and the one below will fail.

DEN-14344: code review comments.

Created a #define for magic number. Because running pumps in open loop mode (because we're priming and not necessarily any fluid in line to measure flow with) and pumps have different methods of de...

Created a #define for magic number.
Because running pumps in open loop mode (because we're priming and not necessarily any fluid in line to measure flow with) and pumps have different methods of determining PWM duty cycle from a given flow rate, DPo pumps target flow rate needed to be set lower to match the duty cycle with DPi pump.

DEN_14252: Addressed code review comment.

Where did this enum name change take place? There is no common in this code review.

Where did this enum name change take place? There is no common in this code review.

remove "," after pwm.

remove "," after pwm.

Remove blank line.

Remove blank line.

Should this be set to true even if result below is false? Maybe set to true in testSetDialInPumpWithPWM() function after all of the conditions are found to be met?

Should this be set to true even if result below is false? Maybe set to true in testSetDialInPumpWithPWM() function after all of the conditions are found to be met?

Remove blank line.

Remove blank line.

First part of condition should have () around it too. Do we want to set direction here even if we fail to satisfy condition below?

First part of condition should have () around it too.
Do we want to set direction here even if we fail to satisfy condition below?

Keep a blank line between declaration and code.

Keep a blank line between declaration and code.

Not clear on what this refactoring of condition changed - looks the same.

Not clear on what this refactoring of condition changed - looks the same.

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

Merge branch 'DEN-14252-system-self-test-failure-occurs-intermittently' into develop

DEN-14252: Another fix to pre-tx reservor mgmt state machine.

Auto stash before merge of "develop" and "origin/develop"

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

Resolved a message ID name change in develop

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

Merge branch 'DEN-14252-system-self-test-failure-occurs-intermittently' into develop

DEN-14252: Additional fix to reservoir mgmt state machine.