Activity dgfirmware/

DEN-14197: updated Dialin msg handling DIAL-200: Implemented handler for total fill volume override. Implemented fill mode broadcast override handler. DIAL-212: Implemented RO feedback voltage override handler.

- -7
- +68
/firmware/App/Modes/ModeFill.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.c
- -0
- +6
/firmware/App/Modes/ModeFill.h
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.h
- -0
- +12
/firmware/App/Services/SystemComm.c
- History
- Source
- Diff
/firmware/App/Services/SystemComm.c
- -0
- +214
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c
- -0
- +28
/firmware/App/Services/SystemCommMessages.h
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.h

2:05 pm

Michael Garthwaite

More
036a11e
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-UCOMMITS-38

DEN-14197: build fixes and warnings.

- -0
- +1
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c

1:53 pm

Michael Garthwaite

More
88db2f2
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-UCOMMITS-38

DEN-14197: Build fixes

- -1
- +1
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c

1:50 pm

Michael Garthwaite

More
900d1b6
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-UCOMMITS-37

DEN-14197: DIAL-212: Created measured RO pump feedback voltage override. Implemented current RO Pump profile variable.

- -9
- +79
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c

12:54 pm

Dara Navaei

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

- -1
- +1
/firmware/App/DGCommon.h
- History
- Source
- Diff
/firmware/App/DGCommon.h

12:52 pm

Dara Navaei

Merge branch 'DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5' into develop

12:51 pm

Dara Navaei

More
a4c308b
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more DG-DEN-14175-1

DEN-14175 updated the extra temperature to 0.0 from 2.0

- -1
- +1
/firmware/App/Services/Reservoirs.h
- History
- Source
- Diff
/firmware/App/Services/Reservoirs.h

11:30 am

Michael Garthwaite

More
958fe92
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Fixed warnings regarding gen idle overrides. Fixed compiler issues when merging into develop.

- -5
- +3
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -2
- +2
/firmware/App/Modes/ModeGenIdle.h
- History
- Source
- Diff
/firmware/App/Modes/ModeGenIdle.h

11:04 am

Michael Garthwaite

More
29a9a5d
changed 5 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: implemented RO pump profile switching. Implemented Flow to PWM function RO pump with profiles as a parameter. Created a SW fault for PI profiles out of range.

- -38
- +87
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -0
- +14
/firmware/App/Controllers/ROPump.h
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.h
- -0
- +1
/firmware/App/Services/AlarmMgmtSWFaults.h
- History
- Source
- Diff
/firmware/App/.../AlarmMgmtSWFaults.h
- -11
- +0
/firmware/App/Services/PIControllers.c
- History
- Source
- Diff
/firmware/App/Services/PIControllers.c
- -5
- +7
/firmware/App/Services/PIControllers.h
- History
- Source
- Diff
/firmware/App/Services/PIControllers.h

11:39 am

Michael Garthwaite

More
7104ce1
changed 3 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-UCOMMITS-37

DEN-14197: Initial attempt at PI controller profiles with usage in ro pump

- -0
- +38
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -0
- +11
/firmware/App/Services/PIControllers.c
- History
- Source
- Diff
/firmware/App/Services/PIControllers.c
- -0
- +11
/firmware/App/Services/PIControllers.h
- History
- Source
- Diff
/firmware/App/Services/PIControllers.h

10:33 am

Dara Navaei

More
27e2d12
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more DG-DEN-14175-1

DEN-14175 addressed the code review comments

- -3
- +3
/firmware/App/Modes/ModeFill.h
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.h
- -35
- +50
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

12:29 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
2223441
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 182 more DG-DEN-14237-1

Merge branch 'staging' into DEN-14237-remove-heat-disinfect-rinse-states

# Conflicts:

# firmware/App/Modes/ModeHeatDisinfect.c

- -4
- +12
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

5:40 pm

Dara Navaei

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

- -1
- +1
/firmware/App/DGCommon.h
- History
- Source
- Diff
/firmware/App/DGCommon.h

3:56 pm

Dara Navaei

Merge branch 'DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5' into develop

- -4
- +5
/firmware/App/Controllers/ConcentratePumps.c
- History
- Source
- Diff
/firmware/App/.../ConcentratePumps.c
- -1
- +1
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -11
- +35
/firmware/App/Controllers/Heaters.c
- History
- Source
- Diff
/firmware/App/Controllers/Heaters.c
- -6
- +7
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

3:53 pm

Dara Navaei

More
8e0041d
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more DG-DEN-14175-1

DEN-14175 added trimmer heater use last duty cycle to the broadcast data

- -4
- +5
/firmware/App/Controllers/Heaters.c
- History
- Source
- Diff
/firmware/App/Controllers/Heaters.c

3:02 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
25cf37f
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 182 more DG-DEN-14237-1

DEN-14237 Correct multipe changes to return status based upon whether or not there is a pending alarm.

- -65
- +82
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

1:59 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
1c4e4a0
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 182 more DG-DEN-14237-1

DEN-14237 Removed conditional code and references to isThisLastDrain.

- -302
- +24
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

10:56 am

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
e056d72
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 182 more DG-UCOMMITS-38

DEN-14237 changes to getHeatDisinfectStatus.

- -4
- +4
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

10:03 am

Dara Navaei

More
6f29912
changed 17 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more DG-DEN-14175-1

DEN-14175 addressed the code review comments and replaced the V3 enable software configuration flag with the hardware configuration flag from FGPA. Updated the trimmer heater's ramp state to check the use previous duty cycle flag instead of estimating the duty cycle.