Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

  1. … 1 more file in changeset.
DEN-13460 updated the heaters control

  1. … 1 more file in changeset.
Merge branch 'staging' into DEN-12974-miscellaneous-flush-issues_bb

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

  1. … 8 more files in changeset.
DEN-12974 Changes per code review. Remove Chemical and Heat Disinfect code. Add separate RO_FLO_MIN_LPM for heaters and uv.

  1. … 4 more files in changeset.
Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

  1. … 1 more file in changeset.
DEN-13460 updated the control temperature sensor of the trimmer heater from TDi to TRo

  1. … 1 more file in changeset.
Changed the heat disinfect control

  1. … 1 more file in changeset.
Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

  1. … 9 more files in changeset.
DEN-13460 updated the code

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

  1. … 3 more files in changeset.
Updated the heaters no flow value

DEN-13460 merged the remote branch

DEN-13460 updated the concentrate pump speed check and the increased the heaters on with no flow to 10 seconds

  1. … 6 more files in changeset.
DEN-13460: Increased persistence for heater on with no flow alarm from 1 to 5 seconds.

DEN-13460 Heater feedback primary channel changed to read from FPGA, secondary from internal ADC replaces old primary name.

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

  1. … 12 more files in changeset.
DEN-13460 updated the drivers with the DVT features

  1. … 14 more files in changeset.
Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into develop

merge conflicts

Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into develop

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

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

  1. … 36 more files in changeset.
DEN-12931 addressed the code review comments

  1. … 4 more files in changeset.
Disabled heat disinfect duty cycle control in heat disinfect

  1. … 2 more files in changeset.
DEN-12931 addressed the code review comments

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

  1. … 8 more files in changeset.
DEN-13460 updated the code with the DVT changes

  1. … 7 more files in changeset.
Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

  1. … 2 more files in changeset.
DEN-13460 updated the heaters with the latest primary heater gain check

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

  1. … 1 more file in changeset.