Vendor - TEL - Arpita Srivastava

Merge branch 'LDT-2004-v2-conductivity-sensors-AS' into develop

LDT-2004: disabled coeffs for unit 4

LDT-2004: Updated zeta_high coeff for beta 2 unit 4 and 5

Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into develop

LDT-1195: Added Switch Only Request Flags

LDT-1195: Fixed Balancing Chamber Switching Only

    • -2
    • +0
    /firmware/App/Modes/ModeGenDialysate.c
Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into develop

Merge branch 'staging' into LDT-1195-dd-is-balancing-chamber-switching

Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into develop

Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into develop

LDT-1195: Added fix for BC switching only as per latest staging changes

LDT-1195: Merged staging into LDT-1195

    • -13
    • +121
    /firmware/App/Modes/ModeGenDialysate.c
Merge branch 'staging' into LDT-1195-dd-is-balancing-chamber-switching

LDT-1195: Updated requestrequestBalChamberSwitching

LDT-1195: Updated function comments and requestBalChamberSwitching

    • -2
    • +0
    /firmware/App/Modes/ModeGenDialysate.c
Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into develop

Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into develop

    • -8
    • +21
    /firmware/App/Modes/ModeGenDialysate.c
    • -11
    • +11
    /firmware/App/Modes/ModeStandby.c
Merge branch 'LDT-1195-dd-is-balancing-chamber-switching' into develop

LDT-1195: Code cleanup, deleted unused variable pendingBalanceChamberSwOnlyRequest

    • -1
    • +0
    /firmware/App/Modes/ModeGenDialysate.c
LDT-1195: Added variable to keep track of balancing chamber switching activity.

LDT-1195: Added a variable to keep track of balancing chamber switching activity.

    • -2
    • +2
    /firmware/App/Modes/ModeGenDialysate.c
    • -0
    • +1
    /firmware/App/Modes/ModePreGenDialysate.c
LDT-2004: Updated unit of resistance

LDT-3505: Added Test Config for Syringe Pump

LDT-3505: Added Test Config for Syring Pump

    • -24
    • +44
    /firmware/App/Controllers/SyringePump.c
LDT-1195: Updated balancing chamber switching request flags names and definitions.

    • -17
    • +22
    /firmware/App/Modes/ModeGenDialysate.c
    • -1
    • +2
    /firmware/App/Modes/ModePreGenDialysate.c
LDT-3505: Removed TREATMENT_PARAM_HEPARIN_STOP_TIME

LDT-1195: Renamed balancing chamber start state to idle state.

LDT-1195: Renamed balancing chamber start state to idle state.

LDT-1195: Added balancing chamber idle state

LDT-1195: Added Balancing Chamber Idle state

    • -2
    • +11
    /firmware/App/Modes/ModeGenDialysate.c
    • -0
    • +1
    /firmware/App/Modes/ModePreGenDialysate.c