td-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
space allignment2

space allignment

Merge conflicts

    • -19
    • +133
    /firmware/App/Services/FpgaTD.c
Staging Sync and resolve issues

Merge branch 'staging' into LDT-5214-fw-dialin-new-override-for-air-

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

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
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
Changes

Changes

LDT-4040: Resolve CR comments

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

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

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

Changes

Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-4033-patient-vitals-fw-implementation

Changes

    • -10
    • +10
    /firmware/App/Controllers/Valves.c
    • -157
    • +189
    /firmware/App/Drivers/PinchValve.c
Removed header

Fixed merge conflicts

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