Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

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

Staging sync and resolved merge conflicts in SW faults due to fault ID reservation

End treatmnet code modification

  1. … 1 more file in changeset.
LDT-4050:fixed merge conflicts

LDT-4050:fixed enum changes

LDT-4050: disinfection implementation

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

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

LDT-4049: fixed standby start state handler

LDT-5363:Addressed review comments

LDT-4049:fixed merge conflicts

Fixed in FPGA

Changes

    • -34
    • +38
    ./Services/StateServices/DrySelfTests.c
Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

Merge branch 'LDT-5505-td-high-arterial-pressure-alarm' 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-5505: Staging is good, will fix this bug in develop

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

Merge Fixes

Changes

LDT-4049:removed disinfect handlers

Test code

    • -1166
    • +1171
    ./Services/StateServices/DrySelfTests.c
    • -56
    • +56
    ./Services/StateServices/DrySelfTests.h
LDT-4049:Updated Standby state transition actuator handling and firmware version request payload

LDT-5363:Updated Recirculation State

LDT-5363:Merge latest staging and addressed review comments

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

Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-2240-disposable-tube-set-self-test

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