leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

TEST: updates to basic test script.

Merge branch 'LEAH-142-dial-td-base-object' into develop

fixed air trap handler. moved constants file to be in sync with the rest of the subsystems.

    • -2
    • +12
    /leahi_dialin/td/modules/air_trap.py
    • -2
    • +2
    /leahi_dialin/td/modules/blood_flow.py
    • -0
    • +24
    /leahi_dialin/td/modules/constants.py
Merge branch 'LEAH-139-dial-dd-base-object' into develop

Updated folder naming. Fixed pathing. Fixed relative importing

DD class should now create.

    • -351
    • +0
    /leahi-dialin/dd/modules/concentrate_pump.py
    • -304
    • +0
    /leahi-dialin/dd/modules/conductivity_sensors.py
    • -211
    • +0
    /leahi-dialin/dd/modules/heaters.py
    • -139
    • +0
    /leahi-dialin/dd/modules/levels.py
    • -415
    • +0
    /leahi-dialin/dd/modules/pressure_sensors.py
    • -267
    • +0
    /leahi-dialin/dd/modules/temperature_sensors.py
    • -416
    • +0
    /leahi-dialin/dd/modules/valves.py
    • -0
    • +0
    /leahi_dialin/dd/conductivity_sensors.py
    • -0
    • +254
    /leahi_dialin/dd/dialysate_delivery.py
  1. … 15 more files in changeset.
TEST: started update of basic Leahi test script.

Merge branch 'LEAH-142-dial-td-base-object' into LEAH-136-dial-ro-base-object

Merge branch 'LEAH-142-dial-td-base-object' into LEAH-139-dial-dd-base-object

Merge branch 'LEAH-142-dial-td-base-object' into develop

    • -0
    • +195
    /leahi_dialin/common/msg_ids.py
Fixed syntax naming for project name. Fixed instantiation errors for TD module. Fixed import pathing for TD modules.

    • -111
    • +0
    /leahi-dialin/common/alarm_defs.py
    • -60
    • +0
    /leahi-dialin/common/alarm_priorities.py
    • -136
    • +0
    /leahi-dialin/common/msg_defs.py
    • -40
    • +0
    /leahi-dialin/common/test_config_defs.py
    • -0
    • +0
    /leahi-dialin/dd/conductivity_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/dialysate_delivery.py
  1. … 97 more files in changeset.
Merge branch 'LEAH-136-dial-ro-base-object' into develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

Merge branch 'LEAH-142-dial-td-base-object' into develop

WIP on LEAH-136-dial-ro-base-object

RO override modules

    • -0
    • +263
    /leahi-dialin/ro/modules/boost_pump.py
    • -0
    • +130
    /leahi-dialin/ro/modules/levels.py
    • -0
    • +173
    /leahi-dialin/ro/modules/pressure_sensors.py
    • -0
    • +0
    /leahi-dialin/ro/modules/valves.py
Merge branch 'LEAH-142-dial-td-base-object' into LEAH-136-dial-ro-base-object

DD temp and valves. updated CAN channels

    • -0
    • +267
    /leahi-dialin/dd/modules/temperature_sensors.py
    • -96
    • +63
    /leahi-dialin/dd/modules/valves.py
Leahi CAN channels and TD changes for them

    • -1
    • +1
    /leahi-dialin/td/treatment_delivery.py
WIP on LEAH-139-dial-dd-base-object

    • -0
    • +351
    /leahi-dialin/dd/modules/concentrate_pump.py
    • -0
    • +304
    /leahi-dialin/dd/modules/conductivity_sensors.py
    • -0
    • +360
    /leahi-dialin/dd/modules/dialysate_pump.py
    • -0
    • +211
    /leahi-dialin/dd/modules/heaters.py
    • -0
    • +139
    /leahi-dialin/dd/modules/levels.py
    • -0
    • +415
    /leahi-dialin/dd/modules/pressure_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/modules/temperature_sensors.py
    • -0
    • +449
    /leahi-dialin/dd/modules/valves.py
addressing code review comments

