Sean Nash

LDT-2932: Fixed TMP calculation.

Merged LDT-2428 to staging.

LDT-2428: Fixed merge conflict.

Merged LDT-2199 to staging (2nd time).

Merged staging to LDT-2199 (2nd time).

LDT-2199: Addressed merge issue with DD pressure data.

    • -17
    • +17
    /firmware/App/Services/DDInterface.c
Merged LDT-2199 to staging.

Merged staging to LDT-2199.

    • -3
    • +3
    /leahi_dialin/td/modules/blood_flow.py
Merged LDT-2199 to staging.

Merged LDT-2199 to staging.

Merged LDT-2199 to staging.

LDT-2199: Fixed merge issues.

    • -17
    • +17
    /firmware/App/Services/DDInterface.c
LDT-2199: Fixed merge issue.

LDT-2199: Fixed merge conflicts.

Merged staging to LDT-2199.

LDT-2428: Added training test script.

    • -0
    • +41
    /tests/test_training.py
Fixed merge conflict.

    • -6
    • +41
    /leahi_dialin/td/treatment_delivery.py
LDT-2428: Fixed bug.

    • -5
    • +5
    /leahi_dialin/td/treatment_delivery.py
LDT-2428: Added training test override msg and cmd.

    • -1
    • +36
    /leahi_dialin/td/treatment_delivery.py
Merge branch 'LDT-2199-beta-1.0-fw-integration---td-im' into develop

LDT-2198: Updated FPGA driver for DD.

Fixed merge conflicts.

Merge branch 'LDT-2199-beta-1.0-fw-integration---td-im' into develop

LDT-2199: Added override commands for setting air pump power levels for raising and lowering air trap level.

    • -8
    • +88
    /firmware/App/Controllers/AirTrap.c
LDT-2199: Added override commands for setting air pump power levels for raising and lowering air trap level.

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.
LDT-2198: Restored deferred includes in CommBuffers.h to avoid compiler error.

LDT-2198: minor formatting fixes.

LDT-2198: Added voltage override msg IDs.

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