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.
Oh, ok, I thought 'i' only covers 8 bit not 32

Oh, ok, I thought 'i' only covers 8 bit not 32

Integer 'i' is 4 bytes. Is that what you mean?

Integer 'i' is 4 bytes. Is that what you mean?

Aren't these fields are for 4 byte range? The integer is just 1 byte

Aren't these fields are for 4 byte range? The integer is just 1 byte

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.
LEAHI-DIALIN-LDT-1886_Blood Set Auto-Load and Auto-Eject - TD
LEAHI-DIALIN-LDT-1886_Blood Set Auto-Load and Auto-Eject - TD
LEAHI-DIALIN-LDT-2937_Rinseback - SW - 01 - R&I
LEAHI-DIALIN-LDT-2937_Rinseback - SW - 01 - R&I
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