Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-3479-remove_d98_cond' into develop

    • -19
    • +14
    ./modules/conductivity_sensors.py
Removed D98_COND

    • -19
    • +14
    ./modules/conductivity_sensors.py
  1. … 2 more files in changeset.
Merge branch 'staging' into LDT-3287-dialin-ability-to-pull-b1.9-iof

  1. … 1 more file in changeset.
Merge branch 'LDT-3287-dialin-ability-to-pull-b1.9-iof' into develop

  1. … 3 more files in changeset.
LDT-3287: updated MSG_IDs for filtered overrides. implemented filtered overrides for dd temperatures, fp temperatures, fp pressures, dd & fp conductivity

  1. … 4 more files in changeset.
Merge branch 'LDT-2004-dry-bicart---dd' into develop

  1. … 1 more file in changeset.
LDT-2004 -updates for using generic method overrides

WIP on develop

LDT-3372: implemented filtered conductivity overrides

  1. … 1 more file in changeset.
Merging branch staging into LDT-2004-dry-bicart---dd

  1. … 3 more files in changeset.
LDT-2004 implementing code review comments + test config for drybicart initial fill test in pre-gen

  1. … 1 more file in changeset.
Merge branch 'LDT-2994-iofp-valve-data-is-inaccurate' into staging

LDT-3173: msg ids for conductivity overrides

  1. … 2 more files in changeset.
Merge branch 'LDT-2787-fp_dd_proxy_commands' into develop

  1. … 1 more file in changeset.
testconfig fix

  1. … 2 more files in changeset.
LDT-3287: Reworked the initial message to be a login command instead of a blank ACK message

  1. … 2 more files in changeset.
WIP on develop

LDT-3287: added message sent for TD. trimmed documentation

  1. … 2 more files in changeset.
- Added TMP_Long filtered pressure variable

  1. … 1 more file in changeset.
LDT-3287: Added an initial message that is sent on class object construction for FP & DD to allow the subsystem to start publishing as the subsystem may assume no one is on the CANbus when dialin is a node.

  1. … 1 more file in changeset.
Merge branch 'LDT-3222-command-to-override-all-BC' into develop

LDT-3222: Updated bit pacaking for cmd_bc_valves_override

- Removed ignore and _str_list from base class, added empty _str_list to all childs to not throw an error when from_str is called on them

  1. … 7 more files in changeset.
Merge branch 'LDT-3350-add_from_str' into develop

  1. … 1 more file in changeset.
Merge branch 'LDT-2994-iofp-valve-data-is-inaccurate' into develop

  1. … 1 more file in changeset.
Merge branch 'LDT-2787-fp_dd_proxy_commands' into develop

  1. … 2 more files in changeset.
- Matching alarm publish name with variable name

- Updated test config names - Removed invalid publish from gen_dialysate

  1. … 1 more file in changeset.
LDT-3222: Updated function cmd_bc_valves_override to add reset parameter

- fixed valve_state_enums to be updated - Fixed balancing chamber broadcast processing

  1. … 1 more file in changeset.
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into LDT-2004-dry-bicart---dd

    • -113
    • +55
    ./modules/balancing_chamber.py
  1. … 3 more files in changeset.
LDT-2004 dialyn updates for drybicart