application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-9968: GUI does not indicate the amount of time the device has been stopped in pre-treatment & treatment

- Added message ID_TreatmentStop = 0x4900, // 73 and its Model, View

- Added a timer on the Alarm Dialog which is visible in Treatment Stop and if the message above has a total value.

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +83
    /sources/model/hd/data/treatment/MTreatmentStopData.h
    • -0
    • +26
    /sources/view/hd/data/treatment/VTreatmentStopData.cpp
    • -0
    • +44
    /sources/view/hd/data/treatment/VTreatmentStopData.h
Part 2/2: Added the two new General HD/DG messages

    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -21
    • +0
    /sources/model/MAbstractDynamic.cpp
    • -0
    • +42
    /sources/model/dg/data/MDGGeneralEvent.cpp
    • -0
    • +86
    /sources/model/dg/data/MDGGeneralEvent.h
    • -0
    • +21
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -1
    • +17
    /sources/model/hd/alarm/MAlarmTriggered.h
    • -1
    • +1
    /sources/model/hd/data/MHDDebugText.cpp
    • -0
    • +42
    /sources/model/hd/data/MHDGeneralEvent.cpp
    • -0
    • +86
    /sources/model/hd/data/MHDGeneralEvent.h
DEN-10161: Missing END TREATMENT option in Treatment-Recirculate-Stop screen

- The screen (Reconnect) belongs to the TREATMENT_RECIRC_STOPPED_STATE state of the TREATMENT_RECIRC_STATE in the TREATMENT_STATE message, didn't even have a "END TREATMENT" button, which has been added.

- The time_IsLeft logic has NOT been removed yet, since I don't recall why it has been used in the first place.

Part 2/2: make the Alarm Triggered messages modification

- Created a class named MAbstractDynamic which is the base class of the dynamic model classes.

+ Dynamic Model classes are the ones with field descriptor (FD) and a data field (DF) after that which the data type in the data field is defined by field descriptor.

+ This combination for now is only for 2 set of FD, DF only.

- Made the Alarm Triggered inherit from MAbstractDynamic.

    • -0
    • +177
    /sources/model/MAbstractDynamic.cpp
    • -0
    • +102
    /sources/model/MAbstractDynamic.h
    • -155
    • +1
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -38
    • +3
    /sources/model/hd/alarm/MAlarmTriggered.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Updated AlarmMapping

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Part 1/2: make the unhandled messages dynamic

- The messages/unhandled.conf has been created in the settings area and will be loaded and used for the unhandled messages in the message interpreter.

    • binary
    /resources/images/Logo d-blue.png
    • -0
    • +27
    /resources/settings/messages/unhandled.conf
    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +21
    /sources/canbus/MessageInterpreter.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-9626UI_DEV_BluetoothCuffIntegration' into develop

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

DEN-10399: UI: Alarms block Shutdown screen

DEN-9271: Dialysate Temperature implemented resolution does not meet PRS

    • -1
    • +1
    /sources/gui/qml/components/Slider.qml
    • -0
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Thanks for the comment. I removed those two and updated the comments as well.

Thanks for the comment.
I removed those two and updated the comments as well.

Updated the comments to clarify. In ' ..., and them,...' it meant logical AND &&. And added a lot more comments.

Updated the comments to clarify.
In ' ..., and them,...' it meant logical AND &&.
And added a lot more comments.

Removed.

Removed.

DEN-9639: Code Review 0

- Addressed code reviews

- Reoved LOG_DEBUG_UI since the DEBUG log is all about UI and adding a UI to it was useless.

- Removed the time stamp from the POST start/stop log since the log itself has timestamp.

- Added more documentation to the ApplicationPOST class.

- Renamed the FileSystem to ShaSum check in the ApplicationPOST.

- Updated the WiFi POST check funciton.

- Updated the initial Screen to pause the animation when the UI navigates out of that screen when we are in test (usual case should not happen since we fail or pass the POST and either stops the animation.)

- Updated the AlarmMapping to reflect the FILESYSTEM error change to SHASUM error.

    • -3
    • +2
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/canbus/MessageAcknowModel.cpp
    • -2
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +2
    /sources/gui/qml/components/WaitDone.qml
  1. … 5 more files in changeset.
Remove blank line.

Remove blank line.