[mybmw] revert the changes for 16642 as BMW seems to have reverted th…

…e changes in the API (#16687) Signed-off-by: Martin Grassl <martin.grassl@digital-filestore.de>
openhab · Apr 28, 2024 · bc13652 · bc13652
1 parent 1a727f8
commit bc13652
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 9 deletions.
diff --git a/bundles/org.openhab.binding.mybmw/README.md b/bundles/org.openhab.binding.mybmw/README.md
@@ -492,9 +492,13 @@ Image representation of the vehicle.
 | png                 | Image  | Read     | The image as png          |
 | view                | String | Write    | The view port of the car  |
 
-Possible view ports (currently only one is available, which is automatically set as default):
+Possible view ports:
 
-- _AngleSideViewForty_ Front Left Side View
+- _VehicleStatus_ Front Left Side View
+- _FrontView_ Front View
+- _FrontLeft_ Front Left Side View
+- _FrontRight_ Front Right Side View
+- _RearView_ Rear View
 
 ## Further Descriptions
 

diff --git a/...binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/ImageProperties.java b/...binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/ImageProperties.java
@@ -24,7 +24,7 @@
 public class ImageProperties {
     public static final int RETRY_COUNTER = 5;
     public int failCounter = 0;
-    public String viewport = "AngleSideViewForty"; // default view
+    public String viewport = "VehicleStatus"; // default view
 
     public ImageProperties(String viewport) {
         this.viewport = viewport;

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties
@@ -98,7 +98,11 @@ channel-type.mybmw.home-distance-channel.label = Distance From Home
 channel-type.mybmw.hood-channel.label = Hood
 
 channel-type.mybmw.image-update-channel.label = Force update of the image
-channel-type.mybmw.image-view-channel.command.option.AngleSideViewForty = Left Side View
+channel-type.mybmw.image-view-channel.command.option.FrontLeft = Left Side View
+channel-type.mybmw.image-view-channel.command.option.FrontRight = Right Side View
+channel-type.mybmw.image-view-channel.command.option.FrontView = Front View
+channel-type.mybmw.image-view-channel.command.option.RearView = Rear View
+channel-type.mybmw.image-view-channel.command.option.VehicleStatus = Front Side View
 channel-type.mybmw.image-view-channel.label = Image Viewport
 channel-type.mybmw.last-fetched-channel.label = Last Openhab Update Timestamp
 channel-type.mybmw.last-update-channel.label = Last Car Status Timestamp

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/image-channel-types.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/image-channel-types.xml
@@ -13,7 +13,11 @@
 		<label>Image Viewport</label>
 		<command>
 			<options>
-				<option value="AngleSideViewForty">Left Side View</option>
+				<option value="VehicleStatus">Front Side View</option>
+				<option value="FrontView">Front View</option>
+				<option value="FrontLeft">Left Side View</option>
+				<option value="FrontRight">Right Side View</option>
+				<option value="RearView">Rear View</option>
 			</options>
 		</command>
 	</channel-type>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev.xml
@@ -29,7 +29,7 @@
 		</channel-groups>
 
 		<properties>
-			<property name="thingTypeVersion">3</property>
+			<property name="thingTypeVersion">4</property>
 		</properties>
 
 		<representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev_rex.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev_rex.xml
@@ -29,7 +29,7 @@
 		</channel-groups>
 
 		<properties>
-			<property name="thingTypeVersion">3</property>
+			<property name="thingTypeVersion">4</property>
 		</properties>
 
 		<representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-conv.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-conv.xml
@@ -26,7 +26,7 @@
 		</channel-groups>
 
 		<properties>
-			<property name="thingTypeVersion">3</property>
+			<property name="thingTypeVersion">4</property>
 		</properties>
 
 		<representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-phev.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-phev.xml
@@ -29,7 +29,7 @@
 		</channel-groups>
 
 		<properties>
-			<property name="thingTypeVersion">3</property>
+			<property name="thingTypeVersion">4</property>
 		</properties>
 
 		<representation-property>vin</representation-property>

diff --git a/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/update/thing-update.xml b/bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/update/thing-update.xml
@@ -53,6 +53,15 @@
 				<label>Image Viewport</label>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="4">
+			<!-- channels to be removed -->
+			<!-- channels to be added -->
+			<!-- channels to be updated -->
+			<update-channel id="view" groupIds="image">
+				<type>mybmw:image-view-channel</type>
+				<label>Image Viewport</label>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 	<thing-type uid="mybmw:bev">
 		<instruction-set targetVersion="1">
@@ -96,6 +105,15 @@
 				<label>Image Viewport</label>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="4">
+			<!-- channels to be removed -->
+			<!-- channels to be added -->
+			<!-- channels to be updated -->
+			<update-channel id="view" groupIds="image">
+				<type>mybmw:image-view-channel</type>
+				<label>Image Viewport</label>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 	<thing-type uid="mybmw:conv">
 		<instruction-set targetVersion="1">
@@ -137,6 +155,15 @@
 				<label>Image Viewport</label>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="4">
+			<!-- channels to be removed -->
+			<!-- channels to be added -->
+			<!-- channels to be updated -->
+			<update-channel id="view" groupIds="image">
+				<type>mybmw:image-view-channel</type>
+				<label>Image Viewport</label>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 	<thing-type uid="mybmw:phev">
 		<instruction-set targetVersion="1">
@@ -188,6 +215,15 @@
 				<label>Image Viewport</label>
 			</update-channel>
 		</instruction-set>
+		<instruction-set targetVersion="4">
+			<!-- channels to be removed -->
+			<!-- channels to be added -->
+			<!-- channels to be updated -->
+			<update-channel id="view" groupIds="image">
+				<type>mybmw:image-view-channel</type>
+				<label>Image Viewport</label>
+			</update-channel>
+		</instruction-set>
 	</thing-type>
 
 </update:update-descriptions>