dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Use get function for override.

Use get function for override.

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

Merge branch 'develop' of ssh://dvm-linux02:7999/dg/dgfirmware into develop

Merge branch 'DEN-14086-alarm-159-dialysate-inlet-pump-failed-flow-vs-motor-speed-check' into develop

DEN-14086: fixed logging issue with LC drift alarm.

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

Fixed merge conflicts.

    • -4
    • +12
    /firmware/App/Controllers/LoadCell.c
DEN-13946 - Correct monitor functions where multiple sensors are "or'd" into a single alarm.

    • -9
    • +13
    /firmware/App/Controllers/LoadCell.c
    • -8
    • +12
    /firmware/App/Controllers/Pressures.c
    • -4
    • +16
    /firmware/App/Controllers/Thermistors.c
DEN-14086: Increase loadcell drift allowance from +/- 60 to 80 grams - and for heat disinfect, +/- 200 grams.

    • -3
    • +11
    /firmware/App/Controllers/LoadCell.c
DG-DEN-13946_Certain Temperature Sensors Trigger Wrong Alarm
DG-DEN-13946_Certain Temperature Sensors Trigger Wrong Alarm
DG-DEN-14086_Alarm 159 Dialysate Inlet Pump Failed Flow VS Motor Speed Check
DG-DEN-14086_Alarm 159 Dialysate Inlet Pump Failed Flow VS Motor Speed Check
Assume this is for testing?

Assume this is for testing?

DEN-14497 updated the drain pump control for the flow and updating chemical disinfect is in progress

    • -10
    • +19
    /firmware/App/Controllers/DrainPump.c
    • -161
    • +113
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -5
    • +3
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

    • -1
    • +1
    /firmware/App/Controllers/Thermistors.c
    • -1
    • +1
    /firmware/App/Controllers/UVReactors.c
Merge branch 'staging' into DEN-14433-sw-s86-mg-publish-fixes

    • -1
    • +1
    /firmware/App/Controllers/Thermistors.c
    • -1
    • +1
    /firmware/App/Controllers/UVReactors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

    • -1
    • +1
    /firmware/App/Controllers/FlowSensors.c
    • -1
    • +1
    /firmware/App/Controllers/FlowSensors.h
  1. … 84 more files in changeset.
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

DEN-14101 addressed the code review comment