Clone
 

sean nash <snash@diality.com> in leahi-fwcommon

Merged LDT-2199 to staging.

LDT-2199: Fixed merge issue.

Merged staging to LDT-2199.

Merge branch 'LDT-2199-beta-1.0-fw-integration---td-im' into develop

LDT-2198: Updated FPGA driver for DD.

LDT-2198: Restored deferred includes in CommBuffers.h to avoid compiler error.

LDT-2198: minor formatting fixes.

Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/leahi-fwcommon into LDT-2198-beta-1.0-fw-integration---dd-im

LDT_2198: Removed references to _RO_ f/w builds.

  1. … 6 more files in changeset.
Merge branch 'LDT-2198-beta-1.0-fw-integration---dd-im' of bitbucket.org:diality-cloud/leahi-fwcommon into LDT-2198-beta-1.0-fw-integration---dd-im

LDT-2198: Fixed a comment.

Merged LDT-736 to staging.

Merged staging to LDT-736.

Merged LDT-736 to develop.

LDT-736: Fixed incoming channel assignment to received message record.

Merged LDT-736 to develop.

Rolled back incorrect changes to AlarmMgmt unit.

LDT-736: Added TD blood flow control.

LDT-736: Added blood flow control to PI controller service.

Merged staging to develop.

Merged LDT-469 to staging.

Merged Staging to LDT-469.

Merged staging to develop.

Synced develop branch with staging.

Merged LDT-94 to staging.

LDT-94: Fixed alarm issue.

Merged staging to LDT-94.

LDT-94: Updates.

Merged LEAH-60 to staging.

LEAH-60: Updates for treatment related interfacing between TD and UI/DD.