fixed: multi tile is sometimes hidden when inverter switches off

kwindrem · Jun 15, 2024 · 8bb9490 · 8bb9490
1 parent ad8f1ca
commit 8bb9490
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 18 deletions.
diff --git a/FileSets/VersionIndependent/MultiEnhanced.qml b/FileSets/VersionIndependent/MultiEnhanced.qml
@@ -36,7 +36,7 @@ MbIcon {
         bind: Utils.path(inverterService, "/Mode")
     }
     // flag a VE.Direct inverter
-    property VBusItem isInverterChargerItem: VBusItem { bind: Utils.path(inverterService, "/IsInverterCharger") }
+    property VBusItem isInverterChargerItem: VBusItem { bind: Utils.path(=, "/IsInverterCharger") }
     property bool isInverter: isInverterChargerItem.valid ? true : false
 
     SvgRectangle

diff --git a/FileSets/v2.73/OverviewHubEnhanced.qml b/FileSets/v2.73/OverviewHubEnhanced.qml
@@ -38,7 +38,8 @@ OverviewPage {
 	property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0
 	property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != ""
 	property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles
-	property bool showInverter: inverterService != "" || showAllTiles
+	property bool hasInverter: false
+	property bool showInverter: hasInverter || showAllTiles
 
 	property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid
 	property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid
@@ -1202,6 +1203,7 @@ OverviewPage {
 			tempsModel.append({serviceName: service.name})
 			break;;
 		case DBusService.DBUS_SERVICE_MULTI:
+			hasInverter = true
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
 			{
@@ -1211,13 +1213,16 @@ OverviewPage {
 			break;;
 //////// add for VE.Direct inverters
 		case DBusService.DBUS_SERVICE_INVERTER:
+			hasInverter = true
 			if (veDirectInverterService == "")
 				veDirectInverterService = service.name;
 			break;;
 
 //////// add for PV CHARGER voltage and current display
 		case DBusService.DBUS_SERVICE_SOLAR_CHARGER:
 		case DBusService.DBUS_SERVICE_MULTI_RS:
+			if ( service.type == DBUS_SERVICE_MULTI_RS )
+				hasInverter = true
 			numberOfPvChargers++
 			if (numberOfPvChargers === 1)
 				pvChargerPrefix1 = service.name;
@@ -1273,6 +1278,7 @@ OverviewPage {
 		numberOfPvInverters = 0
 		numberOfAlternators = 0
 		veDirectInverterService = ""
+		hasInverter = false
 		pvChargerPrefix1 = ""
 		pvChargerPrefix2 = ""
 		pvChargerPrefix3 = ""

diff --git a/FileSets/v3.01/OverviewFlowComplex.qml b/FileSets/v3.01/OverviewFlowComplex.qml
@@ -42,7 +42,9 @@ OverviewPage {
 	// for debug, ignore validity checks so all tiles and their flow lines will show
     property bool showAllTiles: showInactiveTilesItem.valid && showInactiveTilesItem.value == 3
 
-    property bool showInverter: inverterService != "" || showAllTiles
+	property bool hasInverter: false
+	property bool showInverter: hasInverter || showAllTiles
+
     property bool showLoadsOnOutput: showInverter || outputLoad.power.valid
     property bool showAcInput: isMulti || sys.acInput.power.valid || showAllTiles
 	property bool hasLoadsOnInput: showAcInput && ! combineAcLoads && (! loadsOnInputItem.valid || loadsOnInputItem.value === 1)
@@ -1399,17 +1401,23 @@ OverviewPage {
             break;;
 
         case DBusService.DBUS_SERVICE_MULTI:
+			hasInverter = true
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
 			{
 				numberOfTemps++
 				tempsModel.append({serviceName: service.name})
 			}
             break;;
-        case DBusService.DBUS_SERVICE_INVERTER:
-            if (veDirectInverterService == "")
+		case DBusService.DBUS_SERVICE_MULTI_RS:
+			hasInverter = true
+			break;;
+
+		case DBusService.DBUS_SERVICE_INVERTER:
+			hasInverter = true
+			if (veDirectInverterService == "")
 				veDirectInverterService = service.name;
-            break;;
+			break;;
         case DBusService.DBUS_SERVICE_BATTERY:
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
@@ -1427,6 +1435,7 @@ OverviewPage {
         numberOfTemps = 0
         tempsModel.clear()
 		veDirectInverterService = ""
+		hasInverter = false
         for (var i = 0; i < DBusServices.count; i++)
         {
             addService(DBusServices.at(i))

diff --git a/FileSets/v3.01/OverviewHubEnhanced.qml b/FileSets/v3.01/OverviewHubEnhanced.qml
@@ -43,7 +43,8 @@ OverviewPage {
 	property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0
 	property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != ""
 	property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles
-	property bool showInverter: inverterService != "" || showAllTiles
+	property bool hasInverter: false
+	property bool showInverter: hasInverter || showAllTiles
 
 	property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid
 	property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid
@@ -1261,6 +1262,7 @@ OverviewPage {
 			tempsModel.append({serviceName: service.name})
 			break;;
 		case DBusService.DBUS_SERVICE_MULTI:
+			hasInverter = true
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
 			{
@@ -1270,13 +1272,16 @@ OverviewPage {
 			break;;
 //////// add for VE.Direct inverters
 		case DBusService.DBUS_SERVICE_INVERTER:
+			hasInverter = true
 			if (veDirectInverterService == "")
 				veDirectInverterService = service.name;
 			break;;
 
 //////// add for PV CHARGER voltage and current display
 		case DBusService.DBUS_SERVICE_SOLAR_CHARGER:
 		case DBusService.DBUS_SERVICE_MULTI_RS:
+			if ( service.type == DBUS_SERVICE_MULTI_RS )
+				hasInverter = true
 			numberOfPvChargers++
 			if (numberOfPvChargers === 1)
 				pvChargerPrefix1 = service.name;
@@ -1331,6 +1336,7 @@ OverviewPage {
 		numberOfPvInverters = 0
 		numberOfAlternators = 0
 		veDirectInverterService = ""
+		hasInverter = false
 		pvChargerPrefix1 = ""
 		pvChargerPrefix2 = ""
 		pvChargerPrefix3 = ""

diff --git a/FileSets/v3.40~27/OverviewFlowComplex.qml b/FileSets/v3.40~27/OverviewFlowComplex.qml
@@ -42,8 +42,10 @@ OverviewPage {
 	// for debug, ignore validity checks so all tiles and their flow lines will show
     property bool showAllTiles: showInactiveTilesItem.valid && showInactiveTilesItem.value == 3
 
-    property bool showInverter: inverterService != "" || showAllTiles
-    property bool showLoadsOnOutput: showInverter || outputLoad.power.valid
+	property bool hasInverter: false
+	property bool showInverter: hasInverter || showAllTiles
+
+	property bool showLoadsOnOutput: showInverter || outputLoad.power.valid
     property bool showAcInput: isMulti || sys.acInput.power.valid || showAllTiles
 	property bool hasLoadsOnInput: showAcInput && ! combineAcLoads && (! loadsOnInputItem.valid || loadsOnInputItem.value === 1)
     property bool showLoadsOnInput: !dcCoupled && hasLoadsOnInput
@@ -1359,14 +1361,19 @@ OverviewPage {
             break;;
 
         case DBusService.DBUS_SERVICE_MULTI:
+			hasInverter = true
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
 			{
 				numberOfTemps++
 				tempsModel.append({serviceName: service.name})
 			}
             break;;
-        case DBusService.DBUS_SERVICE_INVERTER:
+		case DBusService.DBUS_SERVICE_MULTI_RS:
+			hasInverter = true
+			break;;
+		case DBusService.DBUS_SERVICE_INVERTER:
+			hasInverter = true
             if (veDirectInverterService == "")
 				veDirectInverterService = service.name;
             break;;
@@ -1387,6 +1394,7 @@ OverviewPage {
         numberOfTemps = 0
         tempsModel.clear()
 		veDirectInverterService = ""
+		hasInverter = false
         for (var i = 0; i < DBusServices.count; i++)
         {
             addService(DBusServices.at(i))

diff --git a/FileSets/v3.40~27/OverviewHubEnhanced.qml b/FileSets/v3.40~27/OverviewHubEnhanced.qml
@@ -43,7 +43,8 @@ OverviewPage {
 	property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0
 	property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != ""
 	property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles
-	property bool showInverter: inverterService != "" || showAllTiles
+	property bool hasInverter: false
+	property bool showInverter: hasInverter || showAllTiles
 
 	property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid
 	property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid
@@ -1257,6 +1258,7 @@ OverviewPage {
 			tempsModel.append({serviceName: service.name})
 			break;;
 		case DBusService.DBUS_SERVICE_MULTI:
+			hasInverter = true
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
 			{
@@ -1266,13 +1268,16 @@ OverviewPage {
 			break;;
 //////// add for VE.Direct inverters
 		case DBusService.DBUS_SERVICE_INVERTER:
+			hasInverter = true
 			if (veDirectInverterService == "")
 				veDirectInverterService = service.name;
 			break;;
 
 //////// add for PV CHARGER voltage and current display
 		case DBusService.DBUS_SERVICE_SOLAR_CHARGER:
 		case DBusService.DBUS_SERVICE_MULTI_RS:
+			if ( service.type == DBUS_SERVICE_MULTI_RS )
+				hasInverter = true
 			numberOfPvChargers++
 			if (numberOfPvChargers === 1)
 				pvChargerPrefix1 = service.name;
@@ -1327,6 +1332,7 @@ OverviewPage {
 		numberOfPvInverters = 0
 		numberOfAlternators = 0
 		veDirectInverterService = ""
+		hasInverter = false
 		pvChargerPrefix1 = ""
 		pvChargerPrefix2 = ""
 		pvChargerPrefix3 = ""

diff --git a/FileSets/v3.40~8/OverviewFlowComplex.qml b/FileSets/v3.40~8/OverviewFlowComplex.qml
@@ -42,7 +42,9 @@ OverviewPage {
 	// for debug, ignore validity checks so all tiles and their flow lines will show
     property bool showAllTiles: showInactiveTilesItem.valid && showInactiveTilesItem.value == 3
 
-    property bool showInverter: inverterService != "" || showAllTiles
+	property bool hasInverter: false
+	property bool showInverter: hasInverter || showAllTiles
+
     property bool showLoadsOnOutput: showInverter || outputLoad.power.valid
     property bool showAcInput: isMulti || sys.acInput.power.valid || showAllTiles
 	property bool hasLoadsOnInput: showAcInput && ! combineAcLoads && (! loadsOnInputItem.valid || loadsOnInputItem.value === 1)
@@ -1358,18 +1360,23 @@ OverviewPage {
             tempsModel.append({serviceName: service.name})
             break;;
 
-        case DBusService.DBUS_SERVICE_MULTI:
+		case DBusService.DBUS_SERVICE_MULTI:
+			hasInverter = true
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
 			{
 				numberOfTemps++
 				tempsModel.append({serviceName: service.name})
 			}
             break;;
-        case DBusService.DBUS_SERVICE_INVERTER:
-            if (veDirectInverterService == "")
+		case DBusService.DBUS_SERVICE_MULTI_RS:
+			hasInverter = true
+			break;;
+		case DBusService.DBUS_SERVICE_INVERTER:
+			hasInverter = true
+			if (veDirectInverterService == "")
 				veDirectInverterService = service.name;
-            break;;
+			break;;
         case DBusService.DBUS_SERVICE_BATTERY:
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
@@ -1387,6 +1394,7 @@ OverviewPage {
         numberOfTemps = 0
         tempsModel.clear()
 		veDirectInverterService = ""
+		hasInverter = false
         for (var i = 0; i < DBusServices.count; i++)
         {
             addService(DBusServices.at(i))

diff --git a/FileSets/v3.40~8/OverviewHubEnhanced.qml b/FileSets/v3.40~8/OverviewHubEnhanced.qml
@@ -43,7 +43,8 @@ OverviewPage {
 	property double alternatorFlow: showAlternator ? noNoise (sys.alternator.power) : 0
 	property bool showAcLoads: isMulti || sys.acLoad.power.valid || veDirectInverterService != ""
 	property bool showDcSystem: (hasDcSystemItem.valid && hasDcSystemItem.value > 0) || showAllTiles
-	property bool showInverter: inverterService != "" || showAllTiles
+	property bool hasInverter: false
+	property bool showInverter: hasInverter || showAllTiles
 
 	property bool hasAcSolarOnAcIn1: sys.pvOnAcIn1.power.valid
 	property bool hasAcSolarOnAcIn2: sys.pvOnAcIn2.power.valid
@@ -1258,6 +1259,7 @@ OverviewPage {
 			tempsModel.append({serviceName: service.name})
 			break;;
 		case DBusService.DBUS_SERVICE_MULTI:
+			hasInverter = true
 			root.tempServiceName = service.name
 			if (temperatureItem.valid && showBatteryTemp)
 			{
@@ -1267,13 +1269,16 @@ OverviewPage {
 			break;;
 //////// add for VE.Direct inverters
 		case DBusService.DBUS_SERVICE_INVERTER:
+			hasInverter = true
 			if (veDirectInverterService == "")
 				veDirectInverterService = service.name;
 			break;;
 
 //////// add for PV CHARGER voltage and current display
 		case DBusService.DBUS_SERVICE_SOLAR_CHARGER:
 		case DBusService.DBUS_SERVICE_MULTI_RS:
+			if ( service.type == DBUS_SERVICE_MULTI_RS )
+				hasInverter = true
 			numberOfPvChargers++
 			if (numberOfPvChargers === 1)
 				pvChargerPrefix1 = service.name;
@@ -1328,6 +1333,7 @@ OverviewPage {
 		numberOfPvInverters = 0
 		numberOfAlternators = 0
 		veDirectInverterService = ""
+		hasInverter = false
 		pvChargerPrefix1 = ""
 		pvChargerPrefix2 = ""
 		pvChargerPrefix3 = ""

diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v10.41:
+	fixed: multi tile is sometimes hidden when inverter switches off
+
 v10.40:
 	add support for v3.40~27
 

diff --git a/version b/version
@@ -1 +1 @@
-v10.40
+v10.41