Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
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.
DEN-12974 DEN-13242 Allow RO target flow rate to be set to 0 to support V&V testing.

DEN-12931 updated the dialysate flow sensor K factor

  1. … 3 more files in changeset.
DEN-12931 updated the drivers for DVT

  1. … 2 more files in changeset.
DEN-12931 updated the drivers with the DVT changes. Added code to run RTC and NVDataMgmt POSTs at fault mode

  1. … 8 more files in changeset.
DEN-12931 updated the code

  1. … 6 more files in changeset.
DEN-12974 Code review updates

  1. … 1 more file in changeset.
Remove test debug code. printf has major impact on unit timing and is not usable.

  1. … 1 more file in changeset.
DEN-13065 Debug printf for conductivity testing.

Testing of printf

  1. … 2 more files in changeset.
DEN-12931 updated the trimmer heater control

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

  1. … 53 more files in changeset.
DEN-12224 addressed the code review comments

  1. … 6 more files in changeset.
DEN-12224 updated the heaters' flow monitor and added flow monitor to the UV reactors

  1. … 5 more files in changeset.
DEN-12224 working in progress. Activated and debugged heaters flow check

  1. … 12 more files in changeset.
DEN-12224 updated build switches and NV Data

  1. … 10 more files in changeset.
DEN-12224 removed the build switches

  1. … 17 more files in changeset.
DEN-12224 merged staging

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

  1. … 16 more files in changeset.
DEN-11928 merged staging

  1. … 15 more files in changeset.
DEN-11928 updated the fill mode and the RO pump

  1. … 3 more files in changeset.
DEN-11928 updated the alarms and fill mode

  1. … 8 more files in changeset.
DEN-12224 updated the FMP data type conversion

DEN-12224 added F to the defines that are floating numbers

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

  1. … 59 more files in changeset.
DEN-11750 updated the concentrate pumps

  1. … 2 more files in changeset.
DEN-11750 updated the code

  1. … 5 more files in changeset.