Multi LEDs with text for better understanding; show AC input current …

…limit even if AC source active

FileSets/LedText.qml

@@ -0,0 +1,65 @@
+import QtQuick 1.1
+
+Text {
+	id: root
+
+	property alias item: vItem
+	property alias bind: vItem.bind
+	property int value: item.valid ? item.value : 0
+	property string onColor: "#fff930"
+	property string offColor: "black"
+	property bool pulse: false
+	property bool isOn: false
+
+	horizontalAlignment: Text.AlignHCenter
+	font.pixelSize: 12
+	color: isOn ? onColor : offColor
+	font.bold: true
+
+	onValueChanged: {
+		switch (value) {
+		case 0 :
+			state = "off"
+			break;
+		case 1:
+			state = "on"
+			break;
+		case 2:
+			state = "blink"
+			break;
+		case 3:
+			state = "blinkInverted"
+			break;
+		}
+	}
+
+	VBusItem { id: vItem }
+
+	Timer {
+		id: _timer
+		interval: 500
+		running: item.value > 0
+		repeat: true
+		onTriggered: pulse = !pulse
+	}
+
+	states: [
+			State {
+				name: "off"
+				PropertyChanges { target: root; color : offColor }
+			},
+			State {
+				name: "on"
+				PropertyChanges { target: root; color : onColor }
+			},
+			State {
+				name: "blink"
+				PropertyChanges { target: root; color: pulse ? onColor : offColor }
+			},
+			State {
+				name: "blinkInverted"
+				PropertyChanges { target: root; isOn: !pulse ? onColor : offColor }
+			}
+		]
+}
+

FileSets/MultiEnhanced.qml

@@ -104,51 +104,75 @@ MbIcon {
     }
 
 	Column {
-		spacing: 3
+		spacing: 0
 		x: 26
-		y: 62
+		y: 58
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Mains")
+			text: qsTr("AC In")
+			font.pixelSize: 8
 			onColor: "#68FF00"
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Bulk")
+			text: qsTr("Bulk")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Absorption")
+			text: qsTr("Abs")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Float")
+			text: qsTr("Float")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 	}
 
 	Column {
-		spacing: 3
-		x: multi.width - 28
-		y: 62
+		spacing: 0
+		x: multi.width - 37
+		y: 58
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Inverter")
 			onColor: "#68FF00"
+			text: qsTr("Invert")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Overload")
 			onColor: "#F75E25"
+			text: qsTr("O / L")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/LowBattery")
 			onColor: "#F75E25"
+			text: qsTr("Bat")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Temperature")
 			onColor: "#F75E25"
+			text: qsTr("Temp")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 	}
 

FileSets/MultiEnhancedGP.qml

@@ -104,51 +104,75 @@ MbIcon {
     }
 
 	Column {
-		spacing: 3
+		spacing: 0
 		x: 26
-		y: 62
+		y: 58
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Mains")
+			text: qsTr("AC In")
+			font.pixelSize: 8
 			onColor: "#68FF00"
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Bulk")
+			text: qsTr("Bulk")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Absorption")
+			text: qsTr("Abs")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Float")
+			text: qsTr("Float")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 	}
 
 	Column {
-		spacing: 3
-		x: multi.width - 28
-		y: 62
+		spacing: 0
+		x: multi.width - 37
+		y: 58
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Inverter")
 			onColor: "#68FF00"
+			text: qsTr("Invert")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Overload")
 			onColor: "#F75E25"
+			text: qsTr("O / L")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/LowBattery")
 			onColor: "#F75E25"
+			text: qsTr("Bat")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 
-		Led {
+		LedText {
 			bind: Utils.path(inverterService, "/Leds/Temperature")
 			onColor: "#F75E25"
+			text: qsTr("Temp")
+			font.pixelSize: 8
+			width: 10; height: 8
 		}
 	}
 

FileSets/OverviewAcValuesEnhanced.qml

@@ -30,20 +30,19 @@ Item {
 ////// modified to show power bar graphs
 			font.pixelSize: 19
             height: 21
-            visible: phaseCount >= 1
 		}
 
         // voltage for single leg
         TileText {
             text: EnhFmt.formatVBusItem (root.connection.voltageL1, "V")
-            visible: phaseCount === 1
+            visible: phaseCount <= 1
             font.pixelSize: 15
         }
         // current for single leg
         TileText {
             text: EnhFmt.formatVBusItem (root.connection.currentL1, "A")
             font.pixelSize: 15
-            visible: phaseCount === 1
+            visible: phaseCount <= 1
         }
 
         // power, voltage and current for multiple legs
@@ -89,7 +88,7 @@ Item {
         TileText {
             text: qsTr("Limit: ") + EnhFmt.formatVBusItem (root.connection.inCurrentLimit)
             font.pixelSize: phaseCount >= 2 ? 11 : 15
-            visible: phaseCount >= 1 && root.connection == sys.acInput
+            visible: root.connection == sys.acInput
         }
     }
 }

