td-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-4050:fixed merge conflicts

    • -135
    • +261
    /firmware/App/Modes/ModeStandby.c
    • -46
    • +114
    /firmware/App/Services/Messaging.c
LDT-4050:fixed enum changes

    • -40
    • +30
    /firmware/App/Modes/ModePostTreat.c
    • -21
    • +54
    /firmware/App/Modes/ModeStandby.c
LDT-4050: disinfection implementation

    • -67
    • +84
    /firmware/App/Modes/ModePostTreat.c
    • -109
    • +139
    /firmware/App/Modes/ModeStandby.c
    • -10
    • +12
    /firmware/App/Services/DDInterface.c
    • -106
    • +1
    /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

LDT-4049: fixed standby start state handler

    • -23
    • +22
    /firmware/App/Modes/ModeStandby.c
This isn't right. Look at staging for correct code.

This isn't right. Look at staging for correct code.

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

LDT-5363:Addressed review comments

LDT-4049:fixed merge conflicts

Fixed in FPGA

Changes

    • -57
    • +11
    /firmware/App/Modes/ModeStandby.c
Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

Merge branch 'LDT-5505-td-high-arterial-pressure-alarm' into develop

Add initialBloodFlowComplete to outputs

Add initialBloodFlowComplete to outputs

Add initialBloodFlowComplete and preTxRecircStartTime to inputs.

Add initialBloodFlowComplete and preTxRecircStartTime to inputs.

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

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

Merge branch 'LDT-5505-td-high-arterial-pressure-alarm' into staging

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

    • -26
    • +11
    /firmware/App/Modes/ModePreTreat.c
    • -10
    • +57
    /firmware/App/Modes/ModeStandby.c