Clone
 

michael garthwaite <mgarthwaite@diality.com> in leahi-dialin

Merge branch 'feature/LDT-828-stop-state-fp' into develop

LDT-828: updates to FP diagnostics logger

    • -35
    • +37
    /tests/data_capture_helpers/fp_helpers.py
Merge branch 'staging' into feature/LDT-828-stop-state-fp

LDT-828: updates to fp logger

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
    • -9
    • +11
    /tests/data_capture_helpers/fp_helpers.py
Merge branch 'LDT-611-fp-add-ability-to-override-tempe' into develop

LDT-611: Fixed debugging statement to show the correct sensor name

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'LDT-1473-ultrafiltration-dd' into staging

Merge branch 'LDT-1473-ultrafiltration-dd' into develop

LDT-1473: changed temperature override to consider conductivity sensors with temperature.

    • -5
    • +15
    /leahi_dialin/dd/modules/temperature_sensors.py
Merge branch 'LDT-1473-ultrafiltration-dd' into develop

    • -5
    • +0
    /leahi_dialin/fp/modules/water_pumps.py
LDT-1473: Updated heaters broadcast to be in sync with dd heaters broadcast.

    • -14
    • +21
    /leahi_dialin/dd/modules/heaters.py
Merge branch 'staging' into develop

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into staging

LDT-566: updated comments to indicate TODOs

LDT-566: code review comments.

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

LDT-566: fixed typo

    • -3
    • +3
    /leahi_dialin/td/modules/blood_flow.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

LDT-566: fixed dialin channels for blood flow estimation overrides. updated ejector documentation

    • -3
    • +3
    /leahi_dialin/td/modules/blood_flow.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

LDT-566: updated pressure sensors for fp and td.

    • -1
    • +1
    /tests/data_capture_helpers/fp_helpers.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

WIP on develop

LDT-566: fixed can protocol exception

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

WIP on develop

LDT-566: fixed can. updated temperature override to use the correct override message.

    • -1
    • +2
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

LDT-566: fixed message IDs

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

LDT-566: implemented permeate tank override. implemented alarm overrides for dd and fp. Commented out debugging logs for now, to be configurable setting.

    • -0
    • +98
    /leahi_dialin/fp/modules/permeate_tank.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop