leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into dry-demo-usability

    • -3
    • +2
    /sources/canbus/MessageInterpreter.cpp
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add acic conentrates response model

added checks for this and the one in VSettings

added checks for this and the one in VSettings

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

    • -17
    • +0
    /sources/view/settings/VSettings.cpp
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

address cr comments

    • -7
    • +21
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -6
    • +17
    /sources/view/settings/VSettings.cpp
Headerbar popup update

    • -2
    • +7
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +1
    /sources/gui/qml/components/MainMenu.qml
Adding AlarmMapping for now for the develop.

    • -1
    • +111
    /etc/reports/alarms/AlarmMapping.csv
    • -1
    • +111
    /etc/reports/alarms/AlarmMapping.py
    • -11
    • +11
    /sources/model/hd/alarm/MAlarmMapping.cpp
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

  1. … 5 more files in changeset.
Merge branch 'feature/LDT-5414-prime' into staging

remove from prime // priming - TODO check if needed. may not need

remove from prime // priming - TODO check if needed. may not need

Merge branch 'feature/LDT-5445-end-of-treatment' into staging