Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-3735-non-volatile-memory' of bitbucket.org:diality-cloud/dd-firmware into LDT-5157-conductivity-sensor-calibration

LDT-3735: Addressed review comments

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

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

LDT-4733: fixed warning of implicit call

Merge branch 'staging' into LDT-4733-request-add-variables

LDT-3735: Pulled staging

  1. … 1 more file in changeset.
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

LDT-3902: Fixed mixing control warnings

  1. … 1 more file in changeset.
LDT-3735: Addressed review comments

LDT-4733: code review comments

LDT-4733: code review comments

LDT-4734: code review comments

Merge branch 'staging' into LDT-4733-request-add-variables

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

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

Merge fixes

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

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

LDT-4734: code review comments

LDT-3735: Updated receive logic of cal records for indexed items

Revert "LDT-4734: updates conductivity resistance messages."

This reverts commit 14277e7c55fbb8407612572aca191ffae0835796.

LDT-4734: updates on spacing

resolved conflicts and mismatches

LDT-4734: updates conductivity resistance messages.

LDT-4011 code review comments

LDT-4734: updates to conductivity message to show resistances reflective to subsystem

Merge conflicts with staging resolved and comments

    • -12
    • +41
    ./Controllers/BalancingChamber.c
LDT-4011 addressed code review comments and merged staging into branch

    • -14
    • +38
    ./Controllers/BalancingChamber.c