Add grandstream_speaker_ring_volume to all templates

Excludes the P8352 value if the default setting grandstream_speaker_ring_volume is unset. Depends on PR #5522

Before anyone asks, Mandatory just means that the variable must be valid, not that it must be included in every XML download. The phone already has a valid value in its internal settings, so as long as we stay safe from setting it to an empty value or outside of the range of 0-7, we are safe. Excluding it is a valid option, which is also true for all settings labelled Mandatory in the Grandstream templates.
This commit is contained in:
demonspork
2020-10-09 23:15:31 -05:00
parent 03c41aafa5
commit 324468c3fd
12 changed files with 36 additions and 12 deletions

View File

@@ -4287,7 +4287,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -4382,7 +4382,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -5102,7 +5102,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -6431,7 +6431,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -7351,7 +7351,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -8330,7 +8330,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -7625,7 +7625,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -8263,7 +8263,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -8256,7 +8256,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -8256,7 +8256,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -8268,7 +8268,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->

View File

@@ -8256,7 +8256,9 @@
<!-- # Speaker Ring Volume -->
<!-- # Number: 0-7. Default is 5. -->
<!-- # Mandatory -->
<P8352>5</P8352>
{if isset($grandstream_speaker_ring_volume)}
<P8352>{$grandstream_speaker_ring_volume}</P8352>
{/if}
<!-- # Notification Tone Volume -->
<!-- # Number: 0-7. Default is 5. -->