Activity application/sources/model

- added the stack change for the Cartridge Installation in case FW wants to navigate back from Begin Prime to the beginning of Cartridge Installation.

- -1
- +1
./hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmMapping.cpp
… 5 more files in changeset.

4:43 pm

Michael Garthwaite

More
34861b4
changed 9 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 197 more UI-DEN-12121-1

DEN-12121: Updated Models and views to latest messaging protocol. Fixed BLD to show detect counter. Updated get version to display compatibility revision.

- -24
- +28
./dg/adjustment/settings/MAdjustDGVersionsResponse.cpp
- History
- Source
- Diff
./dg/.../MAdjustDGVersionsResponse.cpp
- -24
- +27
./dg/adjustment/settings/MAdjustDGVersionsResponse.h
- History
- Source
- Diff
./dg/.../MAdjustDGVersionsResponse.h
- -24
- +28
./hd/adjustment/settings/MAdjustHDVersionsResponse.cpp
- History
- Source
- Diff
./hd/.../MAdjustHDVersionsResponse.cpp
- -24
- +27
./hd/adjustment/settings/MAdjustHDVersionsResponse.h
- History
- Source
- Diff
./hd/.../MAdjustHDVersionsResponse.h
- -0
- +4
./hd/data/treatment/MTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/.../MTreatmentStatesData.cpp
- -0
- +2
./hd/data/treatment/MTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/treatment/MTreatmentStatesData.h
… 3 more files in changeset.

11:20 am

Dara Navaei

More
0685e67
changed 1 file
DEN-13226_UI_Unit_Testing

Bamboo Commit: Updated MAlarmMapping.cpp

- -1
- +1
./hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmMapping.cpp

7:21 pm

Behrouz NematiPour

More
1c23a7f
changed 5 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 197 more UI-UCOMMITS-3

DEN-12183 KBM: Implement the reqDeviceRegister

- -1
- +1
./hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmMapping.cpp
… 4 more files in changeset.

9:15 pm

Behrouz NematiPour

More
3f60b9a
changed 8 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 197 more UI-UCOMMITS-4 UI-UCOMMITS-3

DEN-12183 KBM: Credentials messaging

- Added Credential messages

| 2003 | req save credential |1639391827,1,0,2003,3,path_to_client_certificate_pem,path_to_client_private_key_pem,path_to_client_public_key_pem |

| 2004 | req credentials | 1639391827,1,0,2004,0 |

| 1004 | send credentials | 1639391827,1,0,1004,1,path_to_credentials="/tmp/credentials" |

- -1
- +1
./hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmMapping.cpp
… 7 more files in changeset.

6:24 pm

Michael Garthwaite

More
6a9123e
changed 7 files
DEN-13226_UI_Unit_Testing UI-DEN-13226-1

Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

- -1
- +21
./MModel.h
- History
- Source
- Diff
./MModel.h
… 6 more files in changeset.

6:22 pm

Michael Garthwaite

More
b6d23ac
changed 3 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 197 more UI-DEN-12121-1

DEN-12121: Further linkage for updating values on screen relating to DEN-12118

- -0
- +12
./MModel.h
- History
- Source
- Diff
./MModel.h
… 2 more files in changeset.

11:30 am

Dara Navaei

More
d67f3d0
changed 1 file
DEN-13226_UI_Unit_Testing

Bamboo Commit: Updated MAlarmMapping.cpp

- -1
- +1
./hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmMapping.cpp

10:36 am

Michael Garthwaite

More
30a3a58
changed 15 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 197 more UI-DEN-12121-1

DEN-12121: Implemented QML updates, proper view links for QML, and remaining implementation for new messages to the QML stack. All relate to DEN-12118.

- -0
- +1
./dg/data/MDGValvesStatesData.h
- History
- Source
- Diff
./dg/data/MDGValvesStatesData.h
- -3
- +3
./hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmMapping.cpp
… 13 more files in changeset.

9:46 pm

Behrouz NematiPour

More
2a2782d
changed 2 files
DEN-13226_UI_Unit_Testing

Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

- -0
- +5
./MModel.h
- History
- Source
- Diff
./MModel.h
… 1 more file in changeset.

8:21 pm

Dara Navaei

More
fe28eea
changed 1 file
DEN-13226_UI_Unit_Testing

Bamboo Commit: Updated MAlarmMapping.cpp

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

6:25 pm

Michael Garthwaite

More
2d37cfe
changed 10 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 197 more UI-DEN-12121-1

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

- -7
- +8
./MModel.h
- History
- Source
- Diff
./MModel.h
- -3
- +3
./hd/data/treatment/MTreatmentRinsebackData.cpp
- History
- Source
- Diff
./hd/data/.../MTreatmentRinsebackData.cpp
- -3
- +3
./hd/data/treatment/MTreatmentRinsebackData.h
- History
- Source
- Diff
./hd/data/.../MTreatmentRinsebackData.h
… 7 more files in changeset.

6:24 pm

Michael Garthwaite

More
968c786
changed 27 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 197 more UI-DEN-12121-1

DEN-12121: Implemented Model and Views for BloodLeak, AirBubble, AirTrap and DG Conductvity for DEN-12118. Removed ODi and ODo in diagnostic dialog. Added isCompleted field in Rinseback Model for DEN-9932.