leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
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-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

bug fix

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

LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

addressed cr comments

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +70
    /sources/model/dd/adjustment/settings/MRoWaterModeResponse.h
  1. … 9 more files in changeset.
removed from settings and config and now handled by fw

removed from settings and config and now handled by fw

added

added

Merge remote-tracking branch 'origin/staging' into feature/LDT-5074-feature-complete

removed

removed

removed isFloat

removed isFloat

removed

removed

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

remove

remove

remove this or allowFloat

remove this or allowFloat

remove comments

remove comments