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

[freeboxos] Fix systeminfo group for active-player thing type #17097

Merged
merged 3 commits into from
Jul 27, 2024
Merged

[freeboxos] Fix systeminfo group for active-player thing type #17097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3d38c6
[freeboxos] Fix systeminfo group for active-player thing type
lolodomo Jul 18, 2024
e20e3c9
Merge branch 'main' into freeboxos_player_fix_systeminfo
lolodomo Jul 27, 2024
2eb3590
Add upgrade instructions
lolodomo Jul 27, 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
2 changes: 2 additions & 0 deletions bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ channel-group-type.freeboxos.outgoing.channel.timestamp.label = Outgoing Call Ti
channel-group-type.freeboxos.player-actions.label = Player Actions
channel-group-type.freeboxos.player-status.label = Player Status
channel-group-type.freeboxos.player-sysinfo.label = System Informations
channel-group-type.freeboxos.player-sysinfo.channel.box-event.label = Player Event
channel-group-type.freeboxos.player-sysinfo.channel.box-event.description = Triggers when an event related to the Freebox player has been detected
channel-group-type.freeboxos.repeater-misc.label = Repeater Settings
channel-group-type.freeboxos.repeater-misc.channel.box-event.label = Repeater Event
channel-group-type.freeboxos.sensors.label = System Sensors
Expand Down
5 changes: 4 additions & 1 deletion ...s/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-channel-groups.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
<label>System Informations</label>
<channels>
<channel id="uptime" typeId="uptime"/>
<channel id="box-event" typeId="box-event"/>
<channel id="box-event" typeId="box-event">
<label>Player Event</label>
<description>Triggers when an event related to the Freebox player has been detected</description>
</channel>
</channels>
</channel-group-type>

Expand Down
11 changes: 9 additions & 2 deletions bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/player-thing-type.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@

<channel-groups>
<channel-group typeId="player-actions" id="player-actions"/>
<channel-group typeId="sysinfo" id="sysinfo"/>
<channel-group typeId="connectivity" id="connectivity"/>
</channel-groups>

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

<representation-property>macAddress</representation-property>

<config-description-ref uri="thing-type:freeboxos:player"/>
Expand All @@ -34,10 +37,14 @@
<channel-groups>
<channel-group typeId="player-actions" id="player-actions"/>
<channel-group typeId="player-status" id="player-status"/>
<channel-group typeId="sysinfo" id="sysinfo"/>
<channel-group typeId="player-sysinfo" id="sysinfo"/>
<channel-group typeId="connectivity" id="connectivity"/>
</channel-groups>

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

<representation-property>macAddress</representation-property>

<config-description-ref uri="thing-type:freeboxos:player"/>
Expand Down
29 changes: 29 additions & 0 deletions bundles/org.openhab.binding.freeboxos/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,29 @@
<?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="freeboxos:player">

<instruction-set targetVersion="1">
<remove-channel id="uptime" groupIds="sysinfo"/>
<remove-channel id="ip-address" groupIds="sysinfo"/>
<remove-channel id="box-event" groupIds="sysinfo"/>
</instruction-set>

</thing-type>

<thing-type uid="freeboxos:active-player">

<instruction-set targetVersion="1">
<remove-channel id="ip-address" groupIds="sysinfo"/>
<update-channel id="box-event" groupIds="sysinfo">
<type>freeboxos:box-event</type>
<label>Player Event</label>
<description>Triggers when an event related to the Freebox player has been detected</description>
</update-channel>
</instruction-set>

</thing-type>

</update:update-descriptions>