Michael Garthwaite

10:47 am

Michael Garthwaite

More
c2f014b
changed 0 files
LDT-4000-hdf-fw-implementation-1-4 in leahi-fwcommon

Merge branch 'staging' into LDT-4000-hdf-fw-implementation-1-4

10:46 am

Michael Garthwaite

More
2d5721b
changed 1 file
LDT-4000-hdf-fw-implementation-1-4 in leahi-dialin LEAHI-DIALIN-LDT-4000-1

Merge branch 'staging' into LDT-4000-hdf-fw-implementation-1-4

- -2
- +5
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py

10:44 am

Michael Garthwaite

More
3a6adcf
changed 2 files
LDT-4000-hdf-fw-implementation-1 in dd-firmware LEAHI-DD-FIRMWARE-LDT-4000-1

Merge branch 'staging' into LDT-4000-hdf-fw-implementation-1

- -20
- +24
/firmware/App/Controllers/RinsePump.c
- History
- Source
- Diff
/firmware/App/Controllers/RinsePump.c
- -2
- +2
/firmware/App/Monitors/Level.c
- History
- Source
- Diff
/firmware/App/Monitors/Level.c

10:43 am

Michael Garthwaite

More
167ffb1
changed 0 files
LDT-3972-water-treatment-and-degassing-1 in dd-firmware

Merge branch 'staging' into LDT-3972-water-treatment-and-degassing-1

10:43 am

Michael Garthwaite

More
6541bc2
changed 2 files
LDT-3975-Boost-Pump in dd-firmware LEAHI-DD-FIRMWARE-LDT-3975-1

Merge branch 'staging' into LDT-3975-Boost-Pump

- -2
- +2
/firmware/App/Modes/FPModes/ModeGenPermeate.c
- History
- Source
- Diff
/firmware/App/.../FPModes/ModeGenPermeate.c
- -3
- +3
/firmware/App/Modes/FPModes/ModePreGenPermeate.c
- History
- Source
- Diff
/firmware/App/.../ModePreGenPermeate.c

10:42 am

Michael Garthwaite

More
67d164e
changed 1 file
LDT-4000-hdf-fw-implementation-1-4 in leahi-common LEAHI-DD-FIRMWARE-LDT-4000-1

Merge branch 'staging' into LDT-4000-hdf-fw-implementation-1-4

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

9:26 am

Michael Garthwaite

More
4248e80
changed 3 files
LDT-3975-Boost-Pump in dd-firmware LEAHI-DD-FIRMWARE-LDT-3975-1

Merge branch 'staging' into LDT-3975-Boost-Pump

- -4
- +4
/firmware/App/Modes/FPModes/ModePreGenPermeate.c
- History
- Source
- Diff
/firmware/App/.../ModePreGenPermeate.c
- -5
- +5
/firmware/App/Modes/FPModes/StateFlushConcentrate.c
- History
- Source
- Diff
/firmware/App/.../StateFlushConcentrate.c
- -6
- +5
/firmware/App/Modes/FPModes/StateFlushPermeate.c
- History
- Source
- Diff
/firmware/App/.../StateFlushPermeate.c

1:58 pm

Michael Garthwaite

More
b109801
changed 0 files
LDT-4246-fw-support-for-ui-demo, develop in dd-firmware

Merge branch 'LDT-4000-hdf-fw-implementation-1' into develop

1:54 pm

Michael Garthwaite

More
056407a
changed 1 file
LDT-4000-hdf-fw-implementation-1, LDT-4246-fw-support-for-ui-demo, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-4000-1 LEAHI-DD-FIRMWARE-LDT-4246-1

LDT-4000: fixed direction of substitution pump.

- -2
- +2
/firmware/App/Controllers/SubstitutionPump.c
- History
- Source
- Diff
/firmware/App/.../SubstitutionPump.c

12:04 pm

Michael Garthwaite

More
3c0b433
changed 1 file
LDT-4246-fw-support-for-ui-demo, develop in dd-firmware

Merge branch 'LDT-4000-hdf-fw-implementation-1' into develop

- -1
- +1
/firmware/App/Monitors/Level.c
- History
- Source
- Diff
/firmware/App/Monitors/Level.c

12:03 pm

Michael Garthwaite

More
1659183
changed 1 file
LDT-4000-hdf-fw-implementation-1, LDT-4246-fw-support-for-ui-demo, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-4000-1

LDT-4000: fix to levels regarding test config changes

