demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-27 07:41:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[sonos] Add new channels for battery (Sonos Move) (#9998)

Browse Source 
Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2021-01-31 21:07:23 +01:00 committed by GitHub
parent fd1caea5aa
commit 024b36a814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.sonos/README.md
View File

@ -55,6 +55,8 @@ The devices support the following channels:
| alarmproperties | String | R | Properties of the alarm currently running | all | | alarmproperties | String | R | Properties of the alarm currently running | all |
| alarmrunning | Switch | R | Set to ON if the alarm was triggered | all | | alarmrunning | Switch | R | Set to ON if the alarm was triggered | all |
| bass | Number | RW | Set or get the bass level adjustment (value in range -10 / 10) | all | | bass | Number | RW | Set or get the bass level adjustment (value in range -10 / 10) | all |
| batterycharging | Switch | R | Indicator set to ON when the battery is charging | Move |
| batterylevel | Number | R | Current battery level | Move |
| clearqueue | Switch | W | Suppress all songs from the current queue | all | | clearqueue | Switch | W | Suppress all songs from the current queue | all |
| control | Player | RW | Control the Zone Player, e.g. PLAY/PAUSE/NEXT/PREVIOUS | all | | control | Player | RW | Control the Zone Player, e.g. PLAY/PAUSE/NEXT/PREVIOUS | all |
| coordinator | String | R | UDN of the coordinator for the current group | all | | coordinator | String | R | UDN of the coordinator for the current group | all |

2
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosBindingConstants.java
View File

@ -83,6 +83,8 @@ public class SonosBindingConstants {
public static final String ALARMPROPERTIES = "alarmproperties"; public static final String ALARMPROPERTIES = "alarmproperties";
public static final String ALARMRUNNING = "alarmrunning"; public static final String ALARMRUNNING = "alarmrunning";
public static final String BASS = "bass"; public static final String BASS = "bass";
public static final String BATTERYCHARGING = "batterycharging";
public static final String BATTERYLEVEL = "batterylevel";
public static final String CLEARQUEUE = "clearqueue"; public static final String CLEARQUEUE = "clearqueue";
public static final String CONTROL = "control"; public static final String CONTROL = "control";
public static final String COORDINATOR = "coordinator"; public static final String COORDINATOR = "coordinator";

30
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/handler/ZonePlayerHandler.java
View File

@ -689,6 +689,10 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
stateDescriptionProvider.setStateOptions(new ChannelUID(getThing().getUID(), RADIO), options); stateDescriptionProvider.setStateOptions(new ChannelUID(getThing().getUID(), RADIO), options);
} }
break; break;
case "MoreInfo":
updateChannel(BATTERYCHARGING);
updateChannel(BATTERYLEVEL);
break;
default: default:
break; break;
} }
@ -957,6 +961,18 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
newState = new StringType(value); newState = new StringType(value);
} }
break; break;
case BATTERYCHARGING:
value = extractInfoFromMoreInfo("BattChg");
if (value != null) {
newState = OnOffType.from("CHARGING".equalsIgnoreCase(value));
}
break;
case BATTERYLEVEL:
value = extractInfoFromMoreInfo("RawBattPct");
if (value != null) {
newState = new DecimalType(value);
}
break;
default: default:
newState = null; newState = null;
break; break;
@ -3225,4 +3241,18 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
int seconds = Integer.parseInt(units[2]); int seconds = Integer.parseInt(units[2]);
return 3600 * hours + 60 * minutes + seconds; return 3600 * hours + 60 * minutes + seconds;
} }
private @Nullable String extractInfoFromMoreInfo(String searchedInfo) {
String value = stateMap.get("MoreInfo");
if (value != null) {
String[] fields = value.split(",");
for (int i = 0; i < fields.length; i++) {
String[] pair = fields[i].trim().split(":");
if (pair.length == 2 && searchedInfo.equalsIgnoreCase(pair[0].trim())) {
return pair[1].trim();
}
}
}
return null;
}
} }

3
bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/Move.xml
View File

@ -53,6 +53,9 @@
<channel id="sleeptimer" typeId="sleeptimer"/> <channel id="sleeptimer" typeId="sleeptimer"/>
<channel id="currenttransporturi" typeId="currenttransporturi"/> <channel id="currenttransporturi" typeId="currenttransporturi"/>
<channel id="currenttrackuri" typeId="currenttrackuri"/> <channel id="currenttrackuri" typeId="currenttrackuri"/>
<!-- Extended SONOS channels -->
<channel id="batterycharging" typeId="batterycharging"/>
<channel id="batterylevel" typeId="system.battery-level"/>
</channels> </channels>
<properties> <properties>

8
bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
View File

@ -350,4 +350,12 @@
<description>Play the line-in of the the Zone Player corresponding to the given UIN</description> <description>Play the line-in of the the Zone Player corresponding to the given UIN</description>
</channel-type> </channel-type>
<!-- Extended channels (for SONOS Move only) -->
<channel-type id="batterycharging" advanced="true">
<item-type>Switch</item-type>
<label>Battery Charging</label>
<description>Indicator set to ON when the battery is charging</description>
<state readOnly="true"/>
</channel-type>
</thing:thing-descriptions> </thing:thing-descriptions>