hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

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

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

    • -4
    • +10
    /firmware/App/Controllers/BloodFlow.c
    • -7
    • +19
    /firmware/App/Controllers/DialInFlow.c
    • -6
    • +16
    /firmware/App/Controllers/DialOutFlow.c
    • -15
    • +29
    /firmware/App/Controllers/PresOccl.c
    • -8
    • +31
    /firmware/App/Modes/ModeTreatment.c
DEN-11750 updated HDCommon.h

DEN-11750 updated the software configurations

    • -4
    • +10
    /firmware/App/Controllers/BloodFlow.c
    • -7
    • +19
    /firmware/App/Controllers/DialInFlow.c
    • -6
    • +16
    /firmware/App/Controllers/DialOutFlow.c
    • -15
    • +29
    /firmware/App/Controllers/PresOccl.c
    • -8
    • +31
    /firmware/App/Modes/ModeTreatment.c
DEN-11250 Installed case MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE per peer review comments

Updates and fixes per code review.

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

Merged DEN-11750 and resolved the conflicts

    • -34
    • +67
    /firmware/App/Controllers/PresOccl.c
DEN-11750 updated the software configurations

    • -44
    • +64
    /firmware/App/Controllers/PresOccl.c
    • -34
    • +85
    /firmware/App/Controllers/Temperatures.c
    • -0
    • +2
    /firmware/App/Controllers/Temperatures.h
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

DEN-11250 Fixed merge conflicts

    • -30
    • +12
    /firmware/App/Controllers/PresOccl.c
    • -97
    • +88
    /firmware/App/Controllers/SyringePump.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.h
  1. … 45 more files in changeset.
DEN-11250 Fixed merge conflicts

    • -23
    • +7
    /firmware/App/Controllers/PresOccl.c
    • -183
    • +23
    /firmware/App/Services/SystemComm.c
DEN-11250 Init ovData field to 40.0 mL/hour

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-11250 Updated per peer review comments

    • -108
    • +37
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.h
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

Commented out the alarms temporarily

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

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop