hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12441 Merge staging

    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
Merge branch 'staging' into DEN-12441-sw_dev_sprint_67_darren

DEN012441 Update Selftests for alarms with changed names.

DEN-12441 Code review comment updates 2.

DEN-12441 Code review comment updates.

    • -19
    • +18
    /firmware/App/Modes/TreatmentStop.c
DEN-12441 Remove place holder for saving Treatment Time to NVRAM. No longer part of this task set.

    • -17
    • +0
    /firmware/App/Modes/ModeTreatment.c
DEN-12441 Reset blood sitting timer when turning on blood circulation.

DEN-12441 Handle blood sitting timer when blood is not circulating. Update broadcast info.

    • -22
    • +45
    /firmware/App/Modes/TreatmentStop.c
DEN-12441 Added Recirc Dialysate Only and Blood Only sub states to Treatment End.

    • -27
    • +187
    /firmware/App/Modes/TreatmentStop.c
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/SyringePump.c
    • -1
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
DEN-11928 merged staging

    • -104
    • +77
    /firmware/App/Controllers/SyringePump.c
    • -9
    • +15
    /firmware/App/Modes/ConsumableSelfTest.c
    • -31
    • +32
    /firmware/App/Modes/ModePostTreat.c
DEN-12441 Added Alarm management for noBloodRecirc with init, set, call to check status.

DEN-12441 Added No Blood Recirculate flag to Alarms and messages.

DEN-12441 Added placeholder for Treatment Time NVRAM. Added Sean's changes to Alarms for No Recirculate Dialysate.

    • -0
    • +17
    /firmware/App/Modes/ModeTreatment.c
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/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.h
    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.h
  1. … 29 more files in changeset.
Merge branch 'DEN-12215-sw_dev_sprint_65_darren' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12215-sw_dev_sprint_65_darren

DEN-10974 Remove Door check in Post Treat confirm cartride removed state. Not required.

    • -18
    • +11
    /firmware/App/Modes/ModePostTreat.c
DEN-12215 addressed the code review comment

    • -3
    • +3
    /firmware/App/Modes/ConsumableSelfTest.c
DEN11250 Added code to allow resume after syringe pump occlusion has been removed - moved here from commit 1bb17047684 in DEN-11250 branch

DEN-11250 Fixed syringe pump occlusion alarm not triggered - moved commit 269329748ff from DEN-11250 to here

    • -4
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-11928 Addressed peer review comments

DEN-11928 Fixed compile errors

DEN-11928 Merged commit 2df3175ad36 to DEN-11928 branch

staging branch merge to resolve compiler errors from common header files.

    • -2
    • +2
    /firmware/App/Modes/ConsumableSelfTest.c
DEN-10974 Fix Syringe Removed Alarm.

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-12121-sw_dev-sprint-65' into staging