- -1
- +1
/firmware/App/Monitors/Level.c
- History
- Source
- Diff
/firmware/App/Monitors/Level.c

8:43 am

Michael Garthwaite

More
fbde66a
changed 0 files
LDT-4246-fw-support-for-ui-demo, develop in dd-firmware

Merge branch 'LDT-4000-hdf-fw-implementation-1' into develop

8:42 am

Michael Garthwaite

More
aa585f9
changed 1 file
develop in leahi-dialin

Merge branch 'LDT-4000-hdf-fw-implementation-1-4' into develop

- -2
- +2
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py

8:42 am

Michael Garthwaite

More
0c4a63a
changed 1 file
LDT-4000-hdf-fw-implementation-1-4, develop in leahi-dialin LEAHI-DIALIN-LDT-4000-1

LDT-4000: swapped msg_ids for substitution pump overrides

- -2
- +2
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py

8:40 am

Michael Garthwaite

More
78abcb9
changed 1 file
LDT-4000-hdf-fw-implementation-1, LDT-4246-fw-support-for-ui-demo, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-4000-1

WIP on develop

LDT-4000: fixed start stop data structure to no longer include volume

- -4
- +3
/firmware/App/Controllers/SubstitutionPump.c
- History
- Source
- Diff
/firmware/App/.../SubstitutionPump.c

9:08 pm

Michael Garthwaite

More
c4d1144
changed 0 files
LDT-4246-fw-support-for-ui-demo, develop in dd-firmware

Merge branch 'LDT-4000-hdf-fw-implementation-1' into develop

9:08 pm

Michael Garthwaite

More
564f298
changed 1 file
LDT-4000-hdf-fw-implementation-1, LDT-4246-fw-support-for-ui-demo, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-4000-1

LDT-4000: fixed fpga init to use beta 2 data structures

- -2
- +2
/firmware/App/Services/FpgaDD.c
- History
- Source
- Diff
/firmware/App/Services/FpgaDD.c

9:04 pm

Michael Garthwaite

More
5e99c7f
changed 1 file
develop in leahi-fwcommon

WIP on develop

fixed commit loss. message payload no longer existed in branch

- -0
- +9
/MessagePayloads.h
- History
- Source
- Diff
/MessagePayloads.h

8:50 pm

Michael Garthwaite

More
a7af93e
changed 5 files
LDT-4246-fw-support-for-ui-demo, develop in dd-firmware

Merge branch 'LDT-4000-hdf-fw-implementation-1' into develop

- -7
- +7
/firmware/App/Controllers/Heaters.c
- History
- Source
- Diff
/firmware/App/Controllers/Heaters.c
- -11
- +11
/firmware/App/Controllers/RinsePump.c
- History
- Source
- Diff
/firmware/App/Controllers/RinsePump.c
- -4
- +4
/firmware/App/Monitors/Conductivity.c
- History
- Source
- Diff
/firmware/App/Monitors/Conductivity.c
- -24
- +22
/firmware/App/Monitors/Level.c
- History
- Source
- Diff
/firmware/App/Monitors/Level.c
- -12
- +12
/firmware/App/Monitors/Temperature.c
- History
- Source
- Diff
/firmware/App/Monitors/Temperature.c

8:50 pm

Michael Garthwaite

More
f37bfe2
changed 6 files
LDT-4000-hdf-fw-implementation-1, LDT-4246-fw-support-for-ui-demo, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-4000-1 LEAHI-DD-FIRMWARE-LDT-4246-1

LDT-4000: changed beta 2.0 test config to beta 1.9 test config

- -7
- +7
/firmware/App/Controllers/Heaters.c
- History
- Source
- Diff
/firmware/App/Controllers/Heaters.c
- -11
- +11
/firmware/App/Controllers/RinsePump.c
- History
- Source
- Diff
/firmware/App/Controllers/RinsePump.c
- -4
- +4
/firmware/App/Monitors/Conductivity.c
- History
- Source
- Diff
/firmware/App/Monitors/Conductivity.c
- -24
- +22
/firmware/App/Monitors/Level.c
- History
- Source
- Diff
/firmware/App/Monitors/Level.c
- -12
- +12
/firmware/App/Monitors/Temperature.c
- History
- Source
- Diff
/firmware/App/Monitors/Temperature.c
- -52
- +32
/firmware/App/Services/FpgaDD.c
- History
- Source
- Diff
/firmware/App/Services/FpgaDD.c

