Merge pull request #196 from svrooij/feature/group-volume

feat: Implemented group volume controls

Author: svrooij

docs/control/1-commands.md

@@ -32,6 +32,9 @@ All these commands are crafted specially to be used in sonos2mqtt.
 
 |Command| |Description|Input|
 |-------|-|-----------|-------|
+|`groupvolume`|:speaker:|Set the group volume to a value|number (between 1 and 100)|
+|`groupvolumedown`|:heavy_minus_sign:|Decrease group volume by 2 or input number|optional number|
+|`groupvolumeup`|:heavy_plus_sign:|Increase group volume by 2 or input number|optional number|
 |`joingroup`||Join another group by name|name of other device|
 |`leavegroup`||Remove current device from the group it's in| |
 |`mute`|:speaker:|Mute the volume| |
@@ -62,7 +65,7 @@ All these commands are crafted specially to be used in sonos2mqtt.
 |`toggle`||Toggle between pause and play| |
 |`unmute`|:mute:|Unmute the volume| |
 |`volume`|:speaker:|Set the volume to a value|number (between 1 and 100)|
-|`volumedown`|:heavy_minus_sign:|Decrease volume with 5 or number|optional number|
-|`volumeup`|:heavy_plus_sign:|Increase volume with 5 or number|optional number|
+|`volumedown`|:heavy_minus_sign:|Decrease volume by 2 or input number|optional number|
+|`volumeup`|:heavy_plus_sign:|Increase volume by 2 or input number|optional number|
 
 Check out the [commands](https://github.com/svrooij/sonos2mqtt/blob/master/src/sonos-commands.ts) or the [mapping](https://github.com/svrooij/sonos2mqtt/blob/master/src/sonos-command-mapping.ts) if you're interested in how this works.

src/sonos-command-mapping.ts

@@ -30,6 +30,21 @@ export class SonosCommandMapping {
       case SonosCommands.Crossfade:
         return await device.AVTransportService.SetCrossfadeMode({ InstanceID: 0, CrossfadeMode: SonosCommandMapping.PayloadToBool(payload) })
 
+      case SonosCommands.GroupVolume:
+        if(typeof payload === 'number')
+          return await device.Coordinator.GroupRenderingControlService.SetGroupVolume({ InstanceID: 0, DesiredVolume: payload })
+        break;
+
+      case SonosCommands.GroupVolumeDown:
+        return await device.GroupRenderingControlService.SetRelativeGroupVolume({ 
+          InstanceID: 0, 
+          Adjustment: ((typeof payload === 'number') ? payload : 2) * -1})
+          
+      case SonosCommands.GroupVolumeUp:
+        return await device.GroupRenderingControlService.SetRelativeGroupVolume({ 
+          InstanceID: 0,
+          Adjustment: ((typeof payload === 'number') ? payload : 2)})
+
       case SonosCommands.JoinGroup:
         if(typeof payload === 'string')
           return await device.JoinGroup(payload)
@@ -149,6 +164,9 @@ export class SonosCommandMapping {
           }
         } else if (typeof payload === 'string') {
           return await device.AVTransportService.SnoozeAlarm({InstanceID: 0, Duration: payload})
+        } else if (!payload) {
+          // Cancel snoozed alarm
+          return await device.AVTransportService.SnoozeAlarm({ InstanceID: 0, Duration: '' });
         }
         break;
       case SonosCommands.Speak:
@@ -189,12 +207,12 @@ export class SonosCommandMapping {
       case SonosCommands.VolumeDown:
         return await device.RenderingControlService.SetRelativeVolume({ 
           InstanceID: 0, Channel: 'Master', 
-          Adjustment: ((typeof payload === 'number') ? payload : 4) * -1})
+          Adjustment: ((typeof payload === 'number') ? payload : 2) * -1})
 
       case SonosCommands.VolumeUp:
         return await device.RenderingControlService.SetRelativeVolume({ 
           InstanceID: 0, Channel: 'Master', 
-          Adjustment: ((typeof payload === 'number') ? payload : 4)})
+          Adjustment: ((typeof payload === 'number') ? payload : 2)})
 
       default:
         throw new Error(`Command '${command}' not implemented`)

src/sonos-commands.ts

@@ -3,6 +3,9 @@ export enum SonosCommands {
   ClearQueue = 'clearqueue',
   Command = 'command',
   Crossfade = 'crossfade',
+  GroupVolume = 'groupvolume',
+  GroupVolumeDown = 'groupvolumedown',
+  GroupVolumeUp = 'groupvolumeup',
   JoinGroup = 'joingroup',
   LeaveGroup = 'leavegroup',
   Mute = 'mute',