meta-digi-dey: hdp-test: port HDP test application to bluez5

https://jira.digi.com/browse/DEL-1936

Signed-off-by: Urko Nalda <Urko.Nalda@digi.com>
This commit is contained in:
Urko Nalda 2015-11-27 13:01:34 +01:00
parent a8c4447358
commit 54ba526157
1 changed files with 14 additions and 8 deletions

View File

@ -20,6 +20,12 @@ import argparse
# from hdp_utils import * # from hdp_utils import *
from random import randint from random import randint
BUS_NAME = 'org.bluez'
PATH = '/org/bluez'
HEALTH_MANAGER_INTERFACE = 'org.bluez.HealthManager1'
HEALTH_DEVICE_INTERFACE = 'org.bluez.HealthDevice1'
HEALTH_CHANNEL_INTERFACE = 'org.bluez.HealthChannel1'
class MessageType: class MessageType:
(Association, Configuration, Release_Request, (Association, Configuration, Release_Request,
Release_Confirmation, Data, Unknown) = range(0, 6) Release_Confirmation, Data, Unknown) = range(0, 6)
@ -204,17 +210,17 @@ class SignalHandler(object):
def __init__(self): def __init__(self):
bus.add_signal_receiver(self.ChannelConnected, bus.add_signal_receiver(self.ChannelConnected,
signal_name="ChannelConnected", signal_name="ChannelConnected",
bus_name="org.bluez", bus_name=BUS_NAME,
path_keyword="device", path_keyword="device",
interface_keyword="interface", interface_keyword="interface",
dbus_interface="org.bluez.HealthDevice") dbus_interface=HEALTH_DEVICE_INTERFACE)
bus.add_signal_receiver(self.ChannelDeleted, bus.add_signal_receiver(self.ChannelDeleted,
signal_name="ChannelDeleted", signal_name="ChannelDeleted",
bus_name="org.bluez", bus_name=BUS_NAME,
path_keyword="device", path_keyword="device",
interface_keyword="interface", interface_keyword="interface",
dbus_interface="org.bluez.HealthDevice") dbus_interface=HEALTH_DEVICE_INTERFACE)
def ChannelConnected(self, channel, interface, device): def ChannelConnected(self, channel, interface, device):
print "%s has connected" % device print "%s has connected" % device
@ -225,8 +231,8 @@ class SignalHandler(object):
# a socket for the connection. # a socket for the connection.
# #
try: try:
channel = bus.get_object("org.bluez", channel) channel = bus.get_object(BUS_NAME, channel)
channel = dbus.Interface(channel, "org.bluez.HealthChannel") channel = dbus.Interface(channel, HEALTH_CHANNEL_INTERFACE)
fd = channel.Acquire() fd = channel.Acquire()
fd = fd.take() fd = fd.take()
sk = socket.fromfd(fd, socket.AF_UNIX, socket.SOCK_STREAM) sk = socket.fromfd(fd, socket.AF_UNIX, socket.SOCK_STREAM)
@ -266,8 +272,8 @@ signal_handler = SignalHandler()
config = dbus.Dictionary({"Role": "Sink", "DataType": dbus.types.UInt16(0x1004), config = dbus.Dictionary({"Role": "Sink", "DataType": dbus.types.UInt16(0x1004),
"Description": "Oximeter sink"}, signature='sv') "Description": "Oximeter sink"}, signature='sv')
manager = dbus.Interface(bus.get_object("org.bluez", "/org/bluez"), manager = dbus.Interface(bus.get_object(BUS_NAME, PATH),
"org.bluez.HealthManager") HEALTH_MANAGER_INTERFACE)
app = manager.CreateApplication(config) app = manager.CreateApplication(config)
print "HDP application created, waiting for connection from" print "HDP application created, waiting for connection from"
print "a pulse oximeter. Press control-c to terminate." print "a pulse oximeter. Press control-c to terminate."