From c34baf010858196c06f03e71fa3476c4a7d81648 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 21 Jul 2023 15:49:50 +1000 Subject: [PATCH 1/2] Ensure setPhaseProperty() is not triggered before phases are set --- data/common/PvInverter.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/common/PvInverter.qml b/data/common/PvInverter.qml index 941d713c2..e9c22be3a 100644 --- a/data/common/PvInverter.qml +++ b/data/common/PvInverter.qml @@ -35,6 +35,7 @@ Device { } readonly property Instantiator _phaseObjects: Instantiator { + model: null delegate: QtObject { readonly property VeQuickItem _phaseEnergy: VeQuickItem { uid: pvInverter.serviceUid + "/Ac/L" + (model.index + 1) + "/Energy/Forward" From d1346ae3c9deea75b5ceb5614a2a9053c4cec1da Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 21 Jul 2023 15:51:03 +1000 Subject: [PATCH 2/2] Ensure charger or inverter is available for device item --- pages/solar/SolarDeviceListPage.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/solar/SolarDeviceListPage.qml b/pages/solar/SolarDeviceListPage.qml index d15fc39f7..2bcd9f00d 100644 --- a/pages/solar/SolarDeviceListPage.qml +++ b/pages/solar/SolarDeviceListPage.qml @@ -68,6 +68,7 @@ Page { text: solarCharger ? solarCharger.name : pvInverter.name primaryLabel.width: availableWidth - Theme.geometry.solarListPage.quantityRow.width - Theme.geometry.listItem.content.horizontalMargin + enabled: !!solarCharger || !!pvInverter onClicked: { if (solarCharger) {