common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into develop

DEN-11542 updated the DG fans RPM alarm out of range

DEN-11114, DIAL-141 updated the alarms fan RPM offset message ID

DEN-11114, DIAL-141 added a DG fans alarm start time offset

DEN-1114, DIAL-141 added a message ID to override the fans alarms start time

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

DEN-11114 updated the fans alarms

DEN-11098 Updated HD_Pre_Treatment_Prime_States enum type

After talking with Hung, This change is currently on his feature branch and should not be changed in here, later which codes are merged it will be resolved in case of conflict.

After talking with Hung,
This change is currently on his feature branch and should not be changed in here,
later which codes are merged it will be resolved in case of conflict.

Late breaking news, the HD_PRE_TREATMENT_PRIME_STATE_T has changed. The correct order of the items in enum type of the pre-treatment states are listed below: HD_PRIME_START_STATE = 0, ///< Prime s...

Late breaking news, the HD_PRE_TREATMENT_PRIME_STATE_T has changed.
The correct order of the items in enum type of the pre-treatment states are listed below:

HD_PRIME_START_STATE = 0, ///< Prime start state
HD_PRIME_WAIT_FOR_USER_START_STATE, ///< Wait for user to start prime state
HD_PRIME_SALINE_SETUP_STATE, ///< Saline setup state
HD_PRIME_SALINE_PURGE_AIR_STATE, ///< Saline purge air state
HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE, ///< Circulate blood circuit state
HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE, ///< Wait for reservoir 1 fill complete
HD_PRIME_DIALYSATE_DIALYZER_STATE, ///< Dialysate dialyzer fluid path state
HD_PRIME_SALINE_DIALYZER_SETUP_STATE, ///< Saline dialyzer setup state
HD_PRIME_SALINE_DIALYZER_STATE, ///< Saline dialyzer fluid path state
HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE, ///< Wait for reservoir 2 fill complete
HD_PRIME_DIALYSATE_BYPASS_STATE, ///< Dialysate bypass fluid path state
HD_PRIME_WET_SELF_TESTS_STATE, ///< Perform wet self-tests after priming complete
HD_PRIME_PAUSE, ///< Prime pause state, waits to be resumed
HD_PRIME_COMPLETE, ///< Prime complete state
NUM_OF_HD_PRIME_STATES ///< Number of prime sub-mode states

Merge branch 'staging' into develop

DEN-11114: Fixed alarm typo.

DEN-11114: Changed WiFi POST failure to not be a fault - should be recoverable.

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).

Fixed.

Fixed.

Replaced by primeDialysateDialyzerTimeLimit because this variable is dynamic and based on the type of dialyzer.

Replaced by primeDialysateDialyzerTimeLimit because this variable is dynamic and based on the type of dialyzer.

Add blank line between these two lines.

Add blank line between these two lines.