Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged staging and resolved the conflicts

Merge branch 'staging' into develop

removed duplicate msg id

Removed duplicate msg_id

LDT-1886 fixed the extra message defined

Merge branch 'staging' into LDT-1886-blood-set-auto-load-and-auto-eject-implement-ejector-sensor

Merge rest of staging

  1. … 3 more files in changeset.
LDT-2813: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 08: DEV - Dialin Implementation

- Updated treatment adjustments to use officially assigned message IDs.

LDT-1886 added ejectors optical sensor override command and broadcast

  1. … 2 more files in changeset.
Merge branch 'feature/LDT-2957-heparin' into staging

  1. … 1 more file in changeset.
LDT-2945: Rinseback - SW - 01 - R&I - 08: DEV - Dialin Implementation

- Updated msg_ids.py to add messages IDs: MSG_ID_TD_RINSEBACK_PROGRESS, MSG_ID_UI_RINSEBACK_CMD_REQUEST, MSG_ID_TD_RINSEBACK_CMD_RESPONSE

- Updated td_messaging.py to add sending of MSG_ID_TD_RINSEBACK_PROGRESS message.

  1. … 1 more file in changeset.
Merge branch 'LDT-618-DD-Add-ability-to-override-individual-treatment-parameters' into develop

LDT-3008 End of Treatment - SW - 01 - R&I - 08: DEV - Dialin Implementation

add messaging

  1. … 1 more file in changeset.
LDT-2833 Service - SW - 01 - Institutional - R&I - 08: DEV - Dialin Implementation

add message IDs

LDT-2965 Heparin - SW - 01 - R&I - 08: DEV - Dialin Implementation

add message id

LDT-618-DD-Add-ability-to-override-individual-treatment-parameters

LDT-618-DD-Add-ability-to-override-individual-treatment-parameters

  1. … 1 more file in changeset.
LDT-618-DD-Add-ability-to-override-individual-treatment-parameters

  1. … 3 more files in changeset.
fix for duplicate

LDT-598: - Copied and merged all constants file into one in common (For future ease of removal) - Created a generic broadcast override template - Created enum for RO Rejection Ratio - Created handler for RO Rejection Ratio - Created overrides for RO Rejection Ration - Added MSG_IDs related to RO Rejection Ratio - Added missing Msg_id for dd voltages handler

  1. … 6 more files in changeset.
LDT-598: - Copied and merged all constants file into one in common (For future ease of removal) - Created a generic broadcast override template - Created enum for RO Rejection Ratio - Created handler for RO Rejection Ratio - Created overrides for RO Rejection Ration - Added MSG_IDs related to RO Rejection Ratio - Added missing Msg_id for dd voltages handler

  1. … 6 more files in changeset.
LDT-2965 Heparin - SW - 01 - R&I - 08: DEV - Dialin Implementation

add heparin messages

  1. … 1 more file in changeset.
LDT-2833 Service - SW - 01 - Institutional - R&I - 08: DEV - Dialin Implementation

remove heparin items

LDT-2833 Service - SW - 01 - Institutional - R&I - 08: DEV - Dialin Implementation

upload dialin messagfes

  1. … 1 more file in changeset.
LDT-2004 dialin update

  1. … 1 more file in changeset.
LDT-2004: dry bicart dialyn implementation

  1. … 2 more files in changeset.
LDT-2813: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 08: DEV - Dialin Implementation

- Updated MsgIDs for set point change request and response messages.

  1. … 1 more file in changeset.
LDT-2004: dry bicart dialin implementation, correcting message ID for bicart data

LDT-2004: dry bicart dialin implementation fixed bug on balancing chamber message parsing typo

  1. … 2 more files in changeset.
LDT-2813: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 08: DEV - Dialin Implementation

- Updated to add support for MSG_ID_UI_TREATMENT_SET_POINTS_CHANGE_REQUEST, MSG_ID_TD_TREATMENT_SET_POINTS_CHANGE_RESPONSE, MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST, MSG_ID_TD_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_RESPONSE, MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_REQUEST, MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_RESPONSE, MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_REQUEST, MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_RESPONSE

  1. … 1 more file in changeset.