leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
fix build error

push WIP develop code

    • -0
    • +1
    /sources/gui/qml/components/HeaderBar.qml
    • -6
    • +0
    /sources/model/td/data/MTDValvesData.cpp
  1. … 12 more files in changeset.
Merge branch 'feature/LDT-4767-enhancement-Isolated-UF' into dry-demo-usability

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-5246-bicarb-Low' into dry-demo-usability

    • -0
    • +16
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-5074-feature-complete' into dry-demo-usability

    • -3
    • +15
    /sources/canbus/MessageDispatcher.cpp
    • -6
    • +7
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-5232-hdf' into dry-demo-usability

Merge branch 'feature/LDT-5331-pre-tx-usability-requests' into dry-demo-usability

    • -3
    • +88
    /sources/view/hd/alarm/VAlarmStatus.cpp
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

added DDdefs enuim

    • -37
    • +35
    /sources/view/settings/VCalibrationSettings.cpp
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

update common defs iso

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

functional framework for calibration.. pressures imeplemnnted

    • -0
    • +2
    /sources/gui/qml/components/TextEntry.qml
    • -29
    • +83
    /sources/view/settings/VCalibrationSettings.cpp
WIP on feature/LDT-4959-calibration

    • -0
    • +33
    /sources/canbus/MessageDispatcher.cpp
    • -17
    • +22
    /sources/canbus/MessageInterpreter.cpp
    • -46
    • +136
    /sources/view/settings/VCalibrationSettings.cpp
Push WIP Prime

    • -0
    • +1
    /sources/gui/qml/components/HeaderBar.qml
  1. … 14 more files in changeset.
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]

develop

push changing HDF status enum states

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

LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

push to build

    • -1
    • +111
    /etc/reports/alarms/AlarmMapping.csv
    • -5
    • +123
    /etc/reports/alarms/AlarmMapping.py
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
fix merge errors

Merge branch 'feature/LDT-5246-bicarb-Low' into develop

    • -0
    • +16
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-4959-calibration' into develop

Merge branch 'feature/LDT-5232-hdf' into develop

    • -0
    • +40
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +8
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-5331-pre-tx-usability-requests' into develop

    • -3
    • +88
    /sources/view/hd/alarm/VAlarmStatus.cpp
Merge branch 'feature/LDT-5074-feature-complete' into develop

    • -3
    • +15
    /sources/canbus/MessageDispatcher.cpp
    • -6
    • +7
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-4767-enhancement-Isolated-UF' into develop

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