firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts.

Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

DEN-9906: Fixed bug DEN-9905. Fixed state machine for post treatment.

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

Fixed merge conflicts.

Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

DEN-9906: Fixed target rinseback volume published after rinseback stopped prematurely. Allow alarm response resume if in pause state of Tx End sub-mode.

DEN-9906: Added rinse flag to drain commands

DEN-9906: Fixed poor UF control start.

DEN-9906: Fixed rinseback t/o countdown ref.

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

DEN-9906: DG Defs merge.

Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

    • -1
    • +36
    ./App/Services/SystemCommMessages.c
DEN-9906: Send new general event msg for HD start, all op mode changes. Fixed rinseback countdown timer issue DEN-10154.

    • -1
    • +36
    ./App/Services/SystemCommMessages.c
DEN-9906: Drain reservoir first during post-treatment

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

Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

Merge branch 'DEN-7802-dg_dev-dialysate-generation' into develop

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

Merge branch 'DEN-7802-dg_dev-dialysate-generation' into staging

DEN-9906: Prevent transition from rinseback to recirc if rinseback not completed. Max additional rinseback volume set to 300 mL.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-7802: Added check for processor clock speed against FPGA clock speed

Removed dialysate temp check for treatment end sub-mode.

Removed dialysate temp check for treatment end sub-mode.

DEN-7802: Removed dialysate temp check for treatment end sub-mode

I think we do want to check dialysate temperature during treatment, but maybe not in every sub-mode. For example, I think in treatment end sub-mode we have the dialyzer bypassed (no longer performi...

I think we do want to check dialysate temperature during treatment, but maybe not in every sub-mode. For example, I think in treatment end sub-mode we have the dialyzer bypassed (no longer performing dialysis) so there is no need to worry about the dialysate temp anymore. That is the only exception I can think of at the moment.

DEN-9906: Delayed power on AC check to allow voltage monitor time to see 24V. Fix FPGA voltage ranges.

DEN-9906: Added tentative blood flow estimation logic for testing. Added HD power-off function. Power off HD if no AC power on startup. Added t/o to rinseback stop state. Fixed valve commands in post-treatment mode.