leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-2364: Software Upgrade - SW - 01 - Qt6-LTS Investigation - R&I - 05: DEV - Feature Implementation

- Updated build files for merge from staging.

LDT-2364: Software Upgrade - SW - 01 - Qt6-LTS Investigation - R&I - 05: DEV - Feature Implementation

- Pulled staging and fixed Qt6 build issues.

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
LDT-5079 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 05: DEV - Feature Implementation

fix some PRS items

    • -2
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/gui/qml/components/IdleTimer.qml
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

added iso uf state

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2359-software-upgrade-qt-6-lts

    • -63
    • +49
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +9
    /sources/gui/qml/components/ModalDialog.qml
    • -5
    • +25
    /sources/gui/qml/globals/Colors.qml
    • -152
    • +198
    /sources/gui/qml/pages/settings/SettingsWiFi.qml
    • -38
    • +105
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
  1. … 4 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

fix common build error

Merge branch 'feature/LDT-4852-Remove-Old-Messaging-Logic' into staging

Merge branch 'feature/LDT-4810-device-settings-enhancement' into staging

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

update to set variable on completed script

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

fix placement of property in device view

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

PUSH REVERT

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert changes in message dispather

    • -0
    • +16
    /sources/canbus/MessageDispatcher.cpp
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

push revert

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert

    • -0
    • +1
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -1
    • +0
    /sources/model/hd/alarm/MAlarmTriggered.h
Merge remote-tracking branch 'origin/staging' into feature/LDT-4852-Remove-Old-Messaging-Logic

    • -5
    • +1
    /sources/canbus/MessageInterpreter.cpp
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert changes that broke checkin

    • -29
    • +0
    /sources/canbus/MessageInterpreter.cpp
Merge remote-tracking branch 'origin/staging' into feature/LDT-4810-device-settings-enhancement

Merge branch 'feature/LDT-4787-enhancement-power-off' into staging

Merge branch 'feature/LDT-4747-fp-diagnostics' into staging

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

removed other oboslete items. HOPE IO DIDNT BREAK ANYTHING

    • -0
    • +17
    /sources/canbus/MessageDispatcher.cpp
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

removed onAcitonReceive

    • -22
    • +27
    /sources/ApplicationController.cpp
    • -2
    • +30
    /sources/canbus/MessageDispatcher.cpp
    • -17
    • +0
    /sources/canbus/MessageDispatcher.h
    • -30
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -15
    • +15
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -5
    • +32
    /sources/model/hd/alarm/MAlarmTriggered.h
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

    • -0
    • +50
    /sources/gui/qml/dialogs/ConfirmPasswordDialog.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

final tweak to wifi network liost height

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finish export logs

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

add missing notifys to dispathcer

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

add USB progress

    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finalize export lgos screen

    • -51
    • +24
    /sources/gui/qml/SDCProgressItem.qml
    • -49
    • +23
    /sources/gui/qml/USBProgressItem.qml
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

update osbolete onActionTransmit to actionTransmit and removed signal tracing of actionTransmit from GUI -> APp -> MsgDispathcer

    • -78
    • +59
    /sources/canbus/MessageDispatcher.cpp
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

update export logs screen

    • -0
    • +80
    /sources/gui/qml/compounds/ExportLogsHeaderData.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml