Dashboard

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

    • -59
    • +22
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -7
    • +27
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -46
    • +30
    /leahi_dialin/ui/fp_messaging.py
LDT-4734: updates conductivity resistance messages.

    • -30
    • +0
    /firmware/App/Monitors/Conductivity.c
updated

updated

updated

updated

updated

updated

moved.

moved.

updated

updated

LDT-4719 code review comments

    • -36
    • +36
    /firmware/App/Controllers/MixingControl.c
    • -2
    • +2
    /firmware/App/Controllers/MixingControl.h
    • -7
    • +6
    /firmware/App/Modes/ModeGenDialysate.c
LDT-4734: updates to conductivity messaging.

    • -59
    • +22
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -6
    • +27
    /leahi_dialin/fp/modules/conductivity_sensors.py
Please leave a comment to remind the developers that "-" will confuse .whl.

Please leave a comment to remind the developers that "-" will confuse .whl.

Should this be "." instead of "-" to be consistent?

Should this be "." instead of "-" to be consistent?

Is this .wsl or .whl?

Is this .wsl or .whl?

Remove extra ;

Remove extra ;

Can we align comments?

Can we align comments?

updated

updated

LEAHI-DIALIN-LDT-4734_Water Treatment and Degassing - FW Iteration - 5/4:
LEAHI-DIALIN-LDT-4734_Water Treatment and Degassing - FW Iteration - 5/4:
LDT-4011 code review comments

LDT-4734: updates to conductivity message to show resistances reflective to subsystem

    • -41
    • +14
    /firmware/App/Monitors/Conductivity.c
    • -25
    • +14
    /firmware/App/Monitors/Conductivity.h
FW sends U16 for now, after it's changed to U08, this will be updated

FW sends U16 for now, after it's changed to U08, this will be updated

I pushed the changes, no idea why it's not present here

I pushed the changes, no idea why it's not present here

Where did this get moved to?

Where did this get moved to?

Missing pinch valves (H1 and H19).

Missing pinch valves (H1 and H19).

Yes removed

Yes removed

Agree! Fixed

Agree! Fixed

Remove this blank line.

Remove this blank line.

fixed tagging issue

Merge remote-tracking branch 'origin/feature/LDT-2951-Rinseback' into staging

    • -3
    • +30
    /suite_leahi/shared/scripts/names.py
BN approves

BN approves

BN approves

BN approves