Clone
 

behrouz nematipour <bnematipour@diality.com> in leahi-sw.plugins.sim

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-783-stop-state' into staging

Merge branch 'staging' 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

LDT-793: Stop State - SW - 01 - R&I - 10: DVT - Simulator Implementation & Dev Test

- Modified the Alarm Status flags for Leahi.

Merge branch 'staging' into develop

Merge branch 'feature/LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD-2' into staging

Merge branch 'LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD' into staging

Merge branch 'feature/LDT-853-Main-Treatment-Screen-SW-Components-Screens' into staging

Merge branch 'staging' into develop

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

- Updated the Alarm Plugin for the Leahi.

- Fixed the conversion line for the TD_Battery, and TD-AirTrap plugins to avoid a crash in simulator.

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

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

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

Merge remote-tracking branch 'origin/LDT-261-MainTreatmentScreen-SW-DiagnosticsScreen' into develop

LDT-460 Treatment Parameters (Create Rx) - SW - 10: DVT - Simulator Implementation & Dev Test

- The Alarm is incomplete.

    • -0
    • +1080
    /Alarms/interface.ui
    • -0
    • +403
    /Alarms/loader.py
    • -0
    • +2340
    /GeneralResponseMessage/interface.ui
    • -0
    • +584
    /GeneralResponseMessage/loader.py
    • -0
    • +676
    /TreatmentParameters/interface.ui
    • -0
    • +189
    /TreatmentParameters/loader.py
Merge remote-tracking branch 'origin/master'

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

Merge branch staging into master

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

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Changed the plugin according to the dialin fix that caused SWVV main test to fail.

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

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