dd-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

LDT-3352 resolving merge conflicts

    • -13
    • +11
    /firmware/App/Controllers/Heaters.c
    • -92
    • +130
    /firmware/App/Drivers/ConductivitySensors.c
    • -6
    • +7
    /firmware/App/Modes/ModeGenDialysate.c
    • -2
    • +14
    /firmware/App/Monitors/Conductivity.c
Do we know which channel this event will be sent on?

Do we know which channel this event will be sent on?

Merge branch 'staging' into LDT-3218-update-iofp-permeate-target-flow-CLEAN

Merge branch 'staging' into LDT-3777-sprint-25-fixes

nope. removed.

nope. removed.

fixed

fixed

fixed

fixed

fixed

fixed

fixed

fixed

LDT-3218: code review comments

fixed

fixed

fixed

fixed

fixed

fixed

LDT-3777: code review comments

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

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

    • -2
    • +2
    /firmware/App/Modes/ModeGenDialysate.c
    • -2
    • +2
    /firmware/App/Modes/ModeGenDialysate.h
LDT-3352 merge into staging

Same comment applies here (removing resetPIController).

Same comment applies here (removing resetPIController).

I think we can remove the balancing chamber fill in progress check for Opening D80 valve, as this does not impact the balancing chamber fill process.

I think we can remove the balancing chamber fill in progress check for Opening D80 valve, as this does not impact the balancing chamber fill process.

Maintain space after and before parenthesis across the file.

Maintain space after and before parenthesis across the file.

Do we need to add another else statement and address an alarm if wrong mixId is passed? or Keep only else part instead of else if ( ACID_MIX_ID == mixID) check?? this change may be needed across th...

Do we need to add another else statement and address an alarm if wrong mixId is passed? or Keep only else part instead of else if ( ACID_MIX_ID == mixID) check?? this change may be needed across the file.

Remove this comment.

Remove this comment.

You may use getF32OverrideValue for consistency (across the file).

You may use getF32OverrideValue for consistency (across the file).

The resetPIController is already invoked in InitializePIController with the InitialControlSignal. Instead of 0.0F, pass the STD_BICARB_DOSING as initialControlSignal ( in InitializePIController)

The resetPIController is already invoked in InitializePIController with the InitialControlSignal. Instead of 0.0F, pass the STD_BICARB_DOSING as initialControlSignal ( in InitializePIController)

This is being repeated.

This is being repeated.

Please add comment. if it is not being used, delete it.

Please add comment. if it is not being used, delete it.

Can this be reused from ConcentratePumps.h?

Can this be reused from ConcentratePumps.h?

Add a space after and before parenthesis.

Add a space after and before parenthesis.