Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into LDT-3272-software-update---dd-firmware

LEAHI-DD-FIRMWARE-LDT-4002_HDF - FW Implementation - 3/4:
LEAHI-DD-FIRMWARE-LDT-4002_HDF - FW Implementation - 3/4:
This is auto generated code. How do we keep this code from re-appearing when somebody regenerates this code?

This is auto generated code. How do we keep this code from re-appearing when somebody regenerates this code?

Same.

Same.

Same

Same

We shouldn't delete generated code. Add a #if 0 in this user code section and add a #endif in the user section below the coreEnableFlashEcc() call.

We shouldn't delete generated code. Add a #if 0 in this user code section and add a #endif in the user section below the coreEnableFlashEcc() call.

LDT-4002: more additions to switches implementation

    • -0
    • +987
    ./Controllers/#ROPump.c#
    • -0
    • +373
    ./Controllers/HemoDiaFiltration.c
    • -0
    • +337
    ./Controllers/HemoDiaFiltration.c~
    • -0
    • +58
    ./Controllers/HemoDiaFiltration.h
    • -0
    • +55
    ./Controllers/HemoDiaFiltration.h~
    • -0
    • +225
    ./Monitors/Switches.c
    • -0
    • +270
    ./Monitors/Switches.c~
    • -0
    • +62
    ./Monitors/Switches.h
    • -0
    • +59
    ./Monitors/Switches.h~
  1. … 1 more file in changeset.
LDT-4183 fixing compilation error

Merge branch staging into LDT-4183-dialysate-composition-dry-bicar

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

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

  1. … 4 more files in changeset.
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

resolved merge conflicts and merged LDT-3963

    • -40
    • +19
    ./Controllers/BalancingChamber.c
Merge branch 'staging' into feature/LDT-3963-dialysate-flow-rate---fw-implem

LDT-4183-dry bicart firmeware implementation2/1: addressing review comments

LDT-4183-dry bicart firmeware implementation2/1: for dialysis calculator

Merge branch 'staging' into LDT-3272-software-update---dd-firmware

LDT-3963 addressed code review comments

restored

restored

Not sure why Crucible is showing it this way. Let's just re-review these diffs.

Not sure why Crucible is showing it this way. Let's just re-review these diffs.

Should be #ifndef

Should be #ifndef

Should be #ifndef I think.

Should be #ifndef I think.

Can we make these low priority and 999 rank?

Can we make these low priority and 999 rank?

LDT-3963 addressed code review comments and restored the fault mode transition

    • -40
    • +19
    ./Controllers/BalancingChamber.c
Merge branch 'staging' into LDT-4000-hdf-fw-implementation-1

Merge branch 'staging' into LDT-3975-Boost-Pump