Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
resolved conflicts and mismatches

LDT-4734: updates conductivity resistance messages.

LDT-4719 code review comments

LDT-4011 code review comments

LDT-4734: updates to conductivity message to show resistances reflective to subsystem

Merge conflicts with staging resolved and comments

    • -12
    • +41
    ./Controllers/BalancingChamber.c
LDT-4011 addressed code review comments and merged staging into branch

    • -14
    • +38
    ./Controllers/BalancingChamber.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

LDT-4719 added initial alarms code for dialysate composition

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

Fixed merge conflicts.

LDT-4873: Prevent alarm 71 (chamber H level low) if new test config switch enabled.

Code changes for CR

LDT-3735: Updated minimum dialysate pump flow rate to 50

LDT-3735: Updated accepted or reject reason

    • -137
    • +508
    ./Services/NVMessagingDD.c
LDT-4410 code update

LDT-4410 code update

LDT-3735: Updated payload for send cal record

    • -269
    • +284
    ./Services/NVMessagingDD.c
LDT-4410 merged latest staging into my branch

LDT-4410 fake commit populating

LDT-4410 added new broadcast variables and made changes to D65 opening

    • -17
    • +128
    ./Controllers/BalancingChamber.c
LDT-3962 firmware fix for concentrate pump park override

Merge branch 'staging' into LDT-3975-water-treatment-and-degassing--

LDT-3735: Update send handler for cal records

    • -114
    • +251
    ./Services/NVMessagingDD.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

LDT-4612 Merge LDT-4612-dialysate-composition-integ into develop

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

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

LDT-4612 depressurize sanity test updates

WIP on LDT-4734-temp-comp-conductivity

LDT-4734: uncompensated integration wip