Clone
 

tiffany mejia <tmejia@diality.com> in leahi-dialin

LDT-934: Main Treatment Screen - SW - Diagnostics Screen-FP - 08: DEV - Dialin Implementation

- Add The following FP message implementation

Versions

Pressure

Flow

Conductivity

Temperature

Valves

ROPump

BoostPump

Level

    • -0
    • +356
    /leahi_dialin/ui/fp_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
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-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation

- Add Air bubbles and Air Pump message

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

- Add Blood leak message as 0x60

- Add The following DD messages: levels, pressure, temperature, heaters, concentrate pumps, dialysate pumps, blood leak

    • -2
    • +379
    /leahi_dialin/ui/dd_messaging.py
LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation

Add MSG ID to all DD messages

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

- Add DD level sensor message

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

Change Treatment Set point Data in UI/td_messaging to match dialin enum

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

Add change to TD messaging naming to match staging dialin enums

Revert "Merge remote-tracking branch 'origin/staging' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast"

This reverts commit 50cfafb2d49deeb742310635413c14604e1dc0ad, reversing

changes made to 1de45e3e0c294d35982514d1c52e2bad87d0a4b2.

    • -5
    • +1
    /leahi_dialin/dd/dialysate_delivery.py
    • -66
    • +44
    /leahi_dialin/dd/modules/concentrate_pump.py
    • -30
    • +0
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -132
    • +0
    /leahi_dialin/dd/modules/pre_gen_dialysate.py
    • -12
    • +7
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -26
    • +2
    /leahi_dialin/dd/proxies/td_proxy.py
    • -48
    • +4
    /leahi_dialin/fp/filtration_purification.py
    • -0
    • +256
    /leahi_dialin/fp/modules/boost_pump.py
    • -1
    • +1
    /leahi_dialin/fp/modules/flow_sensors.py
  1. … 25 more files in changeset.
Merge remote-tracking branch 'origin/staging' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Fix common .py pressure ranges format

- Adjust TD messaging doxygen comments and correct payload for ejector, switches, and battery to unsigned int

    • -32
    • +31
    /leahi_dialin/ui/td_messaging.py
LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

removing TD bubbles and air pump for future implementation

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Adjust pressure limits in common.py

- Adjust GenDialysate payload naming

- Change TD blood pump to blood flow

    • -27
    • +27
    /leahi_dialin/ui/dd_messaging.py
    • -10
    • +10
    /leahi_dialin/ui/td_messaging.py
LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Add TX State message

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Adjust DD/TD Payload naming to have FW valve naming scheme

    • -27
    • +27
    /leahi_dialin/ui/dd_messaging.py
    • -88
    • +109
    /leahi_dialin/ui/td_messaging.py
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add enum for TX set point data

- fix payload issues with DD conductivity and Gen dialysate

- fix payload issues with TD messaging

    • -0
    • +29
    /leahi_dialin/ui/common.py
    • -11
    • +11
    /leahi_dialin/ui/td_messaging.py
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add Main treatment TD messages: Pressure and occlusion, saline, set point data, treatment time, and UF

- Add Main treatment DD messages: Conductivity, Generate dialysate

    • -3
    • +215
    /leahi_dialin/ui/td_messaging.py
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Add DD messgaing for versions and serial number

- add Missing MSG ID enums

- address CR comments in TD messaging

    • -0
    • +85
    /leahi_dialin/ui/dd_messaging.py
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Add dialin enums to all hardcoded message IDs

- Fix td_serial name

- remove all hardcoded parameters

    • -17
    • +15
    /leahi_dialin/ui/td_messaging.py
Merge branch 'staging' into LDT-261-MainTreatmentScreen-SW-DiagnosticsScreen

Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Make adjustments for TD blood pump message and payload conversion

Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Adjust ejector message to match leahi MSG list updates

- Adjust switches message to match leahi MSG list updates

    • -18
    • +19
    /leahi_dialin/ui/td_messaging.py
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Adjust td version and serial message

    • -10
    • +38
    /leahi_dialin/ui/td_messaging.py
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implement

- Add TD valve messaging to ui messaging

Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Added all messaging needed for diagnostics except TD versions

    • -61
    • +105
    /leahi_dialin/ui/td_messaging.py
Base TD messaging for diagnostics screen

    • -0
    • +176
    /leahi_dialin/ui/td_messaging.py
Base TD messaging for diagnostics screen

Merge remote-tracking branch 'origin/LEAH-261-fw-ro-flow-sensor-driver' into LDT-261-MainTreatmentScreen-SW-DiagnosticsScreen