Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts.

DEN-14197: Start DPo pump to same PWM duty cycle as DPi when in closed loop mode.

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

Merge branch 'DEN-14307-dg_hd_dev-hd_dg_dvt-update-part-6' into develop

DEN-14307 updated the alarms name and the checkAlarms.sh to check the manual alarms table and fail upon compilation

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

DEN-14099 Add todo note for possible mitigation of valve closed too long.

DEN-14099 Fix pressure reading to use Venous and instant value.

DEN-14197: Range check DPi initial PWM duty cycle before setting.

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

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

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

Merged DEN-14150

DEN-14150 addressed a code review comment

DEN-14150 reversed the previous code changes. Calling resetBloodPumpRotorCount and resetDialInPumpRotorCount

DEN-14150 addressed a code review comment by making resetSignalFlags and resetAlarmSignalFlags functions to be called in pretreatment

DEN-14150 removed a blank line

DEN-14150 merged staging

    • -32
    • +211
    ./Services/SystemCommMessages.c
DEN-14099 Added pressure / release cycles to remove air bubbles during prime dialyzer.

DEN-14150: Update DialInFlow.c

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

Merged DEN-14175

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

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

  1. … 6 more files in changeset.
DEN-14175 addressed a code review comment

DEN-14150: Update DialInFLow.c

DEN-14175 addressed the code review comments. Updated the reservoir switch command in pre treatment and added the getHWConfig function in FPGA

Merge branch 'staging' into DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5

DEN-14175 removed a blank line

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