dd-firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'LDT-4485-dd-conductivity-sensors-d17' into staging

LDT-4485: err fix

LDT-4485: err fix

Michaels latest code resolved this issue. make sure when you merge to staging, pull the latest from staging. Check with Michael on code commit in staging.

Michaels latest code resolved this issue. make sure when you merge to staging, pull the latest from staging. Check with Michael on code commit in staging.

LDT-4409 addressed review comments

    • -0
    • +1
    /firmware/App/Controllers/MixingControl.c
LDT-4409 addressed review comments

    • -10
    • +4
    /firmware/App/Controllers/DryBiCart.c
    • -1
    • +1
    /firmware/App/Controllers/MixingControl.c
LDT-4485: code review comments

Remove blank line.

Remove blank line.

LDT-4485: code review comments

    • -23
    • +38
    /firmware/App/Monitors/Conductivity.c
I will mark it as TODO , so you can close it

I will mark it as TODO , so you can close it

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

Update name.

Update name.

Add a Todo comment to resolve the issue.

Add a Todo comment to resolve the issue.

Align the indentation.

Align the indentation.

Align the indentation.

Align the indentation.

Do we need these comments? delete it if not required.

Do we need these comments? delete it if not required.

Align the indent

Align the indent

LDT-4409 conductivity sampling filter updates

    • -1
    • +1
    /firmware/App/Controllers/MixingControl.c
LDT-4409 mixing control param updates

    • -41
    • +43
    /firmware/App/Controllers/MixingControl.c
    • -2
    • +4
    /firmware/App/Controllers/MixingControl.h
LDT-4409 addressed review comments

    • -16
    • +11
    /firmware/App/Controllers/DryBiCart.c
    • -23
    • +46
    /firmware/App/Controllers/MixingControl.c
    • -2
    • +1
    /firmware/App/Controllers/MixingControl.h
LDT-4539: Add state-change event logging to DD modules (BalancingChamber, DryBiCart, Heaters, Ultrafiltration)

    • -0
    • +10
    /firmware/App/Controllers/DryBiCart.c
Remove empty line

Remove empty line

Remove unused header files.

Remove unused header files.

Remove empty line.

Remove empty line.

can't we use DialsysateConductivity - local variable instead of getTargetCond()?

can't we use DialsysateConductivity - local variable instead of getTargetCond()?

Initialize result to open loop state and remove the open loop state assignment later.

Initialize result to open loop state and remove the open loop state assignment later.