dd-firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-3352 resolving merge issues

    • -7
    • +14
    /firmware/App/Controllers/Heaters.c
    • -16
    • +40
    /firmware/App/Modes/ModeGenDialysate.c
    • -2
    • +1
    /firmware/App/Modes/ModeGenDialysate.h
    • -28
    • +26
    /firmware/App/Monitors/Temperature.c
    • -25
    • +20
    /firmware/App/Services/Messaging.c
LDT-3352 code review comments fix

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-2008-v2-conductivity-sensors-CLEAN' into staging

LDT-2008: code review comments.

Merge branch 'staging' into LDT-2008-v2-conductivity-sensors-CLEAN

LDT-2008: code review comments

LDT-3352 code review comments update

    • -11
    • +9
    /firmware/App/Controllers/Heaters.c
    • -2
    • +2
    /firmware/App/Modes/ModeGenDialysate.c
    • -53
    • +20
    /firmware/App/Monitors/Temperature.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

    • -1
    • +1
    /firmware/App/Modes/ModeGenDialysate.c
    • -1
    • +1
    /firmware/App/Modes/ModeGenDialysate.h
LDT-3103 merged latest staging and resolved merge conflicts

    • -11
    • +21
    /firmware/App/Modes/ModeGenDialysate.c
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/ModePreGenDialysate.c
Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into staging

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

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

    • -1
    • +1
    /firmware/App/Modes/FPModes/FPOperationModes.c
LDT-3677 merged into staging

Merge branch 'staging' of bitbucket.org:diality-cloud/dd-firmware into LDT-1195-dd-is-balancing-chamber-switching

    • -4
    • +18
    /firmware/App/Modes/ModeGenDialysate.c
LDT-3677 added fix to reset value when TC is disabled for Boost pump and defeatured

    • -0
    • +10
    /firmware/App/Modes/FPModes/FPOperationModes.c
LDT-2008: code review comments.

LDT-3103 addressed code review comments and merged latest staging

Merge branch 'staging' into LDT-3103-closed-loop-control-pressure-threshold-fix

    • -4
    • +18
    /firmware/App/Modes/ModeGenDialysate.c
LDT-1195: Fixed indentation

LDT-2008: version request handler. fixes for D74 between test configs. reworked init state to handle sensors providing bad cal data if test config is enabled.

    • -79
    • +114
    /firmware/App/Drivers/ConductivitySensors.c
LDT-3103 addressed code review comments

Merge branch 'staging' into LDT-2008-v2-conductivity-sensors-CLEAN

LDT-3103 changes made according to code review comments

    • -2
    • +0
    /firmware/App/Modes/ModeGenDialysate.c
    • -1
    • +0
    /firmware/App/Modes/ModeGenDialysate.h
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

    • -1
    • +1
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -1
    • +1
    /firmware/App/Modes/FPModes/FPOperationModes.h