dd-firmware

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

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

Merge branch 'LDT-4733-request-add-variables' into staging

Merge branch 'LDT-4734-temp-comp-conductivity' into staging

LDT-4733: fixed warning of implicit call

Merge branch 'staging' into LDT-4733-request-add-variables

Merge branch 'staging' into LDT-4734-temp-comp-conductivity

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/Controllers/MixingControl.h
LDT-3902: Fixed mixing control warnings

    • -0
    • +1
    /firmware/App/Controllers/MixingControl.h
Merge branch 'staging' of bitbucket.org:diality-cloud/dd-firmware into LDT-3902-BC-switch-only-min-flow-rate

LDT-4733: code review comments

LDT-4733: code review comments

LDT-4734: code review comments

    • -24
    • +24
    /firmware/App/Monitors/Conductivity.c
Merge branch 'staging' into LDT-4734-temp-comp-conductivity

Merge branch 'staging' into LDT-4733-request-add-variables

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

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

Merge fixes

Merge branch 'staging' into LDT-4734-temp-comp-conductivity

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
LDT-4734: code review comments

    • -24
    • +51
    /firmware/App/Monitors/Conductivity.c
Revert "LDT-4734: updates conductivity resistance messages."

This reverts commit 14277e7c55fbb8407612572aca191ffae0835796.

    • -0
    • +30
    /firmware/App/Monitors/Conductivity.c
LDT-4734: updates on spacing

resolved conflicts and mismatches

    • -25
    • +2
    /firmware/App/Controllers/DryBiCart.c
LDT-4734: updates conductivity resistance messages.

    • -30
    • +0
    /firmware/App/Monitors/Conductivity.c
LDT-4011 code review comments

LDT-4734: updates to conductivity message to show resistances reflective to subsystem

    • -41
    • +14
    /firmware/App/Monitors/Conductivity.c
    • -25
    • +14
    /firmware/App/Monitors/Conductivity.h
Merge conflicts with staging resolved and comments

    • -955
    • +427
    /firmware/App/Controllers/DryBiCart.c