Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mercedesme] Fix trip channel type id #17267

Merged
merged 5 commits into from
Aug 28, 2024
Merged

[mercedesme] Fix trip channel type id #17267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65ea4d9
bugfix trip channel naming
weymann Aug 15, 2024
e97db1b
update instructions
weymann Aug 26, 2024
6799c30
update instructions combustion
weymann Aug 26, 2024
6b2362d
update-channel
weymann Aug 26, 2024
aaeb8d3
update folder correction
weymann Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-combustion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@
<channel-group id="hvac" typeId="hvac-values"/>
<channel-group id="service" typeId="service-values"/>
<channel-group id="range" typeId="range-conv-values"/>
<channel-group id="trip" typeId="trip-values"/>
<channel-group id="trip" typeId="trip-conv-values"/>
<channel-group id="position" typeId="position-values"/>
<channel-group id="tires" typeId="tires-values"/>
<channel-group id="command" typeId="command-values"/>
</channel-groups>

<properties>
<property name="thingTypeVersion">1</property>
</properties>

<config-description-ref uri="thing-type:mercedesme:conv"/>
</thing-type>
</thing:thing-descriptions>
4 changes: 4 additions & 0 deletions bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/thing-hybrid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<channel-group id="command" typeId="command-values"/>
</channel-groups>

<properties>
<property name="thingTypeVersion">1</property>
</properties>

<config-description-ref uri="thing-type:mercedesme:hybrid"/>
</thing-type>
</thing:thing-descriptions>
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-conv-group.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<channel id="distance-reset" typeId="distance-reset"/>
<channel id="time-reset" typeId="driven-time-reset"/>
<channel id="avg-speed-reset" typeId="avg-speed-reset"/>
<channel id="cons-conv-reset" typeId="consumption-conv-resetchannel"/>
<channel id="cons-conv-reset" typeId="consumption-conv-reset"/>
<channel id="cons-conv-unit" typeId="consumption-conv-unit"/>
</channels>
</channel-group-type>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/thing/trip-hybrid-group.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<channel id="time-reset" typeId="driven-time-reset"/>
<channel id="avg-speed-reset" typeId="avg-speed-reset"/>
<channel id="cons-ev-reset" typeId="consumption-ev-reset"/>
<channel id="cons-conv-reset" typeId="consumption-conv-resetchannel"/>
<channel id="cons-conv-reset" typeId="consumption-conv-reset"/>
<channel id="cons-ev-unit" typeId="consumption-ev-unit"/>
<channel id="cons-conv-unit" typeId="consumption-conv-unit"/>
</channels>
Expand Down
46 changes: 46 additions & 0 deletions bundles/org.openhab.binding.mercedesme/src/main/resources/OH-INF/update/instructions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">

<thing-type uid="mercedesme:hybrid">
<instruction-set targetVersion="1">
<update-channel id="cons-conv-reset" groupIds="trip">
<type>mercedesme:consumption-conv-reset</type>
</update-channel>
</instruction-set>
</thing-type>

<thing-type uid="mercedesme:combustion">
<instruction-set targetVersion="1">
<update-channel id="distance" groupIds="trip">
<type>mercedesme:distance</type>
</update-channel>
<update-channel id="time" groupIds="trip">
<type>mercedesme:driven-time</type>
</update-channel>
<update-channel id="avg-speed" groupIds="trip">
<type>mercedesme:avg-speed</type>
</update-channel>
<update-channel id="cons-conv" groupIds="trip">
<type>mercedesme:consumption-conv</type>
</update-channel>
<update-channel id="distance-reset" groupIds="trip">
<type>mercedesme:distance-reset</type>
</update-channel>
<update-channel id="time-reset" groupIds="trip">
<type>mercedesme:driven-time-reset</type>
</update-channel>
<update-channel id="avg-speed-reset" groupIds="trip">
<type>mercedesme:avg-speed-reset</type>
</update-channel>
<update-channel id="cons-conv-reset" groupIds="trip">
<type>mercedesme:consumption-conv-reset</type>
</update-channel>
<update-channel id="cons-conv-unit" groupIds="trip">
<type>mercedesme:consumption-conv-unit</type>
</update-channel>
</instruction-set>
</thing-type>

</update:update-descriptions>