application

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

DEN-12262: INT: Support and debugging

- updated/tested the alarmMapping with new changes.

- added the staging to the alamMapping.sh call to checkout always on staging as the mainsteam.

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

DEN-12262: INT: Support and debugging

- Fixing the DG Valves/Temperature messages

- Fixing the CloudSync RegisterDeviceRequest

- Fixed/Cherry-Picked the Dialin-log conditions.

- Cleaned up the debug messages.

    • -23
    • +26
    /sources/model/dg/data/MDGTemperaturesData.h
    • -13
    • +14
    /sources/model/dg/data/MDGValvesStatesData.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 6 more files in changeset.
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
DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Reorganized the Diagnostics screen a little more.

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

    • -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

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/cloudsync/CloudSyncController.h
  1. … 63 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -10
    • +10
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into staging

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.

RESOLVED I fixed it in my own branch and merged it into the develop branch.

RESOLVED
I fixed it in my own branch and merged it into the develop branch.