Skip to content

Commit bc13652

Browse files
martingrasslmartingrassl
authored
[mybmw] revert the changes for 16642 as BMW seems to have reverted the changes in the API (openhab#16687)
Signed-off-by: Martin Grassl <[email protected]>
1 parent 1a727f8 commit bc13652

File tree

9 files changed

+57
-9
lines changed

9 files changed

+57
-9
lines changed

‎bundles/org.openhab.binding.mybmw/README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,13 @@ Image representation of the vehicle.
492492
| png | Image | Read | The image as png |
493493
| view | String | Write | The view port of the car |
494494

495-
Possible view ports (currently only one is available, which is automatically set as default):
495+
Possible view ports:
496496

497-
- _AngleSideViewForty_ Front Left Side View
497+
- _VehicleStatus_ Front Left Side View
498+
- _FrontView_ Front View
499+
- _FrontLeft_ Front Left Side View
500+
- _FrontRight_ Front Right Side View
501+
- _RearView_ Rear View
498502

499503
## Further Descriptions
500504

‎bundles/org.openhab.binding.mybmw/src/main/java/org/openhab/binding/mybmw/internal/utils/ImageProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
public class ImageProperties {
2525
public static final int RETRY_COUNTER = 5;
2626
public int failCounter = 0;
27-
public String viewport = "AngleSideViewForty"; // default view
27+
public String viewport = "VehicleStatus"; // default view
2828

2929
public ImageProperties(String viewport) {
3030
this.viewport = viewport;

‎bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/i18n/mybmw.properties

+5-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ channel-type.mybmw.home-distance-channel.label = Distance From Home
9898
channel-type.mybmw.hood-channel.label = Hood
9999

100100
channel-type.mybmw.image-update-channel.label = Force update of the image
101-
channel-type.mybmw.image-view-channel.command.option.AngleSideViewForty = Left Side View
101+
channel-type.mybmw.image-view-channel.command.option.FrontLeft = Left Side View
102+
channel-type.mybmw.image-view-channel.command.option.FrontRight = Right Side View
103+
channel-type.mybmw.image-view-channel.command.option.FrontView = Front View
104+
channel-type.mybmw.image-view-channel.command.option.RearView = Rear View
105+
channel-type.mybmw.image-view-channel.command.option.VehicleStatus = Front Side View
102106
channel-type.mybmw.image-view-channel.label = Image Viewport
103107
channel-type.mybmw.last-fetched-channel.label = Last Openhab Update Timestamp
104108
channel-type.mybmw.last-update-channel.label = Last Car Status Timestamp

‎bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/image-channel-types.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
<label>Image Viewport</label>
1414
<command>
1515
<options>
16-
<option value="AngleSideViewForty">Left Side View</option>
16+
<option value="VehicleStatus">Front Side View</option>
17+
<option value="FrontView">Front View</option>
18+
<option value="FrontLeft">Left Side View</option>
19+
<option value="FrontRight">Right Side View</option>
20+
<option value="RearView">Rear View</option>
1721
</options>
1822
</command>
1923
</channel-type>

‎bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</channel-groups>
3030

3131
<properties>
32-
<property name="thingTypeVersion">3</property>
32+
<property name="thingTypeVersion">4</property>
3333
</properties>
3434

3535
<representation-property>vin</representation-property>

‎bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-bev_rex.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</channel-groups>
3030

3131
<properties>
32-
<property name="thingTypeVersion">3</property>
32+
<property name="thingTypeVersion">4</property>
3333
</properties>
3434

3535
<representation-property>vin</representation-property>

‎bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-conv.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</channel-groups>
2727

2828
<properties>
29-
<property name="thingTypeVersion">3</property>
29+
<property name="thingTypeVersion">4</property>
3030
</properties>
3131

3232
<representation-property>vin</representation-property>

‎bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/thing/thing-phev.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</channel-groups>
3030

3131
<properties>
32-
<property name="thingTypeVersion">3</property>
32+
<property name="thingTypeVersion">4</property>
3333
</properties>
3434

3535
<representation-property>vin</representation-property>

‎bundles/org.openhab.binding.mybmw/src/main/resources/OH-INF/update/thing-update.xml

+36
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@
5353
<label>Image Viewport</label>
5454
</update-channel>
5555
</instruction-set>
56+
<instruction-set targetVersion="4">
57+
<!-- channels to be removed -->
58+
<!-- channels to be added -->
59+
<!-- channels to be updated -->
60+
<update-channel id="view" groupIds="image">
61+
<type>mybmw:image-view-channel</type>
62+
<label>Image Viewport</label>
63+
</update-channel>
64+
</instruction-set>
5665
</thing-type>
5766
<thing-type uid="mybmw:bev">
5867
<instruction-set targetVersion="1">
@@ -96,6 +105,15 @@
96105
<label>Image Viewport</label>
97106
</update-channel>
98107
</instruction-set>
108+
<instruction-set targetVersion="4">
109+
<!-- channels to be removed -->
110+
<!-- channels to be added -->
111+
<!-- channels to be updated -->
112+
<update-channel id="view" groupIds="image">
113+
<type>mybmw:image-view-channel</type>
114+
<label>Image Viewport</label>
115+
</update-channel>
116+
</instruction-set>
99117
</thing-type>
100118
<thing-type uid="mybmw:conv">
101119
<instruction-set targetVersion="1">
@@ -137,6 +155,15 @@
137155
<label>Image Viewport</label>
138156
</update-channel>
139157
</instruction-set>
158+
<instruction-set targetVersion="4">
159+
<!-- channels to be removed -->
160+
<!-- channels to be added -->
161+
<!-- channels to be updated -->
162+
<update-channel id="view" groupIds="image">
163+
<type>mybmw:image-view-channel</type>
164+
<label>Image Viewport</label>
165+
</update-channel>
166+
</instruction-set>
140167
</thing-type>
141168
<thing-type uid="mybmw:phev">
142169
<instruction-set targetVersion="1">
@@ -188,6 +215,15 @@
188215
<label>Image Viewport</label>
189216
</update-channel>
190217
</instruction-set>
218+
<instruction-set targetVersion="4">
219+
<!-- channels to be removed -->
220+
<!-- channels to be added -->
221+
<!-- channels to be updated -->
222+
<update-channel id="view" groupIds="image">
223+
<type>mybmw:image-view-channel</type>
224+
<label>Image Viewport</label>
225+
</update-channel>
226+
</instruction-set>
191227
</thing-type>
192228

193229
</update:update-descriptions>

0 commit comments

Comments
 (0)