leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

bug fix from merge clonflict

LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

push finishing steps to prime

    • -60
    • +27
    /sources/gui/qml/compounds/CheckListView.qml
    • -3
    • +3
    /sources/gui/qml/globals/Variables.qml
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add prime data

LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added prime code

    • -0
    • +1
    /sources/gui/qml/components/HeaderBar.qml
    • -6
    • +0
    /sources/model/td/data/MTDValvesData.cpp
    • -6
    • +0
    /sources/model/td/data/MTDValvesData.h
  1. … 7 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-5246-bicarb-Low' into staging

    • -0
    • +16
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-5232-hdf' into staging

    • -0
    • +40
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +8
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-4767-enhancement-Isolated-UF' into staging

LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

update common defs iso

LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

address cr comemnts

LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

address cr comments

Merge remote-tracking branch 'origin/staging' into feature/LDT-4767-enhancement-Isolated-UF

LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

Merge branch 'feature/LDT-4959-calibration' into staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +102
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge remote-tracking branch 'origin/staging' into feature/LDT-5246-bicarb-Low

    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added treatment pause to dry demo menu

    • -0
    • +2
    /sources/gui/qml/dialogs/DryDemoDialog.qml
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fix minor buigs

Merge remote-tracking branch 'origin/staging' into feature/LDT-5232-hdf

Merge branch 'feature/LDT-4919-SW-Integration-Rinseback' into staging

LDT-5248 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 02: SDD - Design Diagram - plantuml & Review

LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

address CR commetns

    • -16
    • +1
    /sources/gui/qml/compounds/NumPad.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-4767-enhancement-Isolated-UF

Merge remote-tracking branch 'origin/staging' into feature/LDT-4959-calibration

LDT-5248 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 02: SDD - Design Diagram - plantuml & Review

add message ids to SDD

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

update low priiority alarm color

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fiunalize alarm dialog sizes

    • -3
    • +3
    /sources/gui/qml/dialogs/AlarmDialog.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add headerbar butto nto open dialog and finished dialog

    • -0
    • +28
    /sources/gui/qml/components/DryBicartDisconnectButton.qml
    • -1
    • +7
    /sources/gui/qml/components/HeaderBar.qml
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added dialog and component for drain bicart items

    • -0
    • +33
    /sources/gui/qml/compounds/DryBicartDisconnect.qml
    • -0
    • +40
    /sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml
    • -0
    • +38
    /sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml.autosave
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added syringe to td diagnostics

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/dialogs/AlarmDialog.qml
    • -113
    • +0
    /sources/model/hd/data/MHDSyringePumpData.h
    • -0
    • +68
    /sources/model/td/data/MTDSyringePumpData.cpp
    • -0
    • +110
    /sources/model/td/data/MTDSyringePumpData.h
  1. … 4 more files in changeset.