Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

DEN-14646 Add window timer support for communications alarms. Debug code for testing conductivity sensor FPGA generated alarms.

    • -1
    • +41
    ./Controllers/ConductivitySensors.c
DEN-14788: DEN-14831: Fixed inlet pressures not being monitored across all modes. Fixed inlet temperature to not be monitored in flush drain state.

DEN-14788: Fixed heaters duty cycle override to immediately set PWM instead of waiting for control state machine to set PWM.

DEN-14763 work in progress. Worked on on developing heat disinfect active cool

    • -22
    • +484
    ./Modes/ModeHeatDisinfectActiveCool.c
    • -0
    • +19
    ./Modes/ModeHeatDisinfectActiveCool.h
DEN-14763 added code to receive the chem disinfect flush sample result from HD and update the NV memeory

    • -20
    • +60
    ./Modes/ModeChemicalDisinfectFlush.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10' into develop

DEN-14763, DIAL-233, DEN-14812 added a command to be able to set the dialysate mixing ratios and added an event to send the average conductivity of acid and bicarb at the end of the fill. Changed the measured flow function to flow with concentrate pumps in drain pump's control to flow function

  1. … 1 more file in changeset.
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merged staging

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DEN-14789-sw-cp-persistence-timer-increase' into develop

    • -18
    • +17
    ./Controllers/ConcentratePumps.c
DEN-14789: Increased CP measured speed persistence to 6s in order to handle pump parking

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DEN-14781-alarm-117-dg-can-message-not-acked' into staging

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 1 more file in changeset.
DEN-14649: Fixed park fault to consider override

DEN-14649: fixed conc pump park faults to no longer use measured speed.

DEN-14781 changed the drain pump flow control interval and the trimmer heaters minimum flow rate

DEN-14781 updated the code to be able to support Nelson modes

    • -13
    • +12
    ./Controllers/ConcentratePumps.c
  1. … 1 more file in changeset.
DEN-14781 updated Nelson support

DEN-14781 changed the number of message not acked retries from 3 to 8. Changed the heat disinfect code to not start the concentrate pumps at a low temperature if the mode is not in Nelson.