Returned to on status being displayed with a special case for dimming

Dimming now shows percentage in on or output fault mode
victronenergy · Feb 20, 2025 · 56a0a54 · 56a0a54
1 parent dbdcc95
commit 56a0a54
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/data/Switches.qml b/data/Switches.qml
@@ -81,13 +81,10 @@ QtObject {
 
 		case VenusOS.Switch_Status_Powered:
 		case VenusOS.Switch_Status_On:
+		case VenusOS.Switch_Status_Output_Fault:
 			if (text) return switchGreenText
 				else return switchGreenStatus
 
-		case VenusOS.Switch_Status_Output_Fault:
-			if (text) return switchYellowText
-				else return switchYellowStatus
-
 		case VenusOS.Switch_Status_Over_Temperature:
 		case VenusOS.Switch_Status_Short_Fault:
 		case VenusOS.Switch_Status_Tripped:

diff --git a/pages/switch/SwitchDelegate.qml b/pages/switch/SwitchDelegate.qml
@@ -67,19 +67,25 @@ Item {
 
 			Rectangle {
 				id: statusRect
+				property bool showPercentage: (switchData._function.value === VenusOS.Switch_Function_Dimmable)
+												&& ((switchData._status.value === VenusOS.Switch_Status_On)
+												|| (switchData._status.value === VenusOS.Switch_Status_Output_Fault))
 				visible: !((switchData._status.value === VenusOS.Switch_Status_Off)
-					|| (switchData._status.value === VenusOS.Switch_Status_On)
-					|| (switchData._status.value === VenusOS.Switch_Status_Powered)
-					|| ((switchData._status.value === VenusOS.Switch_Status_Output_Fault) && (switchData._function.value === VenusOS.Switch_Function_Dimmable)))
+					|| (switchData._status.value === VenusOS.Switch_Status_Powered))
 				width: childrenRect.width < 80 ? 100 : childrenRect.width + 20
 				height: 25
 				radius: height/2
-				color: Global.switches.switchStatusToColor(switchData._status.value, false)
+				color: showPercentage
+						? Global.switches.switchStatusToColor(VenusOS.Switch_Status_On, false)
+						: Global.switches.switchStatusToColor(switchData._status.value, false)
 				Text {
 					id: childText
 					anchors.centerIn: parent
-					color: Global.switches.switchStatusToColor(switchData._status.value,true)//Qt.colorEqual(statusRect.color,"WHITE") ? "BLACK": "WHITE"
-					text: Global.switches.switchStatusToText(switchData._status.value)
+					color: statusRect.showPercentage
+							 ? Global.switches.switchStatusToColor(VenusOS.Switch_Status_On, true)
+							 : Global.switches.switchStatusToColor(switchData._status.value,true)
+					text: statusRect.showPercentage
+							? switchData._dimming.value + "%" :Global.switches.switchStatusToText(switchData._status.value)
 				}
 			}
 		}