dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DEN-14589-DIAL-221-DIAL-224' into staging

Merge branch 'staging' into DEN-14589-DIAL-221-DIAL-224

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Fixed. Thanks!

Fixed. Thanks!

DEN-14589: code review comments

Ok, not sure how this got into staging already. Will have to add it back later. RESOLVED in CODE WALKTHROUGH.

Ok, not sure how this got into staging already. Will have to add it back later.
RESOLVED in CODE WALKTHROUGH.

It does not look aligned with firmware. firmware has: fill, inlet, reserved, ... you now have fill, reserved, drain, ...

It does not look aligned with firmware.
firmware has: fill, inlet, reserved, ...
you now have fill, reserved, drain, ...

The reserved space belongs to the former reservoir drain valve that was broken into VRD1 and VRD2.

The reserved space belongs to the former reservoir drain valve that was broken into VRD1 and VRD2.

This is currently in sync with the VALVES_T struct in the DG firmware. /// Enumeration of valves. typedef enum Valves VRF = 0, ///< Valve Reservoir Fill VRI, ///< Valve Reservoir Inlet RSRVD_SPAC...

This is currently in sync with the VALVES_T struct in the DG firmware.

/// Enumeration of valves.
typedef enum Valves

VRF = 0, ///< Valve Reservoir Fill
VRI, ///< Valve Reservoir Inlet
RSRVD_SPACE, ///< This space has been reserved
VRO, ///< Valve Reservoir Outlet
VPO, ///< Valve Pressure Outlet
VBF, ///< Valve Bypass Filter
VRC, ///< Valve Recirculate
VDR, ///< Valve Drain
VPI, ///< Valve Pressure Inlet
VSP, ///< Valve Sampling Port
VRD1, ///< Valve Reservoir 1 Drain
VRD2, ///< Valve Reservoir 2 Drain
VPD, ///< Valve Production Drain
NUM_OF_VALVES ///< Number of valves
VALVES_T;


Dara Navaei may be able to clarify as to why

They are currently out of sync with latest staging builds. Kendrick is currently failing his testing using staging builds if he uses enum 18 to get the HD_EVENT_SUB_STATE_CHANGE that was done in ht...

They are currently out of sync with latest staging builds. Kendrick is currently failing his testing using staging builds if he uses enum 18 to get the HD_EVENT_SUB_STATE_CHANGE that was done in http://devapps.diality.us:8060/cru/HD-DEN-14328-1#details

How do you wish to resolve this?

What happened to reservoir inlet valve?

What happened to reservoir inlet valve?

I had added button and safety line in another branch. Why removing?

I had added button and safety line in another branch. Why removing?

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

Merge branch 'DEN-14415-dialin-hd-events-returns-empty' into staging

DEN-14604 updated the scripts to include the Nelson support modes

DEN-14549: Added preload state to syringe pump enum.

DIALIN-DEN-14415_Dialin HD Events Returns Empty
DIALIN-DEN-14415_Dialin HD Events Returns Empty
Bamboo Commit: generated the code change report

Merge branch 'DEN-14415-dialin-hd-events-returns-empty' into develop

Merge branch 'DEN-14589-DIAL-221-DIAL-224' into develop

DEN-14415: DEN-14328: Updated CAN message handler to now have greater than 1 callback function per registered channel_id, msg_id pair.

Merge branch 'staging' into DEN-14589-DIAL-221-DIAL-224

DEN-14637: updated syringe pump operation documentation to consider treatment parameters before usage.

DEN-14589: Fixed air trap override to no longer use a float for the detection parameter.

DEN-14589: Fixed hd events to be in sync with FW