Michael Garthwaite

LDT-2004: reverted fpga init to be reflective in staging. setting raw resistance values to 1 when we see 0 to prevent nan's being injected into rolling average.

- -0
- +6
/firmware/App/Drivers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -8
- +18
/firmware/App/Drivers/ConductivityTeensy.c
- History
- Source
- Diff
/firmware/App/.../ConductivityTeensy.c
- -8
- +8
/firmware/App/Monitors/Conductivity.c
- History
- Source
- Diff
/firmware/App/Monitors/Conductivity.c
- -2
- +2
/firmware/App/Services/FpgaDD.c
- History
- Source
- Diff
/firmware/App/Services/FpgaDD.c

10:51 am

Michael Garthwaite

More
ad5fb11
changed 2 files
LDT-2004-dialysate-composition-closed-loop--dd, LDT-2004-v2-conductivity-sensors, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-2004-4

LDT-2004: fixed build errors from merging staging into working branch.

- -14
- +6
/firmware/App/Controllers/BalancingChamber.c
- History
- Source
- Diff
/firmware/App/.../BalancingChamber.c
- -1
- +1
/firmware/App/Controllers/BalancingChamber.h
- History
- Source
- Diff
/firmware/App/.../BalancingChamber.h

10:12 am

Michael Garthwaite

More
ca90d09
changed 0 files
LDT-2004-dialysate-composition-closed-loop--dd, LDT-3218-update-iofp-permeate-target-flow, develop in dd-firmware

Merge branch 'staging' into LDT-3218-update-iofp-permeate-target-flow

10:11 am

Michael Garthwaite

More
3e178c9
changed 0 files
LDT-2004-dialysate-composition-closed-loop--dd, LDT-2004-dialysate-composition-mixing-beta-2.0--dd and 2 more in leahi-fwcommon

Merge branch 'staging' into LDT-3218-update-iofp-permeate-target-flow

10:11 am

Michael Garthwaite

More
fd142f1
changed 0 files
LDT-2004-dialysate-composition-closed-loop--dd, LDT-2004-dialysate-composition-mixing-beta-2.0--dd and 2 more in leahi-fwcommon

Merge branch 'staging' into LDT-2004-v2-conductivity-sensors

10:11 am

Michael Garthwaite

More
700cd48
changed 0 files
LDT-1195-dd-is-balancing-chamber-switching, LDT-2004-dialysate-composition-closed-loop--dd and 7 more in leahi-fwcommon

Merge remote-tracking branch 'origin/staging' into staging

10:10 am

Michael Garthwaite

More
549ae2f
changed 1 file
LDT-2004-dialysate-composition-closed-loop--dd, LDT-2004-dialysate-composition-mixing-beta-2.0--dd and 2 more in leahi-common LEAHI-DD-FIRMWARE-LDT-2004-7

Merge branch 'staging' into LDT-2004-v2-conductivity-sensors

- -3
- +3
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h

10:09 am

Michael Garthwaite

More
1077fee
changed 5 files
LDT-2004-dialysate-composition-closed-loop--dd, LDT-2004-v2-conductivity-sensors, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-2004-4

Merge branch 'staging' into LDT-2004-v2-conductivity-sensors

- -279
- +375
/firmware/App/Controllers/BalancingChamber.c
- History
- Source
- Diff
/firmware/App/.../BalancingChamber.c
- -2
- +2
/firmware/App/Controllers/BalancingChamber.h
- History
- Source
- Diff
/firmware/App/.../BalancingChamber.h
- -6
- +3
/firmware/App/DDCommon.h
- History
- Source
- Diff
/firmware/App/DDCommon.h
- -11
- +119
/firmware/App/Modes/ModeGenDialysate.c
- History
- Source
- Diff
/firmware/App/Modes/ModeGenDialysate.c
- -16
- +12
/firmware/App/Services/FpgaDD.c
- History
- Source
- Diff
/firmware/App/Services/FpgaDD.c

10:06 am

yeah its obsolete. This is an old branch that recently got synced with latest staging. It looks like the CR doesn't recognize the correct changes from staging. There should only be 1 file change ( ...

yeah its obsolete. This is an old branch that recently got synced with latest staging. It looks like the CR doesn't recognize the correct changes from staging. There should only be 1 file change ( conductivity sensors ).

10:01 am

Michael Garthwaite

More
0573f51
changed 1 file
LDT-2655-fix_conductivity_override in leahi-dialin LEAHI-DIALIN-LDT-2655-1

Merge branch 'staging' into LDT-2655-fix_conductivity_override

- -8
- +8
/leahi_dialin/fp/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/valves.py

Michael Garthwaite

About

eval(decodeURIComponent('%64%6F%63%75%6D%65%6E%74%2E%77%72%69%74%65%28%22%6D%67%61%72%74%68%77%61%69%74%65%40%64%69%61%6C%69%74%79%2E%63%6F%6D%22%29')); var scriptElem = document.getElementById('to-removed') scriptElem.parentNode.removeChild(scriptElem);

Reviews

50 active reviews

Line History

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Committer Mappings

Michael Garthwaite is mapped to 34 committers over 16 repositories