8:49 pm

Michael Garthwaite

More
360be3a
changed 1 file
develop in leahi-fwcommon

Merge branch 'LDT-4000-hdf-fw-implementation-1-4' into develop

- -1
- +1
/TestSupport.h
- History
- Source
- Diff
/TestSupport.h

8:49 pm

Michael Garthwaite

More
1d13178
changed 2 files
LDT-4000-hdf-fw-implementation-1-4, develop in leahi-fwcommon LEAHI-DD-FIRMWARE-LDT-4000-1

LDT-4000: changed beta 2.0 test config to beta 1.9 test config

- -4
- +4
/TestSupport.c
- History
- Source
- Diff
/TestSupport.c
- -1
- +1
/TestSupport.h
- History
- Source
- Diff
/TestSupport.h

8:27 pm

Michael Garthwaite

More
27dab35
changed 8 files
LDT-4246-fw-support-for-ui-demo, develop in dd-firmware

Merge branch 'LDT-4000-hdf-fw-implementation-1' into develop

- -1
- +1
/firmware/App/Controllers/BalancingChamber.c
- History
- Source
- Diff
/firmware/App/.../BalancingChamber.c
- -2
- +2
/firmware/App/Controllers/Heaters.c
- History
- Source
- Diff
/firmware/App/Controllers/Heaters.c
- -2
- +2
/firmware/App/DDCommon.h
- History
- Source
- Diff
/firmware/App/DDCommon.h
- -1
- +1
/firmware/App/Drivers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -2
- +2
/firmware/App/Modes/FPModes/ModePreGenPermeate.c
- History
- Source
- Diff
/firmware/App/.../ModePreGenPermeate.c
- -2
- +2
/firmware/App/Modes/FPModes/StateFlushPermeate.c
- History
- Source
- Diff
/firmware/App/.../StateFlushPermeate.c
- -2
- +3
/firmware/App/Modes/ModeGenDialysate.c
- History
- Source
- Diff
/firmware/App/Modes/ModeGenDialysate.c
- -1
- +1
/firmware/App/Monitors/Level.c
- History
- Source
- Diff
/firmware/App/Monitors/Level.c

8:27 pm

Michael Garthwaite

More
c441453
changed 1 file
LDT-4000-hdf-fw-implementation-1, LDT-4246-fw-support-for-ui-demo, develop in dd-firmware LEAHI-DD-FIRMWARE-LDT-4000-1

LDT-4000: fixes for merging

- -1
- +1
/firmware/App/Services/Messaging.c
- History
- Source
- Diff
/firmware/App/Services/Messaging.c

8:26 pm

Michael Garthwaite

More
fbe6f80
changed 2 files
develop in leahi-common

Merge branch 'LDT-4000-hdf-fw-implementation-1-4' into develop

- -3
- +6
/MsgDefs.h
- History
- Source
- Diff
/MsgDefs.h
- -2
- +2
/TDDefs.h
- History
- Source
- Diff
/TDDefs.h

8:25 pm

Michael Garthwaite

More
b889fff
changed 0 files
develop in leahi-fwcommon

Merge branch 'LDT-4000-hdf-fw-implementation-1-4' into develop

8:25 pm

Michael Garthwaite

More
b6e65e6
changed 2 files
LDT-4000-hdf-fw-implementation-1-4, develop in leahi-fwcommon LEAHI-DD-FIRMWARE-LDT-4000-1

LDT-4000: reverted test config changes.

- -2
- +2
/TestSupport.c
- History
- Source
- Diff
/TestSupport.c
- -1
- +1
/TestSupport.h
- History
- Source
- Diff
/TestSupport.h

8:23 pm

Michael Garthwaite

More
e55b580
changed 1 file
LDT-4000-hdf-fw-implementation-1-4, develop in leahi-common LEAHI-DD-FIRMWARE-LDT-4000-1

LDT-4000: revert of test config swap

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

8:18 pm

Michael Garthwaite

More
66f3802
changed 1 file
LDT-4000-hdf-fw-implementation-1-4, develop in leahi-common LEAHI-DD-FIRMWARE-LDT-4000-1

LDT-4000: updated to msg_ids

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

8:17 pm

Michael Garthwaite

More
b994127
changed 1 file
develop in leahi-dialin

Merge branch 'LDT-4000-hdf-fw-implementation-1-4' into develop

- -4
- +2
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.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

46 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 21 committers over 16 repositories