leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into feature/LDT-3433-water-dialysate-and-blood-sample

Renamed Air Pump power to Duty Cycle

-Added 'nan' handling to td pressure broadcast handler - Fixed data assignment in same method

    • -16
    • +18
    /leahi_dialin/td/modules/pressure_sensors.py
Merge branch 'LDT-3515-fp_pres_override' into staging

Merge branch 'LDT-2749-Ability-to-enable-air-bubble-alarm-in-standby-mode' into staging

Merge branch 'staging' into LDT-2749-Ability-to-enable-air-bubble-alarm-in-standby-mode

Merge branch 'LDT-1840-add_tmp_filtered' into develop

    • -39
    • +24
    /leahi_dialin/td/modules/pressure_sensors.py
Merge branch 'LDT-2990-iofp-fw-and-fpga-version' into develop

    • -2
    • +3
    /leahi_dialin/fp/filtration_purification.py
LDT-2990: doucmentation.

    • -0
    • +1
    /leahi_dialin/fp/filtration_purification.py
LDT-2990: changed FP version response handler to look at DD version response message id

    • -2
    • +2
    /leahi_dialin/fp/filtration_purification.py
Merge branch 'LDT-3515-fp_pres_override' into develop

added index shift to the sensor index for override

Merge branch 'staging' into LDT-1840-add_tmp_filtered

Merge branch 'LDT-3344-beta2' into develop

removed TMP filtered pressure override

Updated accepted strings for TARGET_DUTY_CYCLE_PCT

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-2707-trends

Renamed pump attribute

    • -2
    • +2
    /leahi_dialin/fp/modules/boost_pump.py
- Updated test configs - Updated valves

    • -17
    • +17
    /leahi_dialin/common/test_config_defs.py
    • -15
    • +15
    /leahi_dialin/dd/modules/valves.py
Merge branch 'LDT-3479-remove_d98_cond' into develop

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
removed obsolate todo comment

removed -1 to adjust removal of D98_cond

LDT-3381: Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I - 08: DEV - Dialin Implementation

- Updated Blood Prime Progress to add timeout and countdown.

LDT-3441 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 08: DEV - Dialin Implementation

fix n ame of message id

LDT-3441 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 08: DEV - Dialin Implementation

add temporary message id for water sample request id

fixed index offset for temp filtered override

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'staging' into LDT-3479-remove_d98_cond

    • -0
    • +57
    /leahi_dialin/dd/modules/conductivity_sensors.py
Merge branch 'LDT-3479-remove_d98_cond' into develop

    • -19
    • +14
    /leahi_dialin/dd/modules/conductivity_sensors.py
Merge branch 'LDT-3215-h12_rpm' into staging

    • -7
    • +13
    /leahi_dialin/td/modules/air_pump.py
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop