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. … 5 more files in changeset.
DEN-13460 updated the heaters driver. Moved the heaters data broadcast structure to the fwcommon so the HD can use it too. Updated the temperature sensors FPGA persistent alarm

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

  1. … 6 more files in changeset.
DEN-13460 updated the FPGA persistent alarm functions

  1. … 4 more files in changeset.
DEN-13460 updated the trimmer heater's duty cycle cap control

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

  1. … 9 more files in changeset.
DEN-13460 updated the RO pump duty cycle feedback

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.
Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into staging

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/ROPump.c

  1. … 1 more file in changeset.
DEN-13460 merged staging

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

  1. … 1 more file in changeset.
DEN-12931 Temporary fix.

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

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

# firmware/App/Controllers/ROPump.h

  1. … 6 more files 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. … 9 more files in changeset.
DEN-13460 updated the code

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

  1. … 12 more files in changeset.
DEN-13460: Changed RO pump control coefficients to be more agressive.

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. … 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 'develop' of ssh://dvm-linux02:7999/dg/dgfirmware into develop

Merged DEN-13460

  1. … 4 more files in changeset.
Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into develop

DEN-12974 DEN-13242 Allow RO target flow rate to be set to 0 to support V&V testing.