Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-13834

  1. … 10 more files in changeset.
DEN-13834 updated the heaters driver

  1. … 3 more files in changeset.
DEN-13834 updated the heaters duty cycle record step. Tested the RO pump duty cycle feedback

  1. … 2 more files in changeset.
DEN-13834 removed and addressed some of the TODOs in the code base and renamed the heaters' voltage enums for better clarification. Updated the DG RO volume generated calculations

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

DEN-13460 updated the heates voltages

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

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

DEN-13786 DEN-13573 Correct MIN_INLET_TEMPERATURE_C value and minor logic bug. DEN-13786 DEN-13582 Delta temperature calculation requires fabs.

  1. … 1 more file 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 trimmer heater's duty cycle cap control

  1. … 4 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.
Merge remote-tracking branch 'origin/develop' into develop

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 '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.