hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14547-incorrect-dg-event

    • -7
    • +33
    /firmware/App/Modes/PreTreatmentRecirc.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts.

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -4
    • +13
    /firmware/App/Controllers/SyringePump.c
    • -2
    • +2
    /firmware/App/Modes/ConsumableSelfTest.c
    • -15
    • +15
    /firmware/App/Modes/ModePreTreat.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/SyringePump.c
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.h
    • -0
    • +16
    /firmware/App/Services/Reservoirs.c
DEN-14561 Updated for code review comments.

Merge branch 'staging' into DEN-14749-syringe-pump-plunger-remains-extended-during-pretreatment-causing-hd-software-fault

DEN-14749: Reset preload flag in standby mode instead of after retract/seek/prime operations. Increase alarm threshold for FMD vs. LC check in wet s.t. from 5% to 10%. Refactor alarm audio and 1 minute min tx time config flags. Removed test code in reservoir code.

    • -3
    • +12
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +1
    /firmware/App/Controllers/SyringePump.h
    • -15
    • +14
    /firmware/App/Modes/ModeTreatment.c
    • -31
    • +7
    /firmware/App/Services/Reservoirs.c
DEN-1561 Fix integrated volume calculation for reservoir transfers.

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

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

DEN-14604 added code to not trigger the AC power loss if the safefy shutdown is enabled

DEN-14589: fixed syringe pump events.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
Merge branch 'staging' into DEN-14604-dg_hd_dev-hd_dg_dvt-update-part-9

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/DGInterface.h
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
  1. … 32 more files in changeset.
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts. Re-applied recently rolled back pre-tx state changes.

    • -62
    • +38
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -2
    • +4
    /firmware/App/Controllers/DialInFlow.c
    • -42
    • +21
    /firmware/App/Controllers/PresOccl.c
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
    • -11
    • +8
    /firmware/App/Modes/ConsumableSelfTest.c
    • -27
    • +31
    /firmware/App/Modes/ModePreTreat.c
    • -45
    • +63
    /firmware/App/Modes/ModeStandby.c
    • -16
    • +55
    /firmware/App/Services/AlarmMgmt.c
DEN-14549: Fixed merge from staging merge conflicts.

    • -1
    • +13
    /firmware/App/Controllers/Buttons.c
    • -11
    • +50
    /firmware/App/Controllers/Valves.c
    • -2
    • +14
    /firmware/App/Drivers/SafetyShutdown.c
    • -2
    • +9
    /firmware/App/Modes/ConsumableSelfTest.c
    • -2
    • +15
    /firmware/App/Modes/ModePostTreat.c
    • -2
    • +8
    /firmware/App/Modes/ModeTreatmentParams.c
    • -2
    • +9
    /firmware/App/Modes/PreTreatmentRecirc.c
  1. … 3 more files in changeset.
DEN-14561 Comments

Answered comments from code review

DEN-14556: updated alarm pressure occlusion alarm to 3s. HD now sends events when occlusion baseline is set. Alarm id 142 and 277 now send baseline occlusion value and trigger value.

DEN-14561 - returned useLastTrimmerHeaterDC logic

checkpoint, correction.

DEN-14589: implemented event for syringe pump state changes.

    • -0
    • +6
    /firmware/App/Controllers/SyringePump.c
DEN-14561 - returned useLastTrimmerHeaterDC logic

Returned logic for trimmer heater

    • -16
    • +23
    /firmware/App/Modes/ModePreTreat.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14589-DIAL-211' into develop

DEN-14699: HD RTC control register 3 override message infrastructure

DEN-14651 - Trial simplification of complete state

corrected fillComplete timing, removed TrimmerHeater control change (toggled off/on again over 50ms)

    • -19
    • +11
    /firmware/App/Modes/ModePreTreat.c
DEN-14561 Reservoir switching corrected in all modes

An incorrect reservoir reference was shorting R2 one flush cycle.

DEN-14561 Wider wet selftest tolerance. Fix reservoir switch. Fix alarm value for venous pressure.