application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-10424_FW_Request_A4_A5_Msg_log' into develop

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
RESOLVED.

RESOLVED.

Since we have more than one message which is using the dynamic structure now we have a "MAbstractDynamic" model (link bellow) as the parent and these codes have been moved to the parent and all the...

Since we have more than one message which is using the dynamic structure now we have a "MAbstractDynamic" model (link bellow) as the parent and these codes have been moved to the parent and all the 3 messages are using the same structure.
http://dvm-linux02:8060/cru/#UI-DEN-10424-1CFR-27600

Where was this code moved to or was it dead code laying around?

Where was this code moved to or was it dead code laying around?

UI-DEN-10424_FW Request A4 A5 Msg Log
UI-DEN-10424_FW Request A4 A5 Msg Log
Bamboo Commit: Updated MAlarmMapping.cpp

    • -23
    • +23
    /sources/model/hd/alarm/MAlarmMapping.cpp
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.