Clone
 

sean nash <snash@diality.com> in dd-firmware

LDT-2198: Addressed code review comments. Minor formatting fixes.

    • -1
    • +0
    /firmware/App/Drivers/PressureSensor.c
    • -3
    • +0
    /firmware/App/Drivers/SafetyShutdown.c
    • -3
    • +1
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -0
    • +1
    /firmware/App/Modes/FPModes/FlushConcentrate.h
    • -1
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.h
    • -1
    • +0
    /firmware/App/Modes/ModePreGenDialysate.c
  1. … 11 more files in changeset.
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

LDT-2198: Updates to ADC channels. Added voltage monitor and overrides.

    • -0
    • +329
    /firmware/App/Monitors/Voltages.c
    • -0
    • +76
    /firmware/App/Monitors/Voltages.h
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

LDT-2198: Updated ADC channels to schematic.

    • -40
    • +41
    /firmware/App/Drivers/InternalADC.c
    • -8
    • +11
    /firmware/App/Drivers/InternalADC.h
LDT-2198: fixed merge conflicts. Removed unused valves.

    • -0
    • +397
    /firmware/App/Controllers/PermeateTank.c
    • -0
    • +311
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -0
    • +146
    /firmware/App/Modes/FPModes/FPModeStandby.c
    • -0
    • +402
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -0
    • +372
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -0
    • +437
    /firmware/App/Modes/FPModes/FlushPermeate.c
LDT-2198: Continued import of IOFP valves to valve unit.

    • -29
    • +134
    /firmware/App/Controllers/Valves.c
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/dd-firmware into LDT-2198-beta-1.0-fw-integration---dd-im

LDT-2198: Imported IOFP valves into valves controller. Still more to be done.

    • -5
    • +5
    /firmware/App/Modes/ModeGenDialysate.c
    • -1
    • +1
    /firmware/App/Modes/ModePreGenDialysate.c
Removed obsolete balancing chamber unit in Drivers folder.

    • -790
    • +0
    /firmware/App/Drivers/BalancingChamber.c
    • -74
    • +0
    /firmware/App/Drivers/BalancingChamber.h
Merged staging to develop.

    • -5
    • +13
    /firmware/App/Controllers/Heaters.c
Fixed merge conflicts.

    • -89
    • +289
    /firmware/App/Controllers/Heaters.c
    • -28
    • +29
    /firmware/App/Modes/ModeStandby.c
Merge branch 'develop' of bitbucket.org:diality-cloud/dd-firmware into develop

TEST: Added msg handling for DD balancing chamber valves override command.

Merge branch 'develop' of bitbucket.org:diality-cloud/dd-firmware into develop

TEST: Fixed override bug in concentrate pumps and dialysate pumps.

TEST: Fixed override bug with heaters, level and temp sensors.

    • -27
    • +27
    /firmware/App/Controllers/Heaters.c
TEST: Fixed DD Dialin login message handling.

Merge staging to develop.