Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DENBUG-318-rejection-ratio-setting-feature-implementation-in-manufacturing-configuration-for-treatment-staging' into develop

    • -1
    • +13
    ./Controllers/ConductivitySensors.c
DENBUG-322 added code to set CPi and CPo to 20 uS/cm if the values are less than 20 uS/cm

    • -1
    • +13
    ./Controllers/ConductivitySensors.c
DENBUG-319 added code to skip the acid and bicarb check in mode fill if it is not the first fill

Done

Done

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

DENBUG-318 changed the location of requesting RO rejection ratio upon starting DG

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

DENBUG-320 addressed a code review comment

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DENBUG-320 brought back the start fill command after removing alarms 281, 282

I don't see the flag being set in this function.

I don't see the flag being set in this function.

Why are we keeping these in the broadcast?

Why are we keeping these in the broadcast?

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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

Resolved merge conflicts from DENBUG-318

DENBUG-318 added the word max to the RO rejection ratio

DENBUG-320 added the word max to the RO rejection ratio

Done

Done

Done

Done

DENBUG-320 removed the code that checked for the acid and bicarb low volume and triggered alarms

Should you do something with the received max ratio? It's local, so it's just being dropped.

Should you do something with the received max ratio? It's local, so it's just being dropped.

max ratio

max ratio

DENBUG-318 added an event for RO rejection ratio from HD institutional record

DENBUG-318 added code to request and receive the RO rejection ratio from the HD institutional record and apply it in the mode fill

DG-DENBUG-318_Rejection Ratio Setting Feature Implementation IN Manufacturing Configuration For Treatment Staging
DG-DENBUG-318_Rejection Ratio Setting Feature Implementation IN Manufacturing Configuration For Treatment Staging
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merged release/p1b/staging

    • -10
    • +23
    ./Controllers/ConcentratePumps.c
    • -7
    • +42
    ./Modes/ModeHeatDisinfectActiveCool.c