dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14497 addressed the code review comment

DEN-13946 - Alarm generation is complete. Thermistors now configured based upon beta or DVT hardware configurations. Working with Noe to address FPGA thermistor values after reset.

    • -14
    • +34
    /firmware/App/Controllers/Thermistors.c
DEN-14497 added the latest VectorCAST from PiSquare

Merge branch 'staging' into DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7

  1. … 9 more files in changeset.
DEN-14497 addressed the code review comments

    • -12
    • +17
    /firmware/App/Controllers/DrainPump.c
    • -10
    • +17
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -6
    • +12
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Fixed merge conflicts.

    • -88
    • +113
    /firmware/App/Controllers/DrainPump.c
    • -18
    • +86
    /firmware/App/Controllers/Heaters.c
    • -10
    • +20
    /firmware/App/Controllers/Pressures.c
    • -25
    • +37
    /firmware/App/Controllers/ROPump.c
    • -300
    • +224
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -193
    • +157
    /firmware/App/Modes/ModeChemicalDisinfectFlush.c
  1. … 8 more files in changeset.
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
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

DEN-14548 increased the heat disinfect cooling timeout from 90 minutes to 180 minutes

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

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

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
DEN-14086: Increase loadcell drift allowance from +/- 60 to 80 grams - and for heat disinfect, +/- 200 grams.

    • -3
    • +11
    /firmware/App/Controllers/LoadCell.c
DEN-14497 updated the drain pump control for the flow and updating chemical disinfect is in progress

    • -10
    • +19
    /firmware/App/Controllers/DrainPump.c
    • -161
    • +113
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -5
    • +3
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

    • -1
    • +1
    /firmware/App/Controllers/Thermistors.c
    • -1
    • +1
    /firmware/App/Controllers/UVReactors.c