canbus

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14936-UI-BN-S93' into staging

  1. … 2 more files in changeset.
RESOLVED.

RESOLVED.

Thanks, Will update my comment.

Thanks,
Will update my comment.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

Your comment has ???. Trying to help.

Your comment has ???. Trying to help.

Fixed too.

Fixed too.

Great catch, Thank a lot Sean for catching that. It is fixed.

Great catch,
Thank a lot Sean for catching that.
It is fixed.

Not clear what you want me to do here?

Not clear what you want me to do here?

In post-treatment, there are a few states to work through to ensure reservoirs get drained: /* Post-Treatment drain reservoirs state machine. */ typedef enum Drain_States { DRAIN_DG_DEPRIME_STATE ...

In post-treatment, there are a few states to work through to ensure reservoirs get drained:

/* Post-Treatment drain reservoirs state machine. */
typedef enum Drain_States
{
DRAIN_DG_DEPRIME_STATE = 0, ///< Drain DG De-prime dialysate lines of excess fluid state.
DRAIN_RESERVOIR_SWITCH_STATE, ///< Switch reservoir state.
DRAIN_RESERVOIR_START_DRAIN_STATE, ///< Drain reservoir start drain state.
DRAIN_RESERVOIR_DRAIN_STATE, ///< Drain first reservoir state.
DRAIN_RESERVOIR_COMPLETE_STATE, ///< Drain complete state.
NUM_OF_DRAIN_STATES ///< Number of drain states.
} DRAIN_STATE_T;

Same ordering should apply here (even if order doesn't matter - prefer to match structure of message payload).

Same ordering should apply here (even if order doesn't matter - prefer to match structure of message payload).

I think the raw order should be cpi, cpo, cd1, cd2 (reverse of what's here). Same order issue with status below.

I think the raw order should be cpi, cpo, cd1, cd2 (reverse of what's here). Same order issue with status below.

DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 9 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 4 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 4 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 8 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

- Added the Dialysis subState to TreatmentStates, message 0x0F

  1. … 6 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

- MSG_ID 0x0B

- Added the keepAlive/UI-CheckIn to the list of AckRequired so if HD won't ack UI, the Alarm, "HD Communication Failure" will be displayed.

  1. … 5 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 19 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 14 more files in changeset.
UI-DEN-14936_UI BN S93
UI-DEN-14936_UI BN S93
UI-DEN-14936_UI BN S93
UI-DEN-14936_UI BN S93
UI-DEN-14866_UI BN S92
UI-DEN-14866_UI BN S92
DEN-13152 : Flow Rate Settings Display "--" or "0" When Treatment is Paused

- Messages 0x0500 and 0x0800 has been updated and the Prescribed Flow Rate is being used.

- The diagnostics screen updated.

- The treatment main screen updated.

- The treatment flow adjustment screen updated.

- the Flows on the commit has 10f39b63ce8a992280ab123f05a5eb44a27c121b has been separated which has to be reverted back since these two messages almost all the time have the same payloads.

  1. … 11 more files in changeset.