td-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

Merged LDT-4031 into develop

LDT-4040: Resolve CR comments

    • -1
    • +2
    /firmware/App/Modes/StateTxBloodPrime.c
    • -2
    • +2
    /firmware/App/Modes/StateTxRinseback.c
addressed comments

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

Merge branch 'LDT-3992-disposable-tube-set-auto-priming' into develop

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

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

LDT-3992: Fix for develop

Merge branch 'staging' into LDT-4031-pre-treatment---fw-implementation

LDT-4072:Update battery monitoring enum indexing and validate charger data

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

LDT-4029:Updated heparin setup state

    • -4
    • +5
    /firmware/App/Modes/StatePreTxHeparinSetup.c
Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

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

LDT-4040: Resolve CR comments, merge latest staging & resolve merge conflicts

    • -17
    • +14
    /firmware/App/Modes/ModeTreatment.c
    • -3
    • +3
    /firmware/App/Modes/StateTxBloodPrime.c
    • -17
    • +30
    /firmware/App/Modes/StateTxPaused.c
    • -5
    • +17
    /firmware/App/Modes/StateTxRecirc.c
    • -39
    • +65
    /firmware/App/Modes/StateTxRinseback.c
    • -11
    • +11
    /firmware/App/Monitors/Pressures.c
    • -3
    • +58
    /firmware/App/Services/AlarmMgmtTD.c
    • -179
    • +71
    /firmware/App/Services/StateServices/FluidBolus.c
    • -13
    • +22
    /firmware/App/Services/TxParams.c
LDT-4009 addressed code review comments

    • -1
    • +1
    /firmware/App/Modes/StateTxIsolatedUF.c
Addressed review comments

Merge branch 'staging' into LDT-4029-pre-treatment---fw-implementation

LDT-4063: Addressed review comments

Merge branch 'staging' into LDT-4031-pre-treatment---fw-implementation

Merge conflicts