LEAHI-TD-FIRMWARE-LDT-1840

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into staging

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect

- Add additional tally for second backup condition

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

Merge remote-tracking branch 'origin/bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

debug statement

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Fix pending log tally and revert log name to just date.log

bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect'

fix issue on qstring

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Add debug statements to tally feature

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Add debug statements to tally feature

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Add time to device logs when they are generated

Removed

Removed

Updated

Updated

Still not packed.

Still not packed.

Remove extra blank line.

Remove extra blank line.

Sure

Sure

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/view/settings/VNetworkModel.cpp
    • -1
    • +1
    /sources/view/settings/VNetworkModel.h
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Fix issues in Device Controller and Logger due to change of file extension to QStr5ing

    • -7
    • +11
    /sources/device/DeviceController.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. … 605 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp