Activity dgfirmware/firmware/App

3:33 pm

Sean Nash

More
2c08db0
changed 23 files
DEN-14902-bootloader-for-dg, develop DG-DEN-14902-1 DG-DEN-15336-1

Fixed merge conflicts.

- -52
- +28
./Controllers/ConductivitySensors.c
- History
- Source
- Diff
./Controllers/ConductivitySensors.c
- -6
- +7
./Controllers/ConductivitySensors.h
- History
- Source
- Diff
./Controllers/ConductivitySensors.h
- -88
- +113
./Controllers/DrainPump.c
- History
- Source
- Diff
./Controllers/DrainPump.c
- -5
- +4
./Controllers/DrainPump.h
- History
- Source
- Diff
./Controllers/DrainPump.h
- -18
- +86
./Controllers/Heaters.c
- History
- Source
- Diff
./Controllers/Heaters.c
- -0
- +3
./Controllers/Heaters.h
- History
- Source
- Diff
./Controllers/Heaters.h
- -10
- +20
./Controllers/Pressures.c
- History
- Source
- Diff
./Controllers/Pressures.c
- -25
- +37
./Controllers/ROPump.c
- History
- Source
- Diff
./Controllers/ROPump.c
- -0
- +1
./Controllers/ROPump.h
- History
- Source
- Diff
./Controllers/ROPump.h
- -4
- +15
./Controllers/TemperatureSensors.c
- History
- Source
- Diff
./Controllers/TemperatureSensors.c
- -0
- +2
./Drivers/CPLD.h
- History
- Source
- Diff
./Drivers/CPLD.h
- -300
- +224
./Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
./Modes/ModeChemicalDisinfect.c
- -193
- +157
./Modes/ModeChemicalDisinfectFlush.c
- History
- Source
- Diff
./Modes/ModeChemicalDisinfectFlush.c
- -1
- +0
./Modes/ModeDrain.c
- History
- Source
- Diff
./Modes/ModeDrain.c
- -10
- +55
./Modes/ModeFill.c
- History
- Source
- Diff
./Modes/ModeFill.c
… 8 more files in changeset.

8:30 am

Sean Nash

More
Re: DG-DEN-13946-1
replied to wbracken (deleted user)

Setting first iterator to 0 seems safer (in case somebody adds a new enum before what used to be the first enum). Could also create a redundant 0 enum like below and use the "first" enum to initial...

Setting first iterator to 0 seems safer (in case somebody adds a new enum before what used to be the first enum).
Could also create a redundant 0 enum like below and use the "first" enum to initialize a loop iterator safely:
enum list
{
FIRST_TEMP_SENSOR = 0,
TPI_SENSOR = FIRST_TEMP_SENSOR,
TPO_SENSOR,
TD1_SENSOR,
....
}
RESOLVED in CODE WALKTHROUGH.

8:24 am

Sean Nash

More
Re: DG-DEN-13946-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

6:01 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
e9f4774
changed 1 file
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13946-certain-temperature-sensors-trigger-wrong-alarm and 167 more DG-DEN-13946-1

Merge branch 'staging' into DEN-13946-certain-temperature-sensors-trigger-wrong-alarm

- -7
- +14
./Controllers/LoadCell.c
- History
- Source
- Diff
./Controllers/LoadCell.c

5:59 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
b44ada6
changed 1 file
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13946-certain-temperature-sensors-trigger-wrong-alarm and 167 more DG-DEN-13946-1

DEN-13946 - Use typedefs for iterating over sensors.

- -3
- +1
./Controllers/LoadCell.c
- History
- Source
- Diff
./Controllers/LoadCell.c

3:04 pm

Dara Navaei

More
5aee05d
changed 11 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 171 more DG-DEN-14497-1

DEN-14497 updated the drain pump flow control algorithm. Fixed the inlet water pressure, temperature, conductivity alarm recovery in treatment modes. Updated chemical disinfect flush mode

- -16
- +27
./Controllers/ConductivitySensors.c
- History
- Source
- Diff
./Controllers/ConductivitySensors.c
- -11
- +9
./Controllers/DrainPump.c
- History
- Source
- Diff
./Controllers/DrainPump.c
- -1
- +1
./Controllers/DrainPump.h
- History
- Source
- Diff
./Controllers/DrainPump.h
- -9
- +19
./Controllers/Pressures.c
- History
- Source
- Diff
./Controllers/Pressures.c
- -4
- +14
./Controllers/TemperatureSensors.c
- History
- Source
- Diff
./Controllers/TemperatureSensors.c
- -145
- +117
./Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
./Modes/ModeChemicalDisinfect.c
- -193
- +157
./Modes/ModeChemicalDisinfectFlush.c
- History
- Source
- Diff
./Modes/ModeChemicalDisinfectFlush.c
- -8
- +2
./Modes/ModeFill.c
- History
- Source
- Diff
./Modes/ModeFill.c
- -45
- +61
./Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
./Modes/ModeHeatDisinfect.c
- -0
- +2
./Services/AlarmMgmt.c
- History
- Source
- Diff
./Services/AlarmMgmt.c
- -3
- +3
./Services/PIControllers.c
- History
- Source
- Diff
./Services/PIControllers.c

1:03 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
c0ef736
changed 4 files
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13946-certain-temperature-sensors-trigger-wrong-alarm and 167 more DG-DEN-13946-1

DEN-13946 Use typedefs for itterating over sensors.

- -4
- +4
./Controllers/LoadCell.c
- History
- Source
- Diff
./Controllers/LoadCell.c
- -4
- +3
./Controllers/Pressures.c
- History
- Source
- Diff
./Controllers/Pressures.c
- -6
- +6
./Controllers/TemperatureSensors.c
- History
- Source
- Diff
./Controllers/TemperatureSensors.c
- -2
- +1
./Controllers/Thermistors.c
- History
- Source
- Diff
./Controllers/Thermistors.c

11:37 am

wbracken (deleted user)

More
Re: DG-DEN-13946-1
replied to Sean Nash

Similar code is in other monitoring functions. monitorTemperatureSensors, monitorPressureSensors iterate over their list of sensors using U08. monitorThermistors iterates over thermistors using typ...

Similar code is in other monitoring functions. monitorTemperatureSensors, monitorPressureSensors iterate over their list of sensors using U08. monitorThermistors iterates over thermistors using typedef THERMISTORS_TEMP_SENSORS_T. Changed load cells to use U08 to be consistent with temperature and pressure monitoring.

Should probably change temperature, pressure and load cells to use correct typedef.

Also, it looks like why the typedefs weren't used was in order to set the initial value of the iterator to 0 (i.e, the first sensor in the list). Seems like there should be a value that is the first item in the list, i.e. TEMPSENSORS_FIRST_SENSOR.

11:07 am