renamed proxy directory

    • -0
    • +0
    /leahi-dialin/td/proxies/__init__.py
    • -0
    • +0
    /leahi-dialin/td/proxies/dd_proxy.py
    • -0
    • +0
    /leahi-dialin/td/proxies/ro_proxy.py
Added directories for dd modules

    • -0
    • +0
    /leahi-dialin/dd/conductivity_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/modules/__init__.py
    • -0
    • +0
    /leahi-dialin/dd/modules/conductivity_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/modules/pressure_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/modules/valves.py
    • -0
    • +0
    /leahi-dialin/dd/proxies/__init__.py
    • -0
    • +0
    /leahi-dialin/dd/proxies/td_proxy.py
Merge branch 'LEAH-142-dial-td-base-object' into LEAH-139-dial-dd-base-object

Created directories for proxies and modules. TD valves implemented

    • -170
    • +0
    /leahi-dialin/td/bubble_detector.py
    • -0
    • +0
    /leahi-dialin/td/modules/__init__.py
    • -0
    • +140
    /leahi-dialin/td/modules/air_pump.py
    • -0
    • +242
    /leahi-dialin/td/modules/air_trap.py
    • -0
    • +693
    /leahi-dialin/td/modules/alarms.py
    • -0
    • +390
    /leahi-dialin/td/modules/blood_flow.py
    • -0
    • +170
    /leahi-dialin/td/modules/bubble_detector.py
    • -0
    • +157
    /leahi-dialin/td/modules/buttons.py
  1. … 12 more files in changeset.
Updated TD_def naming to remove HD labeling. Updated alarm IDs from firmware staging

Update to MSG_id.py and code review comments

    • -43
    • +106
    /leahi-dialin/common/msg_ids.py
    • -14
    • +9
    /leahi-dialin/td/pressure_sensors.py
updated blood flow, switches, alarm, and air trap modules

    • -0
    • +206
    /leahi-dialin/td/air_trap.py
    • -453
    • +126
    /leahi-dialin/td/alarms.py
    • -0
    • +429
    /leahi-dialin/td/blood_flow.py
    • -2
    • +12
    /leahi-dialin/td/treatment_delivery.py
    • -0
    • +0
    /leahi-dialin/td/valves.py
    • -0
    • +194
    /leahi-dialin/td/voltages.py
WIP on LEAH-136-dial-ro-base-object

synced pressure sensor, air pump, and td modules to latest staging

    • -323
    • +58
    /leahi-dialin/common/alarm_defs.py
    • -0
    • +34
    /leahi-dialin/common/alarm_priorities.py
    • -0
    • +327
    /leahi-dialin/common/dd_defs.py
    • -126
    • +31
    /leahi-dialin/common/msg_defs.py
    • -490
    • +118
    /leahi-dialin/common/msg_ids.py
    • -0
    • +433
    /leahi-dialin/common/td_defs.py
    • -0
    • +0
    /leahi-dialin/dd/__init__.py
    • -0
    • +0
    /leahi-dialin/dd/conductivity_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/dialysate_delivery.py
    • -0
    • +0
    /leahi-dialin/dd/pressure_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/td_proxy.py
  1. … 13 more files in changeset.
Merge branch 'LEAH-136-dial-ro-base-object' into LEAH-142-dial-td-base-object

File Management

    • -251
    • +0
    /leahi-dialin/dg/accelerometer.py
    • -841
    • +0
    /leahi-dialin/dg/calibration_record.py
    • -228
    • +0
    /leahi-dialin/dg/chemical_disinfect.py
    • -88
    • +0
    /leahi-dialin/dg/chemical_disinfect_flush.py
    • -398
    • +0
    /leahi-dialin/dg/concentrate_pumps.py
    • -280
    • +0
    /leahi-dialin/dg/conductivity_sensors.py
    • -199
    • +0
    /leahi-dialin/dg/dg_test_configs.py
    • -276
    • +0
    /leahi-dialin/dg/dialysate_fill.py
    • -668
    • +0
    /leahi-dialin/dg/dialysate_generator.py
  1. … 75 more files in changeset.