ConductivitySensors.c

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7

  1. … 23 more files in changeset.
Fixed merge conflicts.

  1. … 22 more files in changeset.
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

  1. … 10 more files in changeset.
DEN-14497: Changed CPo and RR alarms to only occur at end of fill based on average conductivity.

  1. … 4 more files in changeset.
Fixed merge conflicts.

  1. … 13 more files in changeset.
DEN-14497 updated the drain pump control for the flow and updating chemical disinfect is in progress

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 98 more files in changeset.
Merged DEN-14307

  1. … 8 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 26 more files in changeset.
DEN-14307 fixed the concentrate pumps' park command ID and addressed the code review comments. Updated heat disinfect mix drain states with the proper actuators

  1. … 12 more files in changeset.
DEN-14307 updated the cleaning modes per the SRS changes

  1. … 10 more files in changeset.
Merged DEN-14237

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 22 more files in changeset.
Merge branch 'DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5' into develop

  1. … 3 more files in changeset.
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.

  1. … 16 more files in changeset.
Merge branch 'DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5' into develop

DEN-14175 added alarms to check the conductivity sensor's bad received hex characters

Merged DEN-14166

  1. … 14 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 39 more files in changeset.
Merged DEN-13834

  1. … 8 more files in changeset.
DEN-13834 addressed the code review comments

  1. … 6 more files in changeset.
Merged DEN-13834

  1. … 17 more files in changeset.
DEN-13834 updated the code

  1. … 6 more files in changeset.
DEN-14000 merge to develop.

  1. … 10 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 52 more files in changeset.
DEN-13460 addressed the code review comments

  1. … 7 more files in changeset.
Merged DEN-13460

  1. … 6 more files in changeset.
DEN-13460 merged staging

  1. … 9 more files in changeset.
Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

  1. … 10 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 9 more files in changeset.