leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-3194-isolated-uf-adjustment' into staging

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-3194-isolated-uf-adjustment

    • -30
    • +56
    /leahi_dialin/ui/td_messaging.py
Merge branch 'feature/LDT-3106-blood-prime' into staging

removed duplicate enum

Merge branch 'LDT-2787-fp_dd_proxy_commands' into develop

Fixed msg id for override pwm

    • -1
    • +1
    /leahi_dialin/fp/modules/boost_pump.py
Merge branch 'LDT-3350-add_from_str' into develop

- updated if to fix build

Merge branch 'LDT-2787-fp_dd_proxy_commands' into develop

- Updated test configs

    • -7
    • +6
    /leahi_dialin/common/test_config_defs.py
Merge branch 'LDT-3350-add_from_str' into develop

Merge branch 'LDT-2994-iofp-valve-data-is-inaccurate' into develop

Merge branch 'LDT-2787-fp_dd_proxy_commands' into develop

    • -2
    • +28
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -4
    • +0
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -1
    • +2
    /leahi_dialin/fp/filtration_purification.py
- Added fp go to commands

    • -7
    • +27
    /leahi_dialin/fp/proxies/dd_proxy.py
- Matching alarm publish name with variable name

- Updated test config names - Removed invalid publish from gen_dialysate

    • -2
    • +2
    /leahi_dialin/common/test_config_defs.py
    • -4
    • +0
    /leahi_dialin/dd/modules/gen_dialysate.py
LDT-2004 dry bicart test config updates

    • -2
    • +1
    /leahi_dialin/common/test_config_defs.py
removed

LDT-3222: Updated function cmd_bc_valves_override to add reset parameter

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

Merge branch Staging with LDT-2004-dry-bicart---dd

Merge branch Staging with LDT-2004-dry-bicart---dd

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into LDT-2004-dry-bicart---dd

    • -13
    • +18
    /leahi_dialin/common/test_config_defs.py
    • -61
    • +61
    /leahi_dialin/dd/dialysate_delivery.py
    • -113
    • +55
    /leahi_dialin/dd/modules/balancing_chamber.py
    • -167
    • +124
    /leahi_dialin/dd/modules/valves.py
LDT-3202: Isolated UF - SW - 01 - R&I - 08: DEV - Dialin Implementation

- Updated Isolated UF to align field naming with Ultrafiltration.

    • -17
    • +17
    /leahi_dialin/ui/td_messaging.py
LDT-2004 dialyn updates for drybicart

    • -2
    • +37
    /leahi_dialin/dd/modules/drybicart.py
Merge branch 'staging' into LDT-2787-fp_dd_proxy_commands

    • -109
    • +113
    /leahi_dialin/fp/filtration_purification.py
- added new option to from_str - Fixed dd valve ids - Added a new str to pregen option

fixed renaming

- fixed event, removed TPAR Op mode

removed from string conversion too