add support for v3.40~1

kwindrem · Mar 21, 2024 · 18e5560 · 18e5560
1 parent 2a4f89b
commit 18e5560
Show file tree

Hide file tree

Showing 1,181 changed files with 31,090 additions and 28,282 deletions.
diff --git a/ExtTransferSwitch.py b/ExtTransferSwitch.py
@@ -262,7 +262,13 @@ def transferToGenerator (self):
 			logging.info ("switching to generator settings")
 			# save current values for restore when switching back to grid
 			try:
-				self.DbusSettings['gridInputType'] = self.acInputTypeObj.GetValue ()
+				inputType = self.acInputTypeObj.GetValue ()
+				# grid input type can only be either 1 (grid) or 3 (shore)
+				#	patch this up to prevent issues later
+				if inputType == 2:
+					logging.warning ("grid input can not be generator - setting to grid")
+					inputType = 1
+				self.DbusSettings['gridInputType'] = inputType
 			except:
 				logging.error ("dbus error AC input type not saved when switching to generator")
 			try:
@@ -379,6 +385,12 @@ def __init__(self):
 		self.DbusSettings = SettingsDevice(bus=self.theBus, supportedSettings=settingsList,
 								timeout = 10, eventCallback=None )
 
+		# grid input type should be either 1 (grid) or 3 (shore)
+		#	patch this up to prevent issues later
+		if self.DbusSettings['gridInputType'] == 2:
+			logging.warning ("grid input type was generator - resetting to grid")
+			self.DbusSettings['gridInputType'] = 1
+
 		GLib.timeout_add (1000, self.background)
 		return None
 

