simplified PowerGauge code added for PV Inverters

kwindrem · May 15, 2024 · 7ee9633 · 7ee9633
1 parent c007406
commit 7ee9633
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/FileSets/v2.73/PowerGauge.qml b/FileSets/v2.73/PowerGauge.qml
@@ -39,7 +39,9 @@ Item {
 
 	property real inPowerLimit: sys.acInput.inCurrentLimit.valid ? sys.acInput.inCurrentLimit.value * sys.acInput.voltageL1.value : 0
 
-	property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0 + maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+	property real maxForwardPower1: maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0
+	property real maxForwardPower2: maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+	property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardPower1 + maxForwardPower2
 	property real maxReverseLimit: maxReverseLimitItem.valid ? maxReverseLimitItem.value : 0
 	// overload range is 10% of forward to reverse limits
 	property real overload: (maxForwardLimit + maxReverseLimit) * 0.1

diff --git a/FileSets/v3.01/PowerGauge.qml b/FileSets/v3.01/PowerGauge.qml
@@ -37,7 +37,9 @@ Item {
 
     property real inPowerLimit: sys.acInput.inCurrentLimit.valid ? sys.acInput.inCurrentLimit.value * sys.acInput.voltageL1.value : 0
 
-	property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0 + maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+	property real maxForwardPower1: maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0
+	property real maxForwardPower2: maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+	property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardPower1 + maxForwardPower2
     property real maxReverseLimit: maxReverseLimitItem.valid ? maxReverseLimitItem.value : 0
 	// overload range is 10% of forward to reverse limits
 	property real overload: (maxForwardLimit + maxReverseLimit) * 0.1

diff --git a/FileSets/v3.40~13/PowerGauge.qml b/FileSets/v3.40~13/PowerGauge.qml
@@ -40,7 +40,9 @@ Item {
 
     property real inPowerLimit: sys.acInput.inCurrentLimit.valid ? sys.acInput.inCurrentLimit.value * sys.acInput.voltageL1.value : 0
 
-    property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0 + maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+	property real maxForwardPower1: maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0
+	property real maxForwardPower2: maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+    property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardPower1 + maxForwardPower2
     property real maxReverseLimit: maxReverseLimitItem.valid ? maxReverseLimitItem.value : 0
 	// overload range is 10% of forward to reverse limits
 	property real overload: (maxForwardLimit + maxReverseLimit) * 0.1

diff --git a/FileSets/v3.40~8/PowerGauge.qml b/FileSets/v3.40~8/PowerGauge.qml
@@ -40,7 +40,9 @@ Item {
 
     property real inPowerLimit: sys.acInput.inCurrentLimit.valid ? sys.acInput.inCurrentLimit.value * sys.acInput.voltageL1.value : 0
 
-	property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0 + maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+	property real maxForwardPower1: maxForwardLimitItem.valid ? maxForwardLimitItem.value : 0
+	property real maxForwardPower2: maxForwardLimitItem2.valid ? maxForwardLimitItem2.value : 0
+	property real maxForwardLimit: useInputCurrentLimit ? inPowerLimit : maxForwardPower1 + maxForwardPower2
     property real maxReverseLimit: maxReverseLimitItem.valid ? maxReverseLimitItem.value : 0
 	// overload range is 10% of forward to reverse limits
 	property real overload: (maxForwardLimit + maxReverseLimit) * 0.1

diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v10.29:
+	simplified PowerGauge code added for PV Inverters
+
 v10.28:
 	fixed: PV Inverter detail page not looking at phase count
 	fixed: PV Inverter detail page columns run together

diff --git a/version b/version
@@ -1 +1 @@
-v10.28
+v10.29