dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-13946-certain-temperature-sensors-trigger-wrong-alarm

    • -7
    • +14
    /firmware/App/Controllers/LoadCell.c
DEN-13946 - Use typedefs for iterating over sensors.

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

    • -11
    • +9
    /firmware/App/Controllers/DrainPump.c
    • -9
    • +19
    /firmware/App/Controllers/Pressures.c
    • -145
    • +117
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -193
    • +157
    /firmware/App/Modes/ModeChemicalDisinfectFlush.c
    • -45
    • +61
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -3
    • +3
    /firmware/App/Services/PIControllers.c
DEN-13946 Use typedefs for itterating over sensors.

    • -2
    • +1
    /firmware/App/Controllers/Thermistors.c
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.

Removed.

Removed.

Remove blank line.

Remove blank line.

DEN-14497: Added CPo and RR alarms to fill mode recoverable list.

DEN-14497: Changed CPo and RR alarms to only occur at end of fill based on average conductivity.

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

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

DEN-14548 changed the time for heat disinfect cooling from 3 hours to 5 hours

Why change this to U08?

Why change this to U08?

DG-DEN-14548_Alarm 247 ON DG Heat Disinfect
DG-DEN-14548_Alarm 247 ON DG Heat Disinfect
DEN-14548 increased the heat disinfect cooling timeout from 90 minutes to 180 minutes

Add to header and alignment.

Add to header and alignment.

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

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Use get function for override.

Use get function for override.

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

Merge branch 'develop' of ssh://dvm-linux02:7999/dg/dgfirmware into develop

Merge branch 'DEN-14086-alarm-159-dialysate-inlet-pump-failed-flow-vs-motor-speed-check' into develop

DEN-14086: fixed logging issue with LC drift alarm.

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

Fixed merge conflicts.

    • -4
    • +12
    /firmware/App/Controllers/LoadCell.c
DEN-13946 - Correct monitor functions where multiple sensors are "or'd" into a single alarm.

    • -9
    • +13
    /firmware/App/Controllers/LoadCell.c
    • -8
    • +12
    /firmware/App/Controllers/Pressures.c
    • -4
    • +16
    /firmware/App/Controllers/Thermistors.c