add renewable energy control in Inverter Detail page + more

fixed: renewable battery icon not shown on AC and DC coupled flow overviews added support for v3.00~32 which includes fast updates for older grid meters fast updates in v3.00 released version are only for newer grid meters add support for v3.10~33
kwindrem · Sep 1, 2023 · cefb11d · cefb11d
1 parent 60299c4
commit cefb11d
Show file tree

Hide file tree

Showing 2,007 changed files with 62,829 additions and 33,904 deletions.
diff --git a/FileSets/enhancedFormat.js b/FileSets/enhancedFormat.js
@@ -1,21 +1,24 @@
 //// For GuiMods GUI
 //
 // formats values to varying resolution depending on the value
-// the global variable killowattThreshold specifies the transition between units an K units
+// the global variable sys.kilowattThreshold specifies the transition between units an K units
 // item is a VBusItem
 // unit is an optional string ("W", "A", "V", etc appended to the value
 // if unit is omitted, VBusItem unit is used
 // to disable the VBusItem unit specify "", or some other value
-// note if you need to specify a threshold, you must also specify a unit !
 
 // functions that take a value can be used when a VBusItem doesn't provide the value
-// if no unit is provided, no unit is displayed
-// for value > 1000, only K is then displayed
+// for value > 1000, only K will always be displayed even if the unit is blank
+
+// the optional precision parameter always displays the value to the indicated number of decimal point
+//		(e.g, 2 would display 12.34)
+// scaling to kilo values is disabled
+// you must specify a unit if precision is needed !!!
 
 // the ...Abs versions always display a postive number
 //	used when a direction indicator is also displayed
 
-function formatValue (value, unit)
+function formatValue (value, unit, precision)
 {
 	if (unit == undefined)
 		unit = ""
@@ -26,48 +29,56 @@ function formatValue (value, unit)
 	else
 		threshold = sys.kilowattThreshold
 
+
 	if (threshold == 0 || (value >= 0 && value < threshold) || (value < 0 && value > -threshold))
 	{
-		if (value >= 100 || value <= -100)
+		if (precision != undefined)
+			return value.toFixed (precision) + " " + unit
+		else if (value >= 100 || value <= -100)
 			return value.toFixed (0) + " " + unit
 		else
 			return value.toFixed (1) + " " + unit
 	}
-	else if (value >= 10000 || value <= -10000)
-		return (value/1000).toFixed (1) + " K" + unit
 	else
-		return (value/1000).toFixed (2) + " K" + unit
+	{
+		if (precision != undefined)
+			return value.toFixed (precision) + " " + unit
+		else if (value >= 10000 || value <= -10000)
+			return (value/1000).toFixed (1) + " K" + unit
+		else
+			return (value/1000).toFixed (2) + " K" + unit
+	}
 }
 
-function formatValueAbs (value, unit)
+function formatValueAbs (value, unit, precision)
 {
 	if (unit == undefined)
 		unit = ""
 	if ( value < 0)
 		value = -value
-	return formatValue (value, unit)
+	return formatValue (value, unit, precision)
 }
 
-function formatVBusItem (item, unit)
+function formatVBusItem (item, unit, precision)
 {
 	if (item.valid)
 	{
 		if (unit == undefined)
 			unit = item.unit
-		return formatValue (item.value, unit)
+		return formatValue (item.value, unit, precision)
 	}
 	else
 		return ""
 }
 
