Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-4013-1: Resolve merge conflicts

LEAHI-TD-FIRMWARE-LDT-4029_Pre-Treatment - FW Implementation - 4/6:
LEAHI-TD-FIRMWARE-LDT-4029_Pre-Treatment - FW Implementation - 4/6:
Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

Fixes

Yes, Fixed

Yes, Fixed

Crucible fixes

For testing purpose, Since UI board had old build so it was throwing the alarms

For testing purpose, Since UI board had old build so it was throwing the alarms

I see in the commits that you commented this #define was that on purpose?

I see in the commits that you commented this #define was that on purpose?

Per our coding standards, it should be "0 == currentAirPumpRPM".

Per our coding standards, it should be "0 == currentAirPumpRPM".

LDT-4013-1: Address CR comments

Fixes

Merge branch 'staging' of bitbucket.org:diality-cloud/td-firmware into LDT-4875-td-h12-is-not-actuating-during

Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

Bamboo Commit: Updated TDCommon.h with build versions from Bamboo.

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

LDT-4248: Fixed merge conflicts.

Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

Fixed warning and resolved commnets

What is the 3rd modality?

What is the 3rd modality?

Return type should be an enum (TREATMENT_TYPE_T).

Return type should be an enum (TREATMENT_TYPE_T).

Return type should be an enum (FLUID_BOLUS_MEDIUM_T).

Return type should be an enum (FLUID_BOLUS_MEDIUM_T).

Move after Modes so they are alphabetized.

Move after Modes so they are alphabetized.

Merge branch 'develop' of bitbucket.org:diality-cloud/td-firmware into develop