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

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

There is a comment in the model. I that changes please don't forget to fix this as well.

There is a comment in the model.
I that changes please don't forget to fix this as well.

This seems a big type for just a boolean value to me. Please check the FW code as well.

This seems a big type for just a boolean value to me.
Please check the FW code as well.

remove the empty line.

remove the empty line.

Don't see why the CRev is necessary? Also, formatting doesn't make sense to me. fpgaID is in between HD and FPGA versions !!! I think it should be like: v<hdMajor(%1)>.<hdMinor(%2)>.<hdMicro(%3)>...

Don't see why the CRev is necessary?

Also, formatting doesn't make sense to me.
fpgaID is in between HD and FPGA versions !!!

I think it should be like:
v<hdMajor(%1)>.<hdMinor(%2)>.<hdMicro(%3)>.<hdBuild(%4)><' '>v<fpgaID(%5)>.<fpgaMajor(%6)>.<fpgaMinor(%7)>.<fpgaLab(%8)><' - '><compRev(%9)>

or move the fpgaID at the end of the FPGA versions.

The message is a U16 and each valve is a bit, and it's not clear to me why the type has been changed from bool to a very big uint32 type? Although it was defined as boolean, qml was showing it as a...

The message is a U16 and each valve is a bit, and it's not clear to me why the type has been changed from bool to a very big uint32 type?
Although it was defined as boolean, qml was showing it as an int value, so what are we going to achieve here?