Activity leahi-application/

More
61a9a75
changed 15 files
develop

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

More
b33a0dc
changed 6 files
develop

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

More
3946bf9
changed 9 files
develop

Merge branch 'feature/LDT-5074-feature-complete' into develop

- -8
- +12
/leahi.pro
- History
- Source
- Diff
/leahi.pro
- -3
- +15
/sources/canbus/MessageDispatcher.cpp
- History
- Source
- Diff
/sources/canbus/MessageDispatcher.cpp
- -4
- +5
/sources/canbus/MessageGlobals.h
- History
- Source
- Diff
/sources/canbus/MessageGlobals.h
- -6
- +7
/sources/canbus/MessageInterpreter.cpp
- History
- Source
- Diff
/sources/canbus/MessageInterpreter.cpp
- -1
- +2
/sources/gui/GuiGlobals.cpp
- History
- Source
- Diff
/sources/gui/GuiGlobals.cpp
- -5
- +6
/sources/gui/GuiGlobals.h
- History
- Source
- Diff
/sources/gui/GuiGlobals.h
- -2
- +4
/sources/gui/qml/main.qml
- History
- Source
- Diff
/sources/gui/qml/main.qml
- -24
- +30
/sources/model/MModel.h
- History
- Source
- Diff
/sources/model/MModel.h
- -1
- +2
/sources/view/VView.h
- History
- Source
- Diff
/sources/view/VView.h

More
c8906f1
changed 5 files
develop

Merge branch 'feature/LDT-4767-enhancement-Isolated-UF' into develop

More
7ba8b8d
changed 1 file
develop, staging

Bamboo Commit: Updated MAlarmMapping.cpp

- -2
- +102
/sources/model/hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
/sources/model/hd/alarm/MAlarmMapping.cpp

Merge remote-tracking branch 'origin/staging' into feature/LDT-5246-bicarb-Low

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

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]

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

removed from settings and config and now handled by fw

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

- -0
- +1
/sources/canbus/MessageDispatcher.cpp
- History
- Source
- Diff
/sources/canbus/MessageDispatcher.cpp
- -1
- +1
/sources/canbus/MessageGlobals.h
- History
- Source
- Diff
/sources/canbus/MessageGlobals.h
- -2
- +2
/sources/gui/GuiGlobals.h
- History
- Source
- Diff
/sources/gui/GuiGlobals.h

removed isFloat

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

address CR commetns

More
a836979
changed 3 files
develop

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

- -0
- +1
/sources/canbus/MessageDispatcher.cpp
- History
- Source
- Diff
/sources/canbus/MessageDispatcher.cpp
- -1
- +1
/sources/canbus/MessageGlobals.h
- History
- Source
- Diff
/sources/canbus/MessageGlobals.h
- -2
- +2
/sources/gui/GuiGlobals.h
- History
- Source
- Diff
/sources/gui/GuiGlobals.h

remove this or allowFloat

remove comments

nice try BN approves

remove from here and ask fw

add Ro water mode request data

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

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

updated to allow only certain options availabel for modaity

leahi-application

Stats

Commits this week: 30

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)