diff --git a/FileSets/v2.71/MbEditBox.qml b/FileSets/v2.71/MbEditBox.qml
@@ -1 +1 @@
-../v3.30/MbEditBox.qml
+../v3.40~1/MbEditBox.qml
diff --git a/FileSets/v2.71/MbEditBoxDateTime.qml b/FileSets/v2.71/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30/MbEditBoxDateTime.qml
+../v3.40~1/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.71/MbSubMenu.qml b/FileSets/v2.71/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30/MbSubMenu.qml
+../v3.40~1/MbSubMenu.qml
diff --git a/FileSets/v2.71/Multi.qml b/FileSets/v2.71/Multi.qml
@@ -1 +1 @@
-../v3.30/Multi.qml
+../v3.40~1/Multi.qml
diff --git a/FileSets/v2.71/OverviewBox.qml b/FileSets/v2.71/OverviewBox.qml
@@ -1 +1 @@
-../v3.30/OverviewBox.qml
+../v3.40~1/OverviewBox.qml
diff --git a/FileSets/v2.71/OverviewConnection.qml b/FileSets/v2.71/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30/OverviewConnection.qml
+../v3.40~1/OverviewConnection.qml
diff --git a/FileSets/v2.71/OverviewConnectionEnd.qml b/FileSets/v2.71/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30/OverviewConnectionEnd.qml
+../v3.40~1/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.71/OverviewSolarCharger.qml b/FileSets/v2.71/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30/OverviewSolarCharger.qml
+../v3.40~1/OverviewSolarCharger.qml
diff --git a/FileSets/v2.71/OverviewTankDelegate.qml b/FileSets/v2.71/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30/OverviewTankDelegate.qml
+../v3.40~1/OverviewTankDelegate.qml
diff --git a/FileSets/v2.71/OverviewTanks.qml b/FileSets/v2.71/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30/OverviewTanks.qml
+../v3.40~1/OverviewTanks.qml
diff --git a/FileSets/v2.71/TileText.qml b/FileSets/v2.71/TileText.qml
@@ -1 +1 @@
-../v3.30/TileText.qml
+../v3.40~1/TileText.qml
diff --git a/FileSets/v2.71/styles.css b/FileSets/v2.71/styles.css
@@ -1 +1 @@
-../v3.30/styles.css
+../v3.40~1/styles.css
diff --git a/FileSets/v2.72/MbEditBox.qml b/FileSets/v2.72/MbEditBox.qml
@@ -1 +1 @@
-../v3.30/MbEditBox.qml
+../v3.40~1/MbEditBox.qml
diff --git a/FileSets/v2.72/MbEditBoxDateTime.qml b/FileSets/v2.72/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30/MbEditBoxDateTime.qml
+../v3.40~1/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.72/MbSubMenu.qml b/FileSets/v2.72/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30/MbSubMenu.qml
+../v3.40~1/MbSubMenu.qml
diff --git a/FileSets/v2.72/Multi.qml b/FileSets/v2.72/Multi.qml
@@ -1 +1 @@
-../v3.30/Multi.qml
+../v3.40~1/Multi.qml
diff --git a/FileSets/v2.72/OverviewBox.qml b/FileSets/v2.72/OverviewBox.qml
@@ -1 +1 @@
-../v3.30/OverviewBox.qml
+../v3.40~1/OverviewBox.qml
diff --git a/FileSets/v2.72/OverviewConnection.qml b/FileSets/v2.72/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30/OverviewConnection.qml
+../v3.40~1/OverviewConnection.qml
diff --git a/FileSets/v2.72/OverviewConnectionEnd.qml b/FileSets/v2.72/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30/OverviewConnectionEnd.qml
+../v3.40~1/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.72/OverviewSolarCharger.qml b/FileSets/v2.72/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30/OverviewSolarCharger.qml
+../v3.40~1/OverviewSolarCharger.qml
diff --git a/FileSets/v2.72/OverviewTankDelegate.qml b/FileSets/v2.72/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30/OverviewTankDelegate.qml
+../v3.40~1/OverviewTankDelegate.qml
diff --git a/FileSets/v2.72/OverviewTanks.qml b/FileSets/v2.72/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30/OverviewTanks.qml
+../v3.40~1/OverviewTanks.qml
diff --git a/FileSets/v2.72/TileText.qml b/FileSets/v2.72/TileText.qml
@@ -1 +1 @@
-../v3.30/TileText.qml
+../v3.40~1/TileText.qml
diff --git a/FileSets/v2.72/styles.css b/FileSets/v2.72/styles.css
@@ -1 +1 @@
-../v3.30/styles.css
+../v3.40~1/styles.css
diff --git a/FileSets/v2.73/MbEditBox.qml b/FileSets/v2.73/MbEditBox.qml
@@ -1 +1 @@
-../v3.30/MbEditBox.qml
+../v3.40~1/MbEditBox.qml
diff --git a/FileSets/v2.73/MbEditBoxDateTime.qml b/FileSets/v2.73/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30/MbEditBoxDateTime.qml
+../v3.40~1/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.73/MbSubMenu.qml b/FileSets/v2.73/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30/MbSubMenu.qml
+../v3.40~1/MbSubMenu.qml
diff --git a/FileSets/v2.73/Multi.qml b/FileSets/v2.73/Multi.qml
@@ -1 +1 @@
-../v3.30/Multi.qml
+../v3.40~1/Multi.qml
diff --git a/FileSets/v2.73/OverviewBox.qml b/FileSets/v2.73/OverviewBox.qml
@@ -1 +1 @@
-../v3.30/OverviewBox.qml
+../v3.40~1/OverviewBox.qml
diff --git a/FileSets/v2.73/OverviewConnection.qml b/FileSets/v2.73/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30/OverviewConnection.qml
+../v3.40~1/OverviewConnection.qml
diff --git a/FileSets/v2.73/OverviewConnectionEnd.qml b/FileSets/v2.73/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30/OverviewConnectionEnd.qml
+../v3.40~1/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.73/OverviewSolarCharger.qml b/FileSets/v2.73/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30/OverviewSolarCharger.qml
+../v3.40~1/OverviewSolarCharger.qml
diff --git a/FileSets/v2.73/OverviewTankDelegate.qml b/FileSets/v2.73/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30/OverviewTankDelegate.qml
+../v3.40~1/OverviewTankDelegate.qml
diff --git a/FileSets/v2.73/OverviewTanks.qml b/FileSets/v2.73/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30/OverviewTanks.qml
+../v3.40~1/OverviewTanks.qml
diff --git a/FileSets/v2.73/TileText.qml b/FileSets/v2.73/TileText.qml
@@ -1 +1 @@
-../v3.30/TileText.qml
+../v3.40~1/TileText.qml
diff --git a/FileSets/v2.73/styles.css b/FileSets/v2.73/styles.css
@@ -1 +1 @@
-../v3.30/styles.css
+../v3.40~1/styles.css
diff --git a/FileSets/v2.80/MbEditBox.qml b/FileSets/v2.80/MbEditBox.qml
@@ -1 +1 @@
-../v3.30/MbEditBox.qml
+../v3.40~1/MbEditBox.qml
diff --git a/FileSets/v2.80/MbEditBoxDateTime.qml b/FileSets/v2.80/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30/MbEditBoxDateTime.qml
+../v3.40~1/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.80/MbSubMenu.qml b/FileSets/v2.80/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30/MbSubMenu.qml
+../v3.40~1/MbSubMenu.qml
diff --git a/FileSets/v2.80/Multi.qml b/FileSets/v2.80/Multi.qml
@@ -1 +1 @@
-../v3.30/Multi.qml
+../v3.40~1/Multi.qml
diff --git a/FileSets/v2.80/OverviewBox.qml b/FileSets/v2.80/OverviewBox.qml
@@ -1 +1 @@
-../v3.30/OverviewBox.qml
+../v3.40~1/OverviewBox.qml
diff --git a/FileSets/v2.80/OverviewConnection.qml b/FileSets/v2.80/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30/OverviewConnection.qml
+../v3.40~1/OverviewConnection.qml
diff --git a/FileSets/v2.80/OverviewConnectionEnd.qml b/FileSets/v2.80/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30/OverviewConnectionEnd.qml
+../v3.40~1/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.80/OverviewSolarCharger.qml b/FileSets/v2.80/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30/OverviewSolarCharger.qml
+../v3.40~1/OverviewSolarCharger.qml
diff --git a/FileSets/v2.80/OverviewTankDelegate.qml b/FileSets/v2.80/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30/OverviewTankDelegate.qml
+../v3.40~1/OverviewTankDelegate.qml
diff --git a/FileSets/v2.80/OverviewTanks.qml b/FileSets/v2.80/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30/OverviewTanks.qml
+../v3.40~1/OverviewTanks.qml
diff --git a/FileSets/v2.80/TileText.qml b/FileSets/v2.80/TileText.qml
@@ -1 +1 @@
-../v3.30/TileText.qml
+../v3.40~1/TileText.qml
diff --git a/FileSets/v2.80/styles.css b/FileSets/v2.80/styles.css
@@ -1 +1 @@
-../v3.30/styles.css
+../v3.40~1/styles.css
diff --git a/FileSets/v2.81/MbEditBox.qml b/FileSets/v2.81/MbEditBox.qml
@@ -1 +1 @@
-../v3.30/MbEditBox.qml
+../v3.40~1/MbEditBox.qml
diff --git a/FileSets/v2.81/MbEditBoxDateTime.qml b/FileSets/v2.81/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30/MbEditBoxDateTime.qml
+../v3.40~1/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.81/MbSubMenu.qml b/FileSets/v2.81/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30/MbSubMenu.qml
+../v3.40~1/MbSubMenu.qml
diff --git a/FileSets/v2.81/Multi.qml b/FileSets/v2.81/Multi.qml
@@ -1 +1 @@
-../v3.30/Multi.qml
+../v3.40~1/Multi.qml
diff --git a/FileSets/v2.81/OverviewBox.qml b/FileSets/v2.81/OverviewBox.qml
@@ -1 +1 @@
-../v3.30/OverviewBox.qml
+../v3.40~1/OverviewBox.qml
diff --git a/FileSets/v2.81/OverviewConnection.qml b/FileSets/v2.81/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30/OverviewConnection.qml
+../v3.40~1/OverviewConnection.qml
diff --git a/FileSets/v2.81/OverviewConnectionEnd.qml b/FileSets/v2.81/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30/OverviewConnectionEnd.qml
+../v3.40~1/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.81/OverviewSolarCharger.qml b/FileSets/v2.81/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30/OverviewSolarCharger.qml
+../v3.40~1/OverviewSolarCharger.qml
diff --git a/FileSets/v2.81/OverviewTankDelegate.qml b/FileSets/v2.81/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30/OverviewTankDelegate.qml
+../v3.40~1/OverviewTankDelegate.qml
diff --git a/FileSets/v2.81/OverviewTanks.qml b/FileSets/v2.81/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30/OverviewTanks.qml
+../v3.40~1/OverviewTanks.qml
diff --git a/FileSets/v2.81/TileText.qml b/FileSets/v2.81/TileText.qml
@@ -1 +1 @@
-../v3.30/TileText.qml
+../v3.40~1/TileText.qml
diff --git a/FileSets/v2.81/styles.css b/FileSets/v2.81/styles.css
@@ -1 +1 @@
-../v3.30/styles.css
+../v3.40~1/styles.css
diff --git a/FileSets/v2.82/MbEditBox.qml b/FileSets/v2.82/MbEditBox.qml
@@ -1 +1 @@
-../v3.30/MbEditBox.qml
+../v3.40~1/MbEditBox.qml
diff --git a/FileSets/v2.82/MbEditBoxDateTime.qml b/FileSets/v2.82/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30/MbEditBoxDateTime.qml
+../v3.40~1/MbEditBoxDateTime.qml
diff --git a/FileSets/v2.82/MbSubMenu.qml b/FileSets/v2.82/MbSubMenu.qml
@@ -1 +1 @@
-../v3.30/MbSubMenu.qml
+../v3.40~1/MbSubMenu.qml
diff --git a/FileSets/v2.82/Multi.qml b/FileSets/v2.82/Multi.qml
@@ -1 +1 @@
-../v3.30/Multi.qml
+../v3.40~1/Multi.qml
diff --git a/FileSets/v2.82/OverviewBox.qml b/FileSets/v2.82/OverviewBox.qml
@@ -1 +1 @@
-../v3.30/OverviewBox.qml
+../v3.40~1/OverviewBox.qml
diff --git a/FileSets/v2.82/OverviewConnection.qml b/FileSets/v2.82/OverviewConnection.qml
@@ -1 +1 @@
-../v3.30/OverviewConnection.qml
+../v3.40~1/OverviewConnection.qml
diff --git a/FileSets/v2.82/OverviewConnectionEnd.qml b/FileSets/v2.82/OverviewConnectionEnd.qml
@@ -1 +1 @@
-../v3.30/OverviewConnectionEnd.qml
+../v3.40~1/OverviewConnectionEnd.qml
diff --git a/FileSets/v2.82/OverviewSolarCharger.qml b/FileSets/v2.82/OverviewSolarCharger.qml
@@ -1 +1 @@
-../v3.30/OverviewSolarCharger.qml
+../v3.40~1/OverviewSolarCharger.qml
diff --git a/FileSets/v2.82/OverviewTankDelegate.qml b/FileSets/v2.82/OverviewTankDelegate.qml
@@ -1 +1 @@
-../v3.30/OverviewTankDelegate.qml
+../v3.40~1/OverviewTankDelegate.qml
diff --git a/FileSets/v2.82/OverviewTanks.qml b/FileSets/v2.82/OverviewTanks.qml
@@ -1 +1 @@
-../v3.30/OverviewTanks.qml
+../v3.40~1/OverviewTanks.qml
diff --git a/FileSets/v2.82/TileText.qml b/FileSets/v2.82/TileText.qml
@@ -1 +1 @@
-../v3.30/TileText.qml
+../v3.40~1/TileText.qml
diff --git a/FileSets/v2.82/styles.css b/FileSets/v2.82/styles.css
@@ -1 +1 @@
-../v3.30/styles.css
+../v3.40~1/styles.css
diff --git a/FileSets/v2.83/MbEditBox.qml b/FileSets/v2.83/MbEditBox.qml
@@ -1 +1 @@
-../v3.30/MbEditBox.qml
+../v3.40~1/MbEditBox.qml
diff --git a/FileSets/v2.83/MbEditBoxDateTime.qml b/FileSets/v2.83/MbEditBoxDateTime.qml
@@ -1 +1 @@
-../v3.30/MbEditBoxDateTime.qml
+../v3.40~1/MbEditBoxDateTime.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30/MbEditBoxDateTime.qml
		../v3.40~1/MbEditBoxDateTime.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30/OverviewBox.qml
		../v3.40~1/OverviewBox.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30/OverviewConnection.qml
		../v3.40~1/OverviewConnection.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30/OverviewConnectionEnd.qml
		../v3.40~1/OverviewConnectionEnd.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30/OverviewSolarCharger.qml
		../v3.40~1/OverviewSolarCharger.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30/OverviewTankDelegate.qml
		../v3.40~1/OverviewTankDelegate.qml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../v3.30/OverviewTanks.qml
		../v3.40~1/OverviewTanks.qml