-function formatVBusItemAbs (item, unit)
+function formatVBusItemAbs (item, unit, precision)
 {
 	var value
 	if (item.valid)
 	{
 		if (unit == undefined)
 			unit = item.unit
-		return formatValueAbs (item.value, unit)
+		return formatValueAbs (item.value, unit, precision)
 	}
 	else
 		return ""

diff --git a/FileSets/overview-renewable-light.svg b/FileSets/overview-renewable-light.svg
diff --git a/FileSets/v2.71/Battery.qml b/FileSets/v2.71/Battery.qml
@@ -0,0 +1 @@
+../v3.00~32/Battery.qml
diff --git a/FileSets/v3.10~20/UNUSED_FILE_SET → FileSets/v2.71/COMPLETE b/FileSets/v3.10~20/UNUSED_FILE_SET → FileSets/v2.71/COMPLETE
diff --git a/FileSets/v2.71/DetailAcInput.qml b/FileSets/v2.71/DetailAcInput.qml
@@ -0,0 +1 @@
+../v2.73/DetailAcInput.qml
diff --git a/FileSets/v2.71/DetailInverter.qml b/FileSets/v2.71/DetailInverter.qml
@@ -0,0 +1 @@
+../v2.73/DetailInverter.qml
diff --git a/FileSets/v2.71/DetailLoadsCombined.qml b/FileSets/v2.71/DetailLoadsCombined.qml
@@ -0,0 +1 @@
+../v2.73/DetailLoadsCombined.qml
diff --git a/FileSets/v2.71/DetailLoadsOnInput.qml b/FileSets/v2.71/DetailLoadsOnInput.qml
@@ -0,0 +1 @@
+../v2.73/DetailLoadsOnInput.qml
diff --git a/FileSets/v2.71/DetailLoadsOnOutput.qml b/FileSets/v2.71/DetailLoadsOnOutput.qml
@@ -0,0 +1 @@
+../v2.73/DetailLoadsOnOutput.qml
diff --git a/FileSets/v2.71/HubData.qml b/FileSets/v2.71/HubData.qml
@@ -0,0 +1 @@
+../v2.73/HubData.qml
diff --git a/FileSets/v2.71/MarqueeEnhanced.qml b/FileSets/v2.71/MarqueeEnhanced.qml
@@ -0,0 +1 @@
+../v3.10~33/MarqueeEnhanced.qml
diff --git a/FileSets/v2.71/MbEditBox.qml b/FileSets/v2.71/MbEditBox.qml
@@ -0,0 +1 @@
+../v3.10~33/MbEditBox.qml
diff --git a/FileSets/v2.71/MbEditBoxDateTime.qml b/FileSets/v2.71/MbEditBoxDateTime.qml
@@ -0,0 +1 @@
+../v3.10~33/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.71/MbItem.qml b/FileSets/v2.71/MbItem.qml
@@ -0,0 +1 @@
+../v2.94/MbItem.qml
diff --git a/FileSets/v2.71/MbSpinBox.qml b/FileSets/v2.71/MbSpinBox.qml
@@ -0,0 +1 @@
+../v2.73/MbSpinBox.qml
diff --git a/FileSets/v2.71/MbStyle.qml b/FileSets/v2.71/MbStyle.qml
@@ -0,0 +1 @@
+../v2.94/MbStyle.qml
diff --git a/FileSets/v2.71/MbSubMenu.qml b/FileSets/v2.71/MbSubMenu.qml
@@ -0,0 +1 @@
+../v3.10~33/MbSubMenu.qml
diff --git a/FileSets/v2.71/Multi.qml b/FileSets/v2.71/Multi.qml
@@ -0,0 +1 @@
+../v3.10~33/Multi.qml
diff --git a/FileSets/v2.71/ObjectAcConnection.qml b/FileSets/v2.71/ObjectAcConnection.qml
@@ -0,0 +1 @@
+../v2.73/ObjectAcConnection.qml
diff --git a/FileSets/v2.71/OverviewBox.qml b/FileSets/v2.71/OverviewBox.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewBox.qml
diff --git a/FileSets/v2.71/OverviewConnection.qml b/FileSets/v2.71/OverviewConnection.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewConnection.qml
diff --git a/FileSets/v2.71/OverviewConnectionEnd.qml b/FileSets/v2.71/OverviewConnectionEnd.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.71/OverviewFlowComplex.qml b/FileSets/v2.71/OverviewFlowComplex.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewFlowComplex.qml
diff --git a/FileSets/v2.71/OverviewGeneratorEnhanced.qml b/FileSets/v2.71/OverviewGeneratorEnhanced.qml
@@ -0,0 +1 @@
+../v2.94/OverviewGeneratorEnhanced.qml
diff --git a/FileSets/v2.71/OverviewGeneratorRelayEnhanced.qml b/FileSets/v2.71/OverviewGeneratorRelayEnhanced.qml
@@ -0,0 +1 @@
+../v2.89/OverviewGeneratorRelayEnhanced.qml
diff --git a/FileSets/v2.71/OverviewGridParallel.qml b/FileSets/v2.71/OverviewGridParallel.qml
@@ -0,0 +1 @@
+../v3.10~16/OverviewGridParallel.qml
diff --git a/FileSets/v2.71/OverviewHub.qml b/FileSets/v2.71/OverviewHub.qml
@@ -0,0 +1 @@
+../v2.73/OverviewHub.qml
diff --git a/FileSets/v2.71/OverviewHubEnhanced.qml b/FileSets/v2.71/OverviewHubEnhanced.qml
@@ -0,0 +1 @@
+../v2.73/OverviewHubEnhanced.qml
diff --git a/FileSets/v2.71/OverviewMobileEnhanced.qml b/FileSets/v2.71/OverviewMobileEnhanced.qml
@@ -0,0 +1 @@
+../v2.73/OverviewMobileEnhanced.qml
diff --git a/FileSets/v2.71/OverviewSolarCharger.qml b/FileSets/v2.71/OverviewSolarCharger.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewSolarCharger.qml
diff --git a/FileSets/v2.71/OverviewSolarInverter.qml b/FileSets/v2.71/OverviewSolarInverter.qml
@@ -0,0 +1 @@
+../v3.00~32/OverviewSolarInverter.qml
diff --git a/FileSets/v2.71/OverviewTankDelegate.qml b/FileSets/v2.71/OverviewTankDelegate.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewTankDelegate.qml
diff --git a/FileSets/v2.71/OverviewTanks.qml b/FileSets/v2.71/OverviewTanks.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewTanks.qml
diff --git a/FileSets/v2.71/OverviewTanksTempsDigInputs.qml b/FileSets/v2.71/OverviewTanksTempsDigInputs.qml
@@ -0,0 +1 @@
+../v2.73/OverviewTanksTempsDigInputs.qml
diff --git a/FileSets/v2.71/PageGenerator.qml b/FileSets/v2.71/PageGenerator.qml
@@ -0,0 +1 @@
+../v2.94/PageGenerator.qml
diff --git a/FileSets/v2.71/PageMain.qml b/FileSets/v2.71/PageMain.qml
@@ -0,0 +1 @@
+../v2.73/PageMain.qml
diff --git a/FileSets/v2.71/PageSettingsDisplay.qml b/FileSets/v2.71/PageSettingsDisplay.qml
@@ -0,0 +1 @@
+../v2.89/PageSettingsDisplay.qml
diff --git a/FileSets/v2.71/PageSettingsGenerator.qml b/FileSets/v2.71/PageSettingsGenerator.qml
@@ -0,0 +1 @@
+../v2.89/PageSettingsGenerator.qml
diff --git a/FileSets/v2.71/PageSettingsGuiMods.qml b/FileSets/v2.71/PageSettingsGuiMods.qml
@@ -0,0 +1 @@
+../v2.73/PageSettingsGuiMods.qml
diff --git a/FileSets/v2.71/PageSettingsRelay.qml b/FileSets/v2.71/PageSettingsRelay.qml
@@ -0,0 +1 @@
+../v2.73/PageSettingsRelay.qml
diff --git a/FileSets/v2.71/PowerGauge.qml b/FileSets/v2.71/PowerGauge.qml
@@ -0,0 +1 @@
+../v2.73/PowerGauge.qml
diff --git a/FileSets/v2.71/Tile.qml b/FileSets/v2.71/Tile.qml
@@ -0,0 +1 @@
+../v2.94/Tile.qml
diff --git a/FileSets/v2.71/TileDigIn.qml b/FileSets/v2.71/TileDigIn.qml
@@ -0,0 +1 @@
+../v2.73/TileDigIn.qml
diff --git a/FileSets/v2.71/TileRelay.qml b/FileSets/v2.71/TileRelay.qml
@@ -0,0 +1 @@
+../v2.89/TileRelay.qml
diff --git a/FileSets/v2.71/TileTankEnhanced.qml b/FileSets/v2.71/TileTankEnhanced.qml
@@ -0,0 +1 @@
+../v3.10~33/TileTankEnhanced.qml
diff --git a/FileSets/v2.71/TileText.qml b/FileSets/v2.71/TileText.qml
@@ -0,0 +1 @@
+../v3.10~33/TileText.qml
diff --git a/FileSets/v2.71/dbus_generator.py b/FileSets/v2.71/dbus_generator.py
@@ -0,0 +1 @@
+../v2.73/dbus_generator.py
diff --git a/FileSets/v2.71/dbus_systemcalc.py b/FileSets/v2.71/dbus_systemcalc.py
@@ -0,0 +1 @@
+../v2.73/dbus_systemcalc.py
diff --git a/FileSets/v2.71/main.qml b/FileSets/v2.71/main.qml
@@ -0,0 +1 @@
+../v2.89/main.qml
diff --git a/FileSets/v2.71/startstop.py b/FileSets/v2.71/startstop.py
@@ -0,0 +1 @@
+../v2.73/startstop.py
diff --git a/FileSets/v2.71/styles.css b/FileSets/v2.71/styles.css
@@ -0,0 +1 @@
+../v3.10~33/styles.css
diff --git a/FileSets/v2.72/Battery.qml b/FileSets/v2.72/Battery.qml
@@ -0,0 +1 @@
+../v3.00~32/Battery.qml
diff --git a/FileSets/v3.10~21/UNUSED_FILE_SET → FileSets/v2.72/COMPLETE b/FileSets/v3.10~21/UNUSED_FILE_SET → FileSets/v2.72/COMPLETE
diff --git a/FileSets/v2.72/DetailAcInput.qml b/FileSets/v2.72/DetailAcInput.qml
@@ -0,0 +1 @@
+../v2.73/DetailAcInput.qml
diff --git a/FileSets/v2.72/DetailInverter.qml b/FileSets/v2.72/DetailInverter.qml
@@ -0,0 +1 @@
+../v2.73/DetailInverter.qml
diff --git a/FileSets/v2.72/DetailLoadsCombined.qml b/FileSets/v2.72/DetailLoadsCombined.qml
@@ -0,0 +1 @@
+../v2.73/DetailLoadsCombined.qml
diff --git a/FileSets/v2.72/DetailLoadsOnInput.qml b/FileSets/v2.72/DetailLoadsOnInput.qml
@@ -0,0 +1 @@
+../v2.73/DetailLoadsOnInput.qml
diff --git a/FileSets/v2.72/DetailLoadsOnOutput.qml b/FileSets/v2.72/DetailLoadsOnOutput.qml
@@ -0,0 +1 @@
+../v2.73/DetailLoadsOnOutput.qml
diff --git a/FileSets/v2.72/HubData.qml b/FileSets/v2.72/HubData.qml
@@ -0,0 +1 @@
+../v2.73/HubData.qml
diff --git a/FileSets/v2.72/MarqueeEnhanced.qml b/FileSets/v2.72/MarqueeEnhanced.qml
@@ -0,0 +1 @@
+../v3.10~33/MarqueeEnhanced.qml
diff --git a/FileSets/v2.72/MbEditBox.qml b/FileSets/v2.72/MbEditBox.qml
@@ -0,0 +1 @@
+../v3.10~33/MbEditBox.qml
diff --git a/FileSets/v2.72/MbEditBoxDateTime.qml b/FileSets/v2.72/MbEditBoxDateTime.qml
@@ -0,0 +1 @@
+../v3.10~33/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.72/MbItem.qml b/FileSets/v2.72/MbItem.qml
@@ -0,0 +1 @@
+../v2.94/MbItem.qml
diff --git a/FileSets/v2.72/MbSpinBox.qml b/FileSets/v2.72/MbSpinBox.qml
@@ -0,0 +1 @@
+../v2.73/MbSpinBox.qml
diff --git a/FileSets/v2.72/MbStyle.qml b/FileSets/v2.72/MbStyle.qml
@@ -0,0 +1 @@
+../v2.94/MbStyle.qml
diff --git a/FileSets/v2.72/MbSubMenu.qml b/FileSets/v2.72/MbSubMenu.qml
@@ -0,0 +1 @@
+../v3.10~33/MbSubMenu.qml
diff --git a/FileSets/v2.72/Multi.qml b/FileSets/v2.72/Multi.qml
@@ -0,0 +1 @@
+../v3.10~33/Multi.qml
diff --git a/FileSets/v2.72/ObjectAcConnection.qml b/FileSets/v2.72/ObjectAcConnection.qml
@@ -0,0 +1 @@
+../v2.73/ObjectAcConnection.qml
diff --git a/FileSets/v2.72/OverviewBox.qml b/FileSets/v2.72/OverviewBox.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewBox.qml
diff --git a/FileSets/v2.72/OverviewConnection.qml b/FileSets/v2.72/OverviewConnection.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewConnection.qml
diff --git a/FileSets/v2.72/OverviewConnectionEnd.qml b/FileSets/v2.72/OverviewConnectionEnd.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.72/OverviewFlowComplex.qml b/FileSets/v2.72/OverviewFlowComplex.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewFlowComplex.qml
diff --git a/FileSets/v2.72/OverviewGeneratorEnhanced.qml b/FileSets/v2.72/OverviewGeneratorEnhanced.qml
@@ -0,0 +1 @@
+../v2.94/OverviewGeneratorEnhanced.qml
diff --git a/FileSets/v2.72/OverviewGeneratorRelayEnhanced.qml b/FileSets/v2.72/OverviewGeneratorRelayEnhanced.qml
@@ -0,0 +1 @@
+../v2.89/OverviewGeneratorRelayEnhanced.qml
diff --git a/FileSets/v2.72/OverviewGridParallel.qml b/FileSets/v2.72/OverviewGridParallel.qml
@@ -0,0 +1 @@
+../v3.10~16/OverviewGridParallel.qml
diff --git a/FileSets/v2.72/OverviewHub.qml b/FileSets/v2.72/OverviewHub.qml
@@ -0,0 +1 @@
+../v2.73/OverviewHub.qml
diff --git a/FileSets/v2.72/OverviewHubEnhanced.qml b/FileSets/v2.72/OverviewHubEnhanced.qml
@@ -0,0 +1 @@
+../v2.73/OverviewHubEnhanced.qml
diff --git a/FileSets/v2.72/OverviewMobileEnhanced.qml b/FileSets/v2.72/OverviewMobileEnhanced.qml
@@ -0,0 +1 @@
+../v2.73/OverviewMobileEnhanced.qml
diff --git a/FileSets/v2.72/OverviewSolarCharger.qml b/FileSets/v2.72/OverviewSolarCharger.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewSolarCharger.qml
diff --git a/FileSets/v2.72/OverviewSolarInverter.qml b/FileSets/v2.72/OverviewSolarInverter.qml
@@ -0,0 +1 @@
+../v3.00~32/OverviewSolarInverter.qml
diff --git a/FileSets/v2.72/OverviewTankDelegate.qml b/FileSets/v2.72/OverviewTankDelegate.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewTankDelegate.qml
diff --git a/FileSets/v2.72/OverviewTanks.qml b/FileSets/v2.72/OverviewTanks.qml
@@ -0,0 +1 @@
+../v3.10~33/OverviewTanks.qml
diff --git a/FileSets/v2.72/OverviewTanksTempsDigInputs.qml b/FileSets/v2.72/OverviewTanksTempsDigInputs.qml
@@ -0,0 +1 @@
+../v2.73/OverviewTanksTempsDigInputs.qml
diff --git a/FileSets/v2.72/PageGenerator.qml b/FileSets/v2.72/PageGenerator.qml
@@ -0,0 +1 @@
+../v2.94/PageGenerator.qml
diff --git a/FileSets/v2.72/PageMain.qml b/FileSets/v2.72/PageMain.qml
@@ -0,0 +1 @@
+../v2.73/PageMain.qml
diff --git a/FileSets/v2.72/PageSettingsDisplay.qml b/FileSets/v2.72/PageSettingsDisplay.qml
@@ -0,0 +1 @@
+../v2.89/PageSettingsDisplay.qml
diff --git a/FileSets/v2.72/PageSettingsGenerator.qml b/FileSets/v2.72/PageSettingsGenerator.qml
@@ -0,0 +1 @@
+../v2.89/PageSettingsGenerator.qml
diff --git a/FileSets/v2.72/PageSettingsGuiMods.qml b/FileSets/v2.72/PageSettingsGuiMods.qml
@@ -0,0 +1 @@
+../v2.73/PageSettingsGuiMods.qml
diff --git a/FileSets/v2.72/PageSettingsRelay.qml b/FileSets/v2.72/PageSettingsRelay.qml
@@ -0,0 +1 @@
+../v2.73/PageSettingsRelay.qml
diff --git a/FileSets/v2.72/PowerGauge.qml b/FileSets/v2.72/PowerGauge.qml
@@ -0,0 +1 @@
+../v2.73/PowerGauge.qml
diff --git a/FileSets/v2.72/Tile.qml b/FileSets/v2.72/Tile.qml
@@ -0,0 +1 @@
+../v2.94/Tile.qml
diff --git a/FileSets/v2.72/TileDigIn.qml b/FileSets/v2.72/TileDigIn.qml
@@ -0,0 +1 @@
+../v2.73/TileDigIn.qml
diff --git a/FileSets/v2.72/TileRelay.qml b/FileSets/v2.72/TileRelay.qml
@@ -0,0 +1 @@
+../v2.89/TileRelay.qml
diff --git a/FileSets/v2.72/TileTankEnhanced.qml b/FileSets/v2.72/TileTankEnhanced.qml
@@ -0,0 +1 @@
+../v3.10~33/TileTankEnhanced.qml
diff --git a/FileSets/v2.72/TileText.qml b/FileSets/v2.72/TileText.qml
@@ -0,0 +1 @@
+../v3.10~33/TileText.qml
diff --git a/FileSets/v2.72/dbus_generator.py b/FileSets/v2.72/dbus_generator.py
@@ -0,0 +1 @@
+../v2.73/dbus_generator.py
diff --git a/FileSets/v2.72/dbus_systemcalc.py b/FileSets/v2.72/dbus_systemcalc.py
@@ -0,0 +1 @@
+../v2.73/dbus_systemcalc.py
diff --git a/FileSets/v2.72/main.qml b/FileSets/v2.72/main.qml
@@ -0,0 +1 @@
+../v2.89/main.qml