hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12121: Removed double include of ModeTreatmentParams.h

Merge branch 'DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up

    • -11
    • +21
    /firmware/App/Controllers/BloodFlow.c
    • -10
    • +22
    /firmware/App/Controllers/DialInFlow.c
    • -10
    • +20
    /firmware/App/Controllers/DialOutFlow.c
Added F suffix to pump pwm offset literals to fix failure to detect pump running while off alarm.

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
DEN-11750 merged staging and resolved the merge conflicts

    • -15
    • +16
    /firmware/App/Controllers/BloodLeak.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +3
    /firmware/App/Controllers/DialInFlow.c
    • -4
    • +4
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.h
    • -277
    • +281
    /firmware/App/Controllers/SyringePump.c
  1. … 22 more files in changeset.
Merge remote-tracking branch 'origin/staging' into DEN-12121-sw_dev-sprint-65

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

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

    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
    • -2
    • +2
    /firmware/App/Modes/ModeTreatmentParams.c
    • -2
    • +2
    /firmware/App/Modes/ModeTreatmentParams.h
Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

Merge branch 'cc-vectorcast2' into DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up

Merge branch 'staging' into DEN-11980-sw_dev-sprint-64

    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.h
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up' into develop

DEN-11750 added a software configuration

    • -0
    • +8
    /firmware/App/Controllers/Temperatures.c
DEN-12215 Fix linker overrides or HalCoGen generated files so CRC information persists.

DEN-11750 updated the code

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

Merge branch 'DEN-11250-hd-syringe-pump-updates' into develop

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

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

Merge branch 'DEN-11250-hd-syringe-pump-updates' into staging

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.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.