Michael Garthwaite

Merge branch 'LDT-4734-temp-comp-conductivity' into develop

Merge branch 'LDT-4734-temp-comp-conductivity' into develop

    • -37
    • +94
    /firmware/App/Monitors/Conductivity.c
Merge branch 'LDT-4733-request-add-variables' into develop

    • -2
    • +2
    /firmware/App/Controllers/MixingControl.h
    • -2
    • +2
    /firmware/App/Modes/ModeGenDialysate.c
Merge branch 'LDT-4733-request-add-variables' into develop

Merge branch 'LDT-4733-request-add-variables' into staging

Merge branch 'LDT-4734-temp-comp-conductivity' into staging

LDT-4733: fixed warning of implicit call

LDT-3975: updates to PI controllers for RO and boost pump

Merge branch 'LDT-4733-request-add-variables' into staging

Merge branch 'staging' into LDT-4733-request-add-variables

LDT-3975: boost pump control changes to reflect new PI controller.

    • -19
    • +16
    /firmware/App/Controllers/BoostPump.c
    • -1
    • +1
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
Merge branch 'staging' into LDT-4733-request-add-variables

Merge branch 'staging' into LDT-4734-temp-comp-conductivity

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

LDT-3975: new RO coefficents for control

    • -20
    • +46
    /firmware/App/Controllers/ROPump.c
LDT-3975: updated ilimit and fixed break statement.

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

Merge branch 'LDT-4874' into develop

    • -1
    • +1
    /leahi_dialin/dd/modules/blood_leak.py
    • -1
    • +1
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -1
    • +1
    /leahi_dialin/dd/modules/rinse_pump.py
  1. … 31 more files in changeset.
Changed handler debug to contain raw message and timestamp of recv

    • -1
    • +1
    /leahi_dialin/dd/modules/blood_leak.py
    • -1
    • +1
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -1
    • +1
    /leahi_dialin/dd/modules/mixing_cntrl.py
  1. … 34 more files in changeset.
Merge branch 'LDT-4874' into develop

    • -1
    • +4
    /leahi_dialin/dd/modules/blood_leak.py
    • -0
    • +4
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -0
    • +4
    /leahi_dialin/dd/modules/rinse_pump.py
  1. … 31 more files in changeset.
Merge branch 'staging' into LDT-4874

    • -59
    • +31
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -6
    • +23
    /leahi_dialin/fp/modules/conductivity_sensors.py
LDT-4874: updates to td handlers for timing

    • -0
    • +4
    /leahi_dialin/td/modules/blood_flow.py
    • -1
    • +4
    /leahi_dialin/td/modules/syringe_pump.py
  1. … 4 more files in changeset.
LDT-4874: updates to timing for handlers

    • -1
    • +4
    /leahi_dialin/dd/modules/blood_leak.py
    • -0
    • +4
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -0
    • +4
    /leahi_dialin/dd/modules/rinse_pump.py
  1. … 11 more files in changeset.
LDT-4733: code review comments

Merge branch 'staging' into develop

    • -0
    • +10
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -14
    • +10
    /leahi_dialin/fp/modules/conductivity_sensors.py
Merge branch 'LDT-4734-temp-comp-conductivity' into staging