td-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge conflix

    • -17
    • +130
    /firmware/App/Services/FpgaTD.c
    • -17
    • +102
    /firmware/App/Services/Messaging.c
Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

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

Changes

Initial image of EOT

    • -0
    • +442
    /firmware/App/Modes/TreatmentEnd.c
    • -0
    • +46
    /firmware/App/Modes/TreatmentEnd.h
Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-4033-patient-vitals-fw-implementation

    • -17
    • +100
    /firmware/App/Services/Messaging.c
Changes in offset

    • -60
    • +60
    /firmware/App/Controllers/Valves.c
    • -16
    • +36
    /firmware/App/Drivers/PinchValve.c
Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-4149-pinch-valves-fw-implementation

    • -17
    • +100
    /firmware/App/Services/Messaging.c
I thought Eliza said they wanted to do blood sitting timer even if blood was rinsed back (still a little blood in line).

I thought Eliza said they wanted to do blood sitting timer even if blood was rinsed back (still a little blood in line).

LDT-3992: Refined code

    • -0
    • +46
    /firmware/App/Services/DDInterface.c
    • -175
    • +264
    /firmware/App/Services/StateServices/Prime.c
Merge branch 'staging' into LDT-4072-power-loss---fw-implementation-

    • -17
    • +102
    /firmware/App/Services/Messaging.c
Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

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

    • -2
    • +2
    /firmware/App/Controllers/SyringePump.h
    • -2
    • +2
    /firmware/App/Services/CpldInterface.c
This was correct. Revert back the inputs and outputs.

This was correct. Revert back the inputs and outputs.

Changes

Fixed

Fixed

Fixed

Fixed

Fixed

Fixed

This was correct. Rever back the inputs and outputs.

This was correct. Rever back the inputs and outputs.

Changes

LDT-4040: Resolve CR comments

    • -3
    • +2
    /firmware/App/Modes/StateTxBloodPrime.c
aligned with Messaging.c

Why are we changing the rank of an existing alarm?

Why are we changing the rank of an existing alarm?

Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-4149-pinch-valves-fw-implementation

    • -21
    • +181
    /firmware/App/Modes/ModePreTreat.c
Removed

Removed