From 2ac03fbe368fc86f45a09f09de2eb03888a2d14f Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sat, 7 Oct 2023 16:45:52 +0200 Subject: [PATCH] [sonos] Add support for Move 2 (#15706) * Add support for Move 2 Resolves #15702 --------- Signed-off-by: Jacob Laursen --- bundles/org.openhab.binding.sonos/README.md | 12 +-- .../sonos/internal/SonosBindingConstants.java | 6 +- .../resources/OH-INF/i18n/sonos.properties | 3 + .../src/main/resources/OH-INF/thing/Move2.xml | 75 +++++++++++++++++++ 4 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/Move2.xml diff --git a/bundles/org.openhab.binding.sonos/README.md b/bundles/org.openhab.binding.sonos/README.md index d2731c89b86..1b532f11d82 100644 --- a/bundles/org.openhab.binding.sonos/README.md +++ b/bundles/org.openhab.binding.sonos/README.md @@ -11,11 +11,11 @@ This happens because of a TTL=1 for ALIVE packets send by Sonos devices, resulti ## Supported Things All available Sonos (playback) devices are supported by this binding. -This includes the One, One SL, Move, Roam, Roam SL, Play:1, Play:3, Play:5, Five, Era 100, Era 300, Connect, Connect:Amp, Port, Amp, SYMFONISK, Playbar, Playbase, Beam, Arc, Arc SL and Sub. +This includes the One, One SL, Move, Move 2, Roam, Roam SL, Play:1, Play:3, Play:5, Five, Era 100, Era 300, Connect, Connect:Amp, Port, Amp, SYMFONISK, Playbar, Playbase, Beam, Arc, Arc SL and Sub. The Bridge and Boost are not supported, but these devices do only have an auxiliary role in the Sonos network and do not have any playback capability. All supported Sonos devices are registered as an audio sink in the framework. -When being defined in a \*.things file, the specific thing types One, OneSL, Move, Roam, RoamSL, PLAY1, PLAY3, PLAY5, Five, Era100, Era300, SYMFONISK, PLAYBAR, PLAYBASE, Beam, Arc, ArcSL, CONNECT, CONNECTAMP, Port and Amp should be used. +When being defined in a \*.things file, the specific thing types One, OneSL, Move, Move2, Roam, RoamSL, PLAY1, PLAY3, PLAY5, Five, Era100, Era300, SYMFONISK, PLAYBAR, PLAYBASE, Beam, Arc, ArcSL, CONNECT, CONNECTAMP, Port and Amp should be used. Please note that these thing types are case sensitive (you need to define them **exactly as stated above**). @@ -55,8 +55,8 @@ The devices support the following channels: | alarmproperties | String | R | Properties of the alarm currently running | 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 | -| batterycharging | Switch | R | Indicator set to ON when the battery is charging | Move, Roam, RoamSL | -| batterylevel | Number | R | Current battery level | Move, Roam, RoamSL | +| batterycharging | Switch | R | Indicator set to ON when the battery is charging | Move, Move2, Roam, RoamSL | +| batterylevel | Number | R | Current battery level | Move, Move2, Roam, RoamSL | | clearqueue | Switch | W | Suppress all songs from the current queue | all | | codec | String | R | Name of codec currently being decoded | Arc, ArcSL, PLAYBAR, PLAYBASE, Beam, Amp | | control | Player | RW | Control the Zone Player, e.g. PLAY/PAUSE/NEXT/PREVIOUS | all | @@ -72,12 +72,12 @@ The devices support the following channels: | favorite | String | W | Play the given favorite entry. The favorite entry has to be predefined in the Sonos Controller app | all | | heightlevel | Number | RW | Set or get the height level adjustment (value in range -10 / 10) | Arc, ArcSL | | led | Switch | RW | Set or get the status of the white LED on the front of the Zone Player | all | -| linein | Switch | R | Indicator set to ON when the line-in of the Zone Player is connected | PLAY5, Five, Era100, Era300, CONNECT, CONNECTAMP, PLAYBAR, PLAYBASE, Beam, Port | +| linein | Switch | R | Indicator set to ON when the line-in of the Zone Player is connected | PLAY5, Five, Move 2, Era100, Era300, CONNECT, CONNECTAMP, PLAYBAR, PLAYBASE, Beam, Port | | analoglinein | Switch | R | Indicator set to ON when the analog line-in of the Zone Player is connected | Amp | | digitallinein | Switch | R | Indicator set to ON when the digital line-in of the Zone Player is connected | Amp | | localcoordinator | Switch | R | Indicator set to ON if the this Zone Player is the Zone Group Coordinator | all | | loudness | Switch | RW | Enable or disable the loudness | all | -| microphone | Switch | R | Indicator set to ON when the microphone is enabled | Arc, Beam, Move, One, Roam, Era100, Era300 | +| microphone | Switch | R | Indicator set to ON when the microphone is enabled | Arc, Beam, Move, Move2, One, Roam, Era100, Era300 | | mute | Switch | RW | Set or get the mute state of the master volume of the Zone Player | all | | nightmode | Switch | RW | Enable or disable the night mode feature | PLAYBAR, PLAYBASE, Beam, Amp | | notificationsound | String | W | Play a notification sound by a given URI | all | diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosBindingConstants.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosBindingConstants.java index 4ef3615db51..6035a9bb5f5 100644 --- a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosBindingConstants.java +++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosBindingConstants.java @@ -51,6 +51,7 @@ public class SonosBindingConstants { public static final ThingTypeUID ARC_THING_TYPE_UID = new ThingTypeUID(BINDING_ID, "Arc"); public static final ThingTypeUID ARC_SL_THING_TYPE_UID = new ThingTypeUID(BINDING_ID, "ArcSL"); public static final ThingTypeUID MOVE_THING_TYPE_UID = new ThingTypeUID(BINDING_ID, "Move"); + public static final ThingTypeUID MOVE2_THING_TYPE_UID = new ThingTypeUID(BINDING_ID, "Move2"); public static final ThingTypeUID ROAM_THING_TYPE_UID = new ThingTypeUID(BINDING_ID, "Roam"); public static final ThingTypeUID ROAM_SL_THING_TYPE_UID = new ThingTypeUID(BINDING_ID, "RoamSL"); public static final ThingTypeUID ERA_100_THING_TYPE_UID = new ThingTypeUID(BINDING_ID, "Era100"); @@ -60,7 +61,7 @@ public class SonosBindingConstants { public static final Set WITH_LINEIN_THING_TYPES_UIDS = Set.of(PLAY5_THING_TYPE_UID, FIVE_THING_TYPE_UID, PLAYBAR_THING_TYPE_UID, PLAYBASE_THING_TYPE_UID, BEAM_THING_TYPE_UID, CONNECT_THING_TYPE_UID, CONNECTAMP_THING_TYPE_UID, PORT_THING_TYPE_UID, ARC_THING_TYPE_UID, - ARC_SL_THING_TYPE_UID, ERA_100_THING_TYPE_UID, ERA_300_THING_TYPE_UID); + ARC_SL_THING_TYPE_UID, MOVE2_THING_TYPE_UID, ERA_100_THING_TYPE_UID, ERA_300_THING_TYPE_UID); public static final Set WITH_ANALOG_LINEIN_THING_TYPES_UIDS = Set.of(AMP_THING_TYPE_UID); @@ -71,7 +72,8 @@ public class SonosBindingConstants { FIVE_THING_TYPE_UID, PLAYBAR_THING_TYPE_UID, PLAYBASE_THING_TYPE_UID, BEAM_THING_TYPE_UID, CONNECT_THING_TYPE_UID, CONNECTAMP_THING_TYPE_UID, PORT_THING_TYPE_UID, AMP_THING_TYPE_UID, SYMFONISK_THING_TYPE_UID, ARC_THING_TYPE_UID, ARC_SL_THING_TYPE_UID, MOVE_THING_TYPE_UID, - ROAM_THING_TYPE_UID, ROAM_SL_THING_TYPE_UID, ERA_100_THING_TYPE_UID, ERA_300_THING_TYPE_UID); + MOVE2_THING_TYPE_UID, ROAM_THING_TYPE_UID, ROAM_SL_THING_TYPE_UID, ERA_100_THING_TYPE_UID, + ERA_300_THING_TYPE_UID); public static final Set SUPPORTED_THING_TYPES_UIDS = new HashSet<>(SUPPORTED_KNOWN_THING_TYPES_UIDS); static { diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties index b30363615c4..0e9c06e8e73 100644 --- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties +++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties @@ -32,6 +32,8 @@ thing-type.sonos.Five.label = Five thing-type.sonos.Five.description = Represents SONOS Five speaker thing-type.sonos.Move.label = Move thing-type.sonos.Move.description = Represents SONOS Move speaker +thing-type.sonos.Move2.label = Move 2 +thing-type.sonos.Move2.description = Represents SONOS Move 2 speaker thing-type.sonos.One.label = One thing-type.sonos.One.description = Represents SONOS One speaker thing-type.sonos.OneSL.label = One SL @@ -95,6 +97,7 @@ channel-type.sonos.codec.state.option.PCM20 = Dolby Multichannel PCM 2.0 channel-type.sonos.codec.state.option.DD51 = Dolby Digital 5.1 channel-type.sonos.codec.state.option.DDPlus51 = Dolby Digital Plus 5.1 channel-type.sonos.codec.state.option.PCM51 = Dolby Multichannel PCM 5.1 +channel-type.sonos.codec.state.option.DTS51 = DTS Surround 5.1 channel-type.sonos.coordinator.label = Coordinator channel-type.sonos.coordinator.description = UDN of the coordinator for the current group channel-type.sonos.currentalbum.label = Current Album diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/Move2.xml b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/Move2.xml new file mode 100644 index 00000000000..7877c64401b --- /dev/null +++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/Move2.xml @@ -0,0 +1,75 @@ + + + + + + + Represents SONOS Move 2 speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SONOS + Move 2 + + + udn + + + +