td-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

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

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

LDT-4028: Adressed Review Comment foro Install State

New add ons in FPGA

    • -12
    • +175
    /firmware/App/Services/FpgaTD.c
Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-4149-pinch-valves-fw-implementation

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

Merge branch 'LDT-4505-td-h4-blood-pump-does-not-run' into develop

Add ons

    • -7
    • +16
    /firmware/App/Controllers/BloodFlow.c
change accordingly

change accordingly

Rename to AlarmTableResposnePayload

Rename to AlarmTableResposnePayload

Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-4505-td-h4-blood-pump-does-not-run

LDT-4028:Addressed Review Comments for Install State

LDT-4028: Merge Latest Staging

    • -24
    • +98
    /firmware/App/Modes/ModeStandby.c
LDT-4028:Addresses Review Comments for Install State

LDT-4072:added Battery I2C status override handler

I would keep blank line between library includes and regular includes.

I would keep blank line between library includes and regular includes.

We can't have 2 alarms with ID 196. The enum only has the empty saline bag alarm. Looks like alarm 197 is duplicate of this 196 alarm you've added. I think you should just remove this new alarm 196...

We can't have 2 alarms with ID 196. The enum only has the empty saline bag alarm. Looks like alarm 197 is duplicate of this 196 alarm you've added.
I think you should just remove this new alarm 196 that you've added here.

Do we still need this?

Do we still need this?

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

Merge branch 'LDT-4505-td-h4-blood-pump-does-not-run' into develop

Fixes

    • -2
    • +11
    /firmware/App/Drivers/PeristalticPump.c
staging ocnflict

staging conflict resolved

resolved conflicts

    • -393
    • +396
    /firmware/App/Services/AlarmMgmtTD.c