leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-1946: Updated DD Ultrafiltration and FP Permeate Tank Data Message IDs

Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Merged LDT-602 branch

LDT-606: Added comment to new line in build.sh to explain sed command

LDT-602: LDT-606: Updated function header comment for cmd_pressure_sensor_override to match function header

Merge branch 'LDT-1473-ultrafiltration-dd' into staging

Changed name of whl file in successful echo to match the actual new whl file name

Added shell command to handle slashes in the branch name and removed echos

Added echos for debugging

Readded renaming code

Moved whl renaming code to build scripts

Merge branch 'LDT-1473-ultrafiltration-dd' into develop

LDT-1473: changed temperature override to consider conductivity sensors with temperature.

    • -5
    • +15
    /leahi_dialin/dd/modules/temperature_sensors.py
Merge branch 'LDT-1473-ultrafiltration-dd' into develop

    • -5
    • +0
    /leahi_dialin/fp/modules/water_pumps.py
LDT-1473: Updated heaters broadcast to be in sync with dd heaters broadcast.

    • -14
    • +21
    /leahi_dialin/dd/modules/heaters.py
Merge branch 'feature/LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD-2' into staging

    • -18
    • +508
    /leahi_dialin/ui/dd_messaging.py
    • -94
    • +162
    /leahi_dialin/ui/td_messaging.py
LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation - Implement DD Valves Message

    • -0
    • +111
    /leahi_dialin/ui/dd_messaging.py
Removed extraneous functions

Updated naming of wheel file to occur in build.sh instead of setup.py and removed version.py

Merge remote-tracking branch 'origin/staging' into LDT-1872-leahi-dialin-add-version-variab

Merging staging

LDT-1872: DD/init: Added version and FPGA version initialization, FP submodules: moved enumerations to fp_defs

    • -0
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
    • -6
    • +0
    /leahi_dialin/fp/modules/flow_sensors.py
    • -16
    • +1
    /leahi_dialin/fp/modules/temperatures.py
    • -5
    • +0
    /leahi_dialin/fp/modules/water_pumps.py
Merge branch 'staging' into develop

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into staging

LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation

- Adjust TD and DD descriptions to match fn implementation

- Add MSG ID to all TD and DD implemented messages

    • -16
    • +18
    /leahi_dialin/ui/dd_messaging.py
    • -98
    • +121
    /leahi_dialin/ui/td_messaging.py
LDT-566: updated comments to indicate TODOs

LDT-566: code review comments.

LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation

- Add Air bubbles and Air Pump message

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

LDT-566: fixed typo

    • -3
    • +3
    /leahi_dialin/td/modules/blood_flow.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop