leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-4511-treatment-logs' into staging

Merge branch 'feature/LDT-4581-integration-DD-diagnostics' into staging

    • -9
    • +10
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-4541-integration-vitals' into staging

    • -1
    • +2
    /sources/gui/qml/components/HeaderBar.qml
Merge branch 'feature/LDT-4652-dry-demo-support' into staging

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-4632-integration-td-diagnostics' into staging

    • -1
    • +0
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-4672-power-control' into staging

LDT-4677 Power Control and POST - SW - 01 - Power Control - R&I - 05: DEV - Feature Implementation

address CR comments

LDT-4677 Power Control and POST - SW - 01 - Power Control - R&I - 05: DEV - Feature Implementation

fix payload lenght

LDT-4675 Power Control and POST - SW - 01 - Power Control - R&I - 03: SDD - Design Diagram - plantuml

added sdd

    • binary
    /SDDs/Power_Control.png
    • -0
    • +46
    /SDDs/Power_Control.puml
LDT-4637 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - TD Diagnostics - R&I - 05: DEV - Feature Implementation

ADD REMAINING DIAGNOSTICS

    • -6
    • +12
    /sources/model/td/data/MTDEjectorData.cpp
    • -6
    • +13
    /sources/model/td/data/MTDEjectorData.h
    • -33
    • +26
    /sources/model/td/data/MTDVoltageData.cpp
    • -30
    • +22
    /sources/model/td/data/MTDVoltageData.h
    • -2
    • +4
    /sources/view/td/data/VTDEjectorData.cpp
    • -2
    • +4
    /sources/view/td/data/VTDEjectorData.h
    • -11
    • +8
    /sources/view/td/data/VTDVoltageData.cpp
    • -11
    • +8
    /sources/view/td/data/VTDVoltageData.h
LDT-4637 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - TD Diagnostics - R&I - 05: DEV - Feature Implementation

add more diagnostics

    • -15
    • +30
    /sources/model/td/data/MTDValvesData.cpp
    • -11
    • +26
    /sources/model/td/data/MTDValvesData.h
    • -5
    • +10
    /sources/view/td/data/VTDValvesData.cpp
    • -5
    • +10
    /sources/view/td/data/VTDValvesData.h
LDT-4637 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - TD Diagnostics - R&I - 05: DEV - Feature Implementation

adad more diag

    • -6
    • +15
    /sources/model/td/data/MTDAirPumpData.cpp
    • -6
    • +15
    /sources/model/td/data/MTDAirPumpData.h
    • -21
    • +30
    /sources/model/td/data/MTDAirTrapData.cpp
    • -22
    • +32
    /sources/model/td/data/MTDAirTrapData.h
    • -2
    • +5
    /sources/view/td/data/VTDAirPumpData.cpp
    • -2
    • +5
    /sources/view/td/data/VTDAirPumpData.h
    • -7
    • +10
    /sources/view/td/data/VTDAirTrapData.cpp
    • -7
    • +10
    /sources/view/td/data/VTDAirTrapData.h
LDT-4657 NON-FEATURE: SW Misc & Enhc - SW - 01 - Dry-Demo Support - SW App - R&I - 05: DEV - Feature Implementation

remove legacy code from headderbar click

    • -5
    • +0
    /sources/gui/qml/components/HeaderBar.qml
LDT-4697 NON-FEATURE: SW Misc & Enhc - SW - 01 - Treatment adjustments - Vitals alarm limits - R&I - 05: DEV - Feature Implementation

update length of power off to 4 bytes

LDT-4637 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - TD Diagnostics - R&I - 05: DEV - Feature Implementation

push updating payloads that already are mathcing

    • -1
    • +0
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/model/td/data/MTDOpModeData.h
    • -1
    • +1
    /sources/model/td/data/MTDTemperatureData.h
LDT-4697 NON-FEATURE: SW Misc & Enhc - SW - 01 - Treatment adjustments - Vitals alarm limits - R&I - 05: DEV - Feature Implementation

fix ocmments

LDT-4657 NON-FEATURE: SW Misc & Enhc - SW - 01 - Dry-Demo Support - SW App - R&I - 05: DEV - Feature Implementation

close dialgo affert sselecting mode

    • -2
    • +5
    /sources/gui/qml/dialogs/DryDemoDialog.qml
LDT-4657 NON-FEATURE: SW Misc & Enhc - SW - 01 - Dry-Demo Support - SW App - R&I - 05: DEV - Feature Implementation

add dry demo dialog menu

    • -0
    • +1
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +82
    /sources/gui/qml/dialogs/DryDemoDialog.qml
LDT-4546 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Vitals - R&I - 05: DEV - Feature Implementation

finalize updated vitral sdialog

    • -1
    • +2
    /sources/gui/qml/components/HeaderBar.qml
    • -12
    • +14
    /sources/gui/qml/compounds/BPHREntry.qml
LDT-4657 NON-FEATURE: SW Misc & Enhc - SW - 01 - Dry-Demo Support - SW App - R&I - 05: DEV - Feature Implementation

add confirm message id and preset all parameters in dry demo

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -85
    • +0
    /sources/model/confirm/MDuetConfirmHDi.h
    • -0
    • +52
    /sources/model/confirm/MDuetConfirmTDi.cpp
    • -0
    • +85
    /sources/model/confirm/MDuetConfirmTDi.h
LDT-4657 NON-FEATURE: SW Misc & Enhc - SW - 01 - Dry-Demo Support - SW App - R&I - 05: DEV - Feature Implementation

fix disinfection not showingf

LDT-4586 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - DD Diagnostics - R&I - 05: DEV - Feature Implementation

addaress cr commentds

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
LDT-4516 Treatment Logs - SW - 01 - Treatment Logs - R&I - 05: DEV - Feature Implementation

add the fix to common adn tx logs

LDT-4516 Treatment Logs - SW - 01 - Treatment Logs - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-4546 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Vitals - R&I - 05: DEV - Feature Implementation

update vitals dialog

    • -0
    • +111
    /sources/gui/qml/compounds/BPHREntry.qml
LDT-4546 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Vitals - R&I - 05: DEV - Feature Implementation

fix common

LDT-4546 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Vitals - R&I - 05: DEV - Feature Implementation

fix common

LDT-4697 NON-FEATURE: SW Misc & Enhc - SW - 01 - Treatment adjustments - Vitals alarm limits - R&I - 05: DEV - Feature Implementation

update pressures

LDT-4697 NON-FEATURE: SW Misc & Enhc - SW - 01 - Treatment adjustments - Vitals alarm limits - R&I - 05: DEV - Feature Implementation

finish adding dialog

    • -0
    • +17
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
  1. … 5 more files in changeset.
LDT-4697 NON-FEATURE: SW Misc & Enhc - SW - 01 - Treatment adjustments - Vitals alarm limits - R&I - 05: DEV - Feature Implementation

fix common