leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into LDT-3287-dialin-ability-to-pull-b1.9-iof

    • -30
    • +19
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'LDT-3480' into staging

WIP on LDT-3287-dialin-ability-to-pull-b1.9-iof

LDT-3372: reverted temp handler to the original version.

    • -13
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'staging' into LDT-3287-dialin-ability-to-pull-b1.9-iof

    • -0
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
LDT-3372: updated msgid for teensy overrides to be seperated from the rest of the message list.

LDT-3373: updated msg id to be in sync of upcoming messages. fixed filtered pressure override to consider pressure sensor offset.

LDT-3287: updated MSG_IDs for filtered overrides. implemented filtered overrides for dd temperatures, fp temperatures, fp pressures, dd & fp conductivity

    • -4
    • +26
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -2
    • +57
    /leahi_dialin/fp/modules/temperatures.py
-Fixed the order to group the similar sensors together and reflect the changes in FW

    • -33
    • +20
    /leahi_dialin/fp/modules/temperatures.py
LDT-2004 -updates for using generic method overrides

    • -103
    • +56
    /leahi_dialin/dd/modules/drybicart.py
Merge branch 'staging' into LDT-3287-dialin-ability-to-pull-b1.9-iof

    • -3
    • +3
    /leahi_dialin/fp/filtration_purification.py
WIP on develop

LDT-3372: implemented filtered conductivity overrides

    • -0
    • +27
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -0
    • +28
    /leahi_dialin/fp/modules/conductivity_sensors.py
Merging branch staging into LDT-2004-dry-bicart---dd

    • -961
    • +793
    /leahi_dialin/common/dd_defs.py
    • -9
    • +12
    /leahi_dialin/common/test_config_defs.py
LDT-2004 implementing code review comments + test config for drybicart initial fill test in pre-gen

    • -1
    • +2
    /leahi_dialin/common/test_config_defs.py
Merge branch 'LDT-2994-iofp-valve-data-is-inaccurate' into staging

LDT-3173: msg ids for conductivity overrides

    • -0
    • +30
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -0
    • +31
    /leahi_dialin/fp/modules/conductivity_sensors.py
Merge branch 'staging' into LDT-2787-fp_dd_proxy_commands

    • -3
    • +2
    /leahi_dialin/fp/filtration_purification.py
testconfig fix

    • -8
    • +9
    /leahi_dialin/common/test_config_defs.py
    • -2
    • +2
    /leahi_dialin/fp/filtration_purification.py
Merge branch 'LDT-3350-add_from_str' into staging

    • -0
    • +2
    /leahi_dialin/common/test_config_defs.py
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into LDT-3222-command-to-override-all-BC

LDT-3287: Reworked the initial message to be a login command instead of a blank ACK message

    • -10
    • +3
    /leahi_dialin/dd/dialysate_delivery.py
    • -10
    • +3
    /leahi_dialin/fp/filtration_purification.py
    • -10
    • +3
    /leahi_dialin/td/treatment_delivery.py
test config fix

    • -1
    • +2
    /leahi_dialin/common/test_config_defs.py
WIP on develop

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

    • -1
    • +1
    /leahi_dialin/dd/dialysate_delivery.py
    • -2
    • +2
    /leahi_dialin/fp/filtration_purification.py
    • -0
    • +10
    /leahi_dialin/td/treatment_delivery.py
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.

    • -0
    • +10
    /leahi_dialin/dd/dialysate_delivery.py
    • -0
    • +10
    /leahi_dialin/fp/filtration_purification.py
Merge branch 'feature/LDT-3323-enhancements-rinseback-bloodflow' into staging

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

    • -0
    • +1
    /leahi_dialin/common/alarm_priorities.py
    • -0
    • +2
    /leahi_dialin/common/test_config_defs.py
    • -0
    • +1
    /leahi_dialin/dd/modules/blood_leak.py
LDT-3331: Misc SW Enhancements - SW - 01 - BloodPrime-Rinseback - R&I - 08: DEV - Dialin Implementation

- Updated to remove duplicate enums and unify all hex prefixes to '0x'.

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-3323-enhancements-rinseback-bloodflow

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-3323-enhancements-rinseback-bloodflow

    • -8
    • +105
    /leahi_dialin/ui/td_messaging.py
Merge branch 'feature/LDT-3174-pre-treatment-foundations' into staging