hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11098 Converted from seconds to milliseconds fix

Fixed merge conflict

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

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

Enabled the skip reservoirs alarm

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

DEN-11114: Fixed mid-treatment changes not immediately sending new ranges to UI problem.

DEN-11098 Corrected state transition and changed blood pump speed from 400 to 300 per system specification

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

DEN-11114: ifdef'd dead code in alarm lamp driver. Clear POR bit after logging reset in POST.

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

Merge branch 'DEN-10602_UI_DEV_Add_PatientID_PreTreatment' into develop

    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
DEN-11543: Unable proceed to the Confirm Treatment when "08-3251-9" Acid Concentrate is selected

The HD FW updated to accept up to 4 acid concentration type index.

Below is the UI DataList.conf for acid concentrate.

[Acid Concentrate]

Fres. Naturalyte

08-1251-1

08-2251-0

08-3251-9

    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
DEN-11098 Incorporated peer review comments

Yes, we could use a single variable as the start time in all the pre-treatment states

Yes, we could use a single variable as the start time in all the pre-treatment states

Replaced "loadcellSteadyVolumeStartTime" with "steadyVolumeSamplingStartTime"

Replaced "loadcellSteadyVolumeStartTime" with "steadyVolumeSamplingStartTime"

Done

Done

Done

Done

No, loadcellSteadyVolumeStartTime was last set when the primeDialysateDialyzerTimeLimit has just expired.

No, loadcellSteadyVolumeStartTime was last set when the primeDialysateDialyzerTimeLimit has just expired.

Done

Done

Done

Done

Done.

Done.

This start time probably needs a new name to better describe what it's doing.

This start time probably needs a new name to better describe what it's doing.

Recommend just setting up pumps and valves in this function rather than calling another function.

Recommend just setting up pumps and valves in this function rather than calling another function.

Add blank line between declarations and code.

Add blank line between declarations and code.

This start time was last set in setup function - quite some time ago. So this will have immediately timed out the first time we get here. I think this still works though.

This start time was last set in setup function - quite some time ago. So this will have immediately timed out the first time we get here. I think this still works though.

If skipping priming, would we even get here?

If skipping priming, would we even get here?

Please put declarations at top of scope (i.e. just below the '{' above).

Please put declarations at top of scope (i.e. just below the '{' above).

DEN-11098 Updated code per peer review comments

Fixed.

Fixed.