leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-3160-beta19-dialin-test-configs-update' into develop

Updated test configs to match FW

    • -5
    • +6
    /leahi_dialin/common/test_config_defs.py
Removed error message

updated test config names

    • -2
    • +2
    /leahi_dialin/common/test_config_defs.py
Renamed test config

    • -1
    • +1
    /leahi_dialin/common/test_config_defs.py
-Added testconfig placeholders

    • -2
    • +8
    /leahi_dialin/common/test_config_defs.py
spacing fix

    • -1
    • +1
    /leahi_dialin/td/modules/blood_flow.py
bug fix

    • -1
    • +1
    /leahi_dialin/td/modules/blood_flow.py
Merge branch 'staging' into LDT-3160-beta19-dialin-test-configs-update

Merge branch 'LDT-2998-update-dialin-to-support-any-b1' into develop

    • -19
    • +15
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -13
    • +13
    /leahi_dialin/dd/modules/valves.py
    • -1
    • +1
    /leahi_dialin/fp/filtration_purification.py
    • -7
    • +2
    /leahi_dialin/fp/modules/temperatures.py
fixed variable names for level sensor override

Updated Test Config to swith to beta 1 HW

    • -6
    • +6
    /leahi_dialin/common/test_config_defs.py
Added module names to test configs

    • -4
    • +4
    /leahi_dialin/common/test_config_defs.py
Changed test config order

    • -2
    • +2
    /leahi_dialin/common/test_config_defs.py
-Fixed valve broadcast update - Fixed Beta 1.0 enums

Renamed enum

- Removed HW flag from broadcast as FW doesn't change broadcast content based on HW flag

    • -20
    • +15
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -4
    • +3
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'staging' into LDT-2998-update-dialin-to-support-any-b1

    • -366
    • +655
    /leahi_dialin/common/dd_defs.py
    • -132
    • +105
    /leahi_dialin/dd/modules/valves.py
- Added D85 Valve - Removed error message during init as it's not an error

Merge branch 'LDT-3214-override-refactor' into staging

    • -2
    • +1
    /leahi_dialin/common/test_config_defs.py
    • -60
    • +60
    /leahi_dialin/dd/dialysate_delivery.py
    • -31
    • +157
    /leahi_dialin/dd/modules/alarms.py
    • -175
    • +136
    /leahi_dialin/dd/modules/blood_leak.py
    • -146
    • +72
    /leahi_dialin/dd/modules/concentrate_pump.py
    • -104
    • +48
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -136
    • +72
    /leahi_dialin/dd/modules/dialysate_pump.py
    • -149
    • +66
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -91
    • +63
    /leahi_dialin/dd/modules/heaters.py
    • -54
    • +50
    /leahi_dialin/dd/modules/levels.py
    • -110
    • +59
    /leahi_dialin/dd/modules/pressure_sensors.py
  1. … 32 more files in changeset.
Merge branch 'LDT-3214-override-refactor' into develop

    • -60
    • +60
    /leahi_dialin/dd/dialysate_delivery.py
    • -31
    • +157
    /leahi_dialin/dd/modules/alarms.py
    • -175
    • +136
    /leahi_dialin/dd/modules/blood_leak.py
    • -146
    • +72
    /leahi_dialin/dd/modules/concentrate_pump.py
    • -78
    • +42
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -136
    • +72
    /leahi_dialin/dd/modules/dialysate_pump.py
    • -127
    • +64
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -91
    • +63
    /leahi_dialin/dd/modules/heaters.py
    • -24
    • +21
    /leahi_dialin/dd/modules/levels.py
    • -65
    • +68
    /leahi_dialin/dd/modules/pressure_sensors.py
    • -113
    • +69
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -95
    • +68
    /leahi_dialin/dd/modules/valves.py
    • -73
    • +39
    /leahi_dialin/dd/modules/voltages.py
  1. … 32 more files in changeset.
Merge branch 'LDT-3159-getter_for_fp_defeatured' into develop

    • -14
    • +61
    /leahi_dialin/fp/filtration_purification.py
Merge branch 'LDT-3159-getter_for_fp_defeatured' into staging

    • -14
    • +61
    /leahi_dialin/fp/filtration_purification.py
Merge branch 'LDT-2980' into staging

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'LDT-2980' into develop

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'LDT-611-fp-add-ability-to-override-tempe' into staging

    • -209
    • +440
    /leahi_dialin/common/fp_defs.py
    • -8
    • +8
    /leahi_dialin/common/test_config_defs.py
    • -50
    • +50
    /leahi_dialin/fp/modules/temperatures.py
    • -24
    • +24
    /leahi_dialin/td/modules/pressure_sensors.py
Updated override range for flow sensors

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Variable name fix

Merge branch 'LDT-611-fp-add-ability-to-override-tempe' into develop

Updated aenum version to avoid issues with unique decorator missing