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
LEAHI-APPLICATION-LDT-5074_SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I
LEAHI-APPLICATION-LDT-5074_SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I
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.
LEAHI-APPLICATION-LDT-4767_NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I
LEAHI-APPLICATION-LDT-4767_NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I
Merge branch 'feature/LDT-4852-Remove-Old-Messaging-Logic' into staging

BN approves

BN approves

revertes BN approves

revertes BN approves

bn approves

bn approves

BN approves

BN approves

bn approves

bn approves

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

BN resolves

BN resolves

BN resolves

BN resolves

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

remove the handletransmit for now

remove the handletransmit for now

will remove later after updating checkin, alarm status, and alarm trigger to new format

will remove later after updating checkin, alarm status, and alarm trigger to new format

i broke something so will investigate at a later time

i broke something so will investigate at a later time

will do in later branch

will do in later branch

will investigate later

will investigate later

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
removed

removed

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