FileSets/fileList

@@ -44,3 +44,4 @@
 /opt/victronenergy/gui/qml/DetailLoadsOnOutput.qml
 /opt/victronenergy/gui/qml/PowerGauge.qml
 /opt/victronenergy/gui/qml/DetailInverter.qml
+

FileSets/v2.71/MbEditBox.qml

@@ -1 +1 @@
-../v3.20~9/MbEditBox.qml
+../v3.20~13/MbEditBox.qml

FileSets/v2.71/MbEditBoxDateTime.qml

@@ -1 +1 @@
-../v3.20~9/MbEditBoxDateTime.qml
+../v3.20~13/MbEditBoxDateTime.qml

FileSets/v2.71/MbSubMenu.qml

@@ -1 +1 @@
-../v3.20~9/MbSubMenu.qml
+../v3.20~13/MbSubMenu.qml

FileSets/v2.71/Multi.qml

@@ -1 +1 @@
-../v3.20~9/Multi.qml
+../v3.20~13/Multi.qml

FileSets/v2.71/OverviewBox.qml

@@ -1 +1 @@
-../v3.20~9/OverviewBox.qml
+../v3.20~13/OverviewBox.qml

FileSets/v2.71/OverviewConnection.qml

@@ -1 +1 @@
-../v3.20~9/OverviewConnection.qml
+../v3.20~13/OverviewConnection.qml

FileSets/v2.71/OverviewConnectionEnd.qml

@@ -1 +1 @@
-../v3.20~9/OverviewConnectionEnd.qml
+../v3.20~13/OverviewConnectionEnd.qml

FileSets/v2.71/OverviewSolarCharger.qml

@@ -1 +1 @@
-../v3.20~9/OverviewSolarCharger.qml
+../v3.20~13/OverviewSolarCharger.qml

FileSets/v2.71/OverviewTankDelegate.qml

@@ -1 +1 @@
-../v3.20~9/OverviewTankDelegate.qml
+../v3.20~13/OverviewTankDelegate.qml

FileSets/v2.71/OverviewTanks.qml

@@ -1 +1 @@
-../v3.20~9/OverviewTanks.qml
+../v3.20~13/OverviewTanks.qml

FileSets/v2.71/TileText.qml

@@ -1 +1 @@
-../v3.20~9/TileText.qml
+../v3.20~13/TileText.qml

FileSets/v2.71/styles.css

@@ -1 +1 @@
-../v3.20~9/styles.css
+../v3.20~13/styles.css

FileSets/v2.72/MbEditBox.qml

@@ -1 +1 @@
-../v3.20~9/MbEditBox.qml
+../v3.20~13/MbEditBox.qml

FileSets/v2.72/MbEditBoxDateTime.qml

@@ -1 +1 @@
-../v3.20~9/MbEditBoxDateTime.qml
+../v3.20~13/MbEditBoxDateTime.qml

FileSets/v2.72/MbSubMenu.qml

@@ -1 +1 @@
-../v3.20~9/MbSubMenu.qml
+../v3.20~13/MbSubMenu.qml

FileSets/v2.72/Multi.qml

@@ -1 +1 @@
-../v3.20~9/Multi.qml
+../v3.20~13/Multi.qml

FileSets/v2.72/OverviewBox.qml

@@ -1 +1 @@
-../v3.20~9/OverviewBox.qml
+../v3.20~13/OverviewBox.qml

FileSets/v2.72/OverviewConnection.qml

@@ -1 +1 @@
-../v3.20~9/OverviewConnection.qml
+../v3.20~13/OverviewConnection.qml

FileSets/v2.72/OverviewConnectionEnd.qml

@@ -1 +1 @@
-../v3.20~9/OverviewConnectionEnd.qml
+../v3.20~13/OverviewConnectionEnd.qml

FileSets/v2.72/OverviewSolarCharger.qml

@@ -1 +1 @@
-../v3.20~9/OverviewSolarCharger.qml
+../v3.20~13/OverviewSolarCharger.qml

FileSets/v2.72/OverviewTankDelegate.qml

@@ -1 +1 @@
-../v3.20~9/OverviewTankDelegate.qml
+../v3.20~13/OverviewTankDelegate.qml

FileSets/v2.72/OverviewTanks.qml

@@ -1 +1 @@
-../v3.20~9/OverviewTanks.qml
+../v3.20~13/OverviewTanks.qml

FileSets/v2.72/TileText.qml

@@ -1 +1 @@
-../v3.20~9/TileText.qml
+../v3.20~13/TileText.qml