application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

    • -6
    • +6
    /sources/model/dg/data/MDGConductivityData.h
    • -9
    • +9
    /sources/model/hd/data/MHDAirBubbleData.h
    • -9
    • +9
    /sources/model/hd/data/MHDAirTrapData.h
    • -16
    • +16
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 18 more files in changeset.
DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

    • -6
    • +6
    /sources/model/dg/data/MDGConductivityData.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -9
    • +9
    /sources/model/hd/data/MHDAirBubbleData.h
    • -9
    • +9
    /sources/model/hd/data/MHDAirTrapData.h
    • -16
    • +16
    /sources/model/hd/data/MHDBloodLeakData.h
  1. … 19 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12258-UI-BN-S66' into develop

- merge conflict resolution.

    • -21
    • +46
    /sources/canbus/MessageInterpreter.cpp
DEN-12262: INT: Log Dialin Messages

- Log Dialin messages as part of the unhandled messages.

    • -21
    • +46
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +4
    /sources/model/hd/data/MHDSyringePumpData.h
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Reorganized the Diagnostics screen a little more.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Fixed HD version title.

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Fixed HD version title.

Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

    • -11
    • +11
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +101
    /sources/view/VGeneralEvent.cpp
    • -0
    • +84
    /sources/view/VGeneralEvent.h
    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
UI-DEN-12182: UI-DEN-12182-2

- During code review of my code, cleaned up the code.

    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +0
    /sources/cloudsync/CloudSyncController.h
remove the empty line. lower the column alignment spaces.

remove the empty line.
lower the column alignment spaces.

please align & empty line

please align
& empty line

Please align remove the empty line.

Please align
remove the empty line.

remove empty

remove empty

remove empty line.

remove empty line.

Remove empty line.

Remove empty line.

remove Data, and fix infoText in doc.

remove Data, and fix infoText in doc.

Fix #9 to #10

Fix #9 to #10

remove Data, and fix infoText in doc.

remove Data, and fix infoText in doc.

fix the Src, and CAN ID.

fix the Src, and CAN ID.

Fix the Src, Should be HD. *Fix the CAN ID, should be 0x040
  • Fix the Src, Should be HD.
  • Fix the CAN ID, should be 0x040
the "Data" is redundant. in the log, there is a section for the type if is data will be ",D," Please, update all the other models and the "| infoText|" in the header documents as well.

the "Data" is redundant.
in the log, there is a section for the type if is data will be ",D,"
Please, update all the other models and the "| infoText|" in the header documents as well.