[BlueZ] test/example-advertisement: Fix include_tx_power

Commit Message

Alvar Penning May 20, 2020, 8:44 p.m. UTC

Adding the Tx Power Level is no longer done via IncludeTxPower, but via
the tx-power value in the Includes array. The previous code did not
throw an error, but neither led to the insertion of the value. As a
result of this change, include_tx_power now adds the Tx Power Level
again.
---
 test/example-advertisement | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Luiz Augusto von Dentz May 21, 2020, 4:23 p.m. UTC | #1

Hi Alvar,

On Wed, May 20, 2020 at 1:54 PM Alvar Penning <[e-mail]> wrote:
>
> Adding the Tx Power Level is no longer done via IncludeTxPower, but via
> the tx-power value in the Includes array. The previous code did not
> throw an error, but neither led to the insertion of the value. As a
> result of this change, include_tx_power now adds the Tx Power Level
> again.
> ---
>  test/example-advertisement | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/test/example-advertisement b/test/example-advertisement
> index f116893b6..96e410683 100755
> --- a/test/example-advertisement
> +++ b/test/example-advertisement
> @@ -57,7 +57,7 @@ class Advertisement(dbus.service.Object):
>          self.solicit_uuids = None
>          self.service_data = None
>          self.local_name = None
> -        self.include_tx_power = None
> +        self.include_tx_power = False
>          self.data = None
>          dbus.service.Object.__init__(self, bus, self.path)
>
> @@ -78,8 +78,8 @@ class Advertisement(dbus.service.Object):
>                                                          signature='sv')
>          if self.local_name is not None:
>              properties['LocalName'] = dbus.String(self.local_name)
> -        if self.include_tx_power is not None:
> -            properties['IncludeTxPower'] = dbus.Boolean(self.include_tx_power)
> +        if self.include_tx_power:
> +            properties['Includes'] = dbus.Array(["tx-power"], signature='s')
>
>          if self.data is not None:
>              properties['Data'] = dbus.Dictionary(
> --
> 2.25.4

Applied, thanks.

Patch

diff --git a/test/example-advertisement b/test/example-advertisement
index f116893b6..96e410683 100755
--- a/test/example-advertisement
+++ b/test/example-advertisement
@@ -57,7 +57,7 @@  class Advertisement(dbus.service.Object):
         self.solicit_uuids = None
         self.service_data = None
         self.local_name = None
-        self.include_tx_power = None
+        self.include_tx_power = False
         self.data = None
         dbus.service.Object.__init__(self, bus, self.path)
 
@@ -78,8 +78,8 @@  class Advertisement(dbus.service.Object):
                                                         signature='sv')
         if self.local_name is not None:
             properties['LocalName'] = dbus.String(self.local_name)
-        if self.include_tx_power is not None:
-            properties['IncludeTxPower'] = dbus.Boolean(self.include_tx_power)
+        if self.include_tx_power:
+            properties['Includes'] = dbus.Array(["tx-power"], signature='s')
 
         if self.data is not None:
             properties['Data'] = dbus.Dictionary(