Clone
 

behrouz nematipour <bnematipour@diality.com> in leahi-dialin

Merge branch 'feature/LDT-2686-patient-vitals-enhancement' into staging

Merge branch 'staging' into develop

Merge branch 'feature/LDT-1440-ultrafiltration' into staging

Merge branch 'feature/LDT-2264-patient-vitals' into staging

Merge branch 'feature/LDT-2264-patient-vitals' into staging

Merge branch 'feature/LDT-926-Main-Treatment-Screen-SW-01-Diagnostics-Screen-FP' into develop

Merge branch 'feature/LDT-926-Main-Treatment-Screen-SW-01-Diagnostics-Screen-FP' into staging

Merge branch 'staging' into develop

Merge branch 'feature/LDT-2071-solution-infusion' into staging

Merge branch 'feature/LDT-2071-solution-infusion' into staging

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
Merge branch 'LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into staging

Merge branch 'LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into staging

Merge branch 'feature/LDT-713-general-alarm-requirements-sw' into staging

Merge branch 'feature/LDT-713-general-alarm-requirements-sw' into develop

LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

Addressing code review comment(s):

- http://devapps.diality.us:8060/cru/LEAHI-APPLICATION-LDT-713-1#CFR-67867

    • -1
    • +1
    /leahi_dialin/ui/td_messaging_alarms.py
LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

- Added and updated the alarm messages for the Leahi.

    • -38
    • +41
    /leahi_dialin/ui/td_messaging_alarms.py
Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into staging

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

Merge branch 'LDT-261-MainTreatmentScreen-SW-DiagnosticsScreen' into develop

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

- Added a comment to trigger the not detected changes in the merge.

Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into develop

    • -7
    • +128
    /leahi_dialin/ui/td_messaging.py
Merge branch 'LDT-261-MainTreatmentScreen-SW-DiagnosticsScreen' into develop

    • -0
    • +283
    /leahi_dialin/ui/td_messaging.py
LDT-458 Treatment Parameters (Create Rx) - SW - 08: DEV - Dialin Implementation

- the alarm system is incomplete.

    • -6
    • +128
    /leahi_dialin/ui/td_messaging.py
    • -0
    • +97
    /leahi_dialin/ui/td_messaging_alarms.py
Merge remote-tracking branch 'origin/master'

Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop

    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into staging

    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
Merge branch staging into master

    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
test

    • -0
    • +255
    /leahi_dialin/fp/modules/boost_pump.py
    • -0
    • +230
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -0
    • +18
    /leahi_dialin/fp/modules/constants.py
    • -0
    • +175
    /leahi_dialin/fp/modules/flow_sensors.py
    • -0
    • +128
    /leahi_dialin/fp/modules/levels.py
    • -0
    • +220
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -0
    • +294
    /leahi_dialin/fp/modules/valves.py
    • -0
    • +248
    /leahi_dialin/fp/reverse_osmosis.py
    • -255
    • +0
    /leahi_dialin/ro/modules/boost_pump.py
    • -230
    • +0
    /leahi_dialin/ro/modules/conductivity_sensors.py
    • -18
    • +0
    /leahi_dialin/ro/modules/constants.py
  1. … 5 more files in changeset.
Revert "Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop"

This reverts commit 2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77, reversing

changes made to 9403e6711adf53da699ff25b4b7342286bf49b92.