firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-4485-dd-conductivity-sensors-d17' into develop

    • -12
    • +52
    ./App/Drivers/ConductivitySensors.c
LDT-4485: fixed conductivity monitoring overriding changes from staging. fixed cal and version request for conductivity sensors.

    • -12
    • +52
    ./App/Drivers/ConductivitySensors.c
    • -0
    • +12
    ./App/Drivers/ConductivitySensors.h
Remove the blank line

Remove the blank line

Add headers for all below functions.

Add headers for all below functions.

Rmove extra blank line

Rmove extra blank line

WIP on develop

Update Input section: Balancing chamber state

Update Input section: Balancing chamber state

We can keep it as handler instead of exec since this is being invoked from execMixingControl.

We can keep it as handler instead of exec since this is being invoked from execMixingControl.

we should use get balancing chamber fill volume if balancing chamber volume been adjusted by calibration (not an immediate need, but good to have)

we should use get balancing chamber fill volume if balancing chamber volume been adjusted by calibration (not an immediate need, but good to have)

remove min in the comment.

remove min in the comment.

Remove the unused header file.

Remove the unused header file.

Remove the unused header file.

Remove the unused header file.

Update state name matching handler name.

Update state name matching handler name.

Same as above.

Same as above.

The second condition( fill request) should be checked against true?

The second condition( fill request) should be checked against true?

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

Merge branch 'LDT-4485-dd-conductivity-sensors-d17' into develop

    • -106
    • +118
    ./App/Drivers/ConductivitySensors.c
LDT-4485: updates conductivity cal check test config to check FPGA data to determine if the system is communicating to a dead sensor.

    • -106
    • +117
    ./App/Drivers/ConductivitySensors.c
LDT-4409 fixing compilation error

Merge branch staging into LDT-4409-dialysate-composition-beta-2.1-WCID-implementation

LDT-4409 enable dry bicart default

    • -17
    • +12
    ./App/Controllers/MixingControl.h
LDT-4409 dry bicart implementation plus refactoring closed loop control

    • -0
    • +1136
    ./App/Controllers/MixingControl.c
    • -0
    • +96
    ./App/Controllers/MixingControl.h
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

Merge branch 'LDT-4485-dd-conductivity-sensors-d17' into develop

LDT-4485: fixed pumpid call

LDT-4485: updates to sub pump rpm measure alarm to not monitor during off state.

Merge branch 'staging' into LDT-4485-dd-conductivity-sensors-d17

Is this normal UF volume or normal UF volume + Iso UF Volume?

Is this normal UF volume or normal UF volume + Iso UF Volume?

Consider moving this validity check into the setTDRequestedGenDState function. And what should we do if it's not valid?

Consider moving this validity check into the setTDRequestedGenDState function.
And what should we do if it's not valid?

Why only these states are valid?

Why only these states are valid?