From b31cef173e499db68ebdeb56708d300b8a1942d5 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 29 Sep 2006 18:45:25 +0000 Subject: Add simple D-Bus preload script for Python --- test/dbusdef.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 test/dbusdef.py (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py new file mode 100644 index 00000000..29cf7ffc --- /dev/null +++ b/test/dbusdef.py @@ -0,0 +1,7 @@ +import dbus + +bus = dbus.SystemBus() + +manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager') + +adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') -- cgit From d78dcb8b79e0db5dddab5f98cd825c69f0bf9938 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 29 Sep 2006 19:11:48 +0000 Subject: Add experimental objects --- test/dbusdef.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index 29cf7ffc..150c5b66 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -5,3 +5,9 @@ bus = dbus.SystemBus() manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager') adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') + +test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test') + +rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM') + +sdp = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.SDP') -- cgit From b467488a2ed54badfff71b4aa892ded051670aa3 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 29 Oct 2006 16:50:26 +0000 Subject: Add service objects --- test/dbusdef.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index 150c5b66..f039cd4b 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -11,3 +11,18 @@ test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'or rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM') sdp = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.SDP') + +echo = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/echo'), 'org.bluez.Service') + +network = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/network'), 'org.bluez.Service') + +input = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/input'), 'org.bluez.Service') + +audio = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/audio'), 'org.bluez.Service') + +def connect_echo() : + return dbus.Interface(bus.get_object(echo.GetConnectionName(), '/org/bluez/echo'), 'org.freedesktop.DBus.Introspectable') + +def connect_holtmann() : + holtmann = dbus.Interface(bus.get_object('org.bluez', '/org/holtmann'), 'org.bluez.Service') + return dbus.Interface(bus.get_object(holtmann.GetConnectionName(), '/org/holtmann'), 'org.freedesktop.DBus.Introspectable') -- cgit From 2666321aed1ad39b9dd3f25879d0993e9f51ed17 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 16 Jan 2007 11:18:21 +0000 Subject: Adapt to the service interface changes --- test/dbusdef.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index f039cd4b..c48f8479 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -2,6 +2,7 @@ import dbus bus = dbus.SystemBus() + manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager') adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') @@ -10,19 +11,22 @@ test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'or rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM') -sdp = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.SDP') -echo = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/echo'), 'org.bluez.Service') +def create_service(identifier): + try: + path = manager.FindService(identifier) + except: + path = "" + + if (path != ""): + return dbus.Interface(bus.get_object('org.bluez', path), 'org.bluez.Service') -network = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/network'), 'org.bluez.Service') +transfer = create_service("transfer") -input = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/input'), 'org.bluez.Service') +network = create_service("network") -audio = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/audio'), 'org.bluez.Service') +input = create_service("input") -def connect_echo() : - return dbus.Interface(bus.get_object(echo.GetConnectionName(), '/org/bluez/echo'), 'org.freedesktop.DBus.Introspectable') +audio = create_service("audio") -def connect_holtmann() : - holtmann = dbus.Interface(bus.get_object('org.bluez', '/org/holtmann'), 'org.bluez.Service') - return dbus.Interface(bus.get_object(holtmann.GetConnectionName(), '/org/holtmann'), 'org.freedesktop.DBus.Introspectable') +headset = create_service("headset") -- cgit From f24e25355de0241f9a1c9117e0a3a3be35026611 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 19 Jan 2007 15:53:19 +0000 Subject: Update pre-created objects --- test/dbusdef.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index c48f8479..b0ab1b89 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -3,8 +3,14 @@ import dbus bus = dbus.SystemBus() +dummy = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.freedesktop.DBus.Introspectable') + +#print dummy.Introspect() + manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager') +database = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Database') + adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test') @@ -21,6 +27,8 @@ def create_service(identifier): if (path != ""): return dbus.Interface(bus.get_object('org.bluez', path), 'org.bluez.Service') +echo = create_service("echo") + transfer = create_service("transfer") network = create_service("network") -- cgit From 1c36a2a3227e07660d678b6844cf393aac005119 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 21 Jan 2007 01:51:04 +0000 Subject: Add function for connection the transfer manager --- test/dbusdef.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index b0ab1b89..62203993 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -38,3 +38,13 @@ input = create_service("input") audio = create_service("audio") headset = create_service("headset") + + +def connect_transfer(): + try: + conn = manager.ActivateService("transfer") + except: + conn = "" + + if (conn != ""): + return dbus.Interface(bus.get_object(conn, "/org/bluez/transfer"), 'org.bluez.transfer.Manager') -- cgit From f89882a84a048cd676798e4a047a73fb202e246d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 3 Apr 2007 20:48:42 +0000 Subject: Update test setup --- test/dbusdef.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index 62203993..97a0eb4d 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -7,15 +7,24 @@ dummy = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.freedeskt #print dummy.Introspect() + manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager') database = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Database') -adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') -test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test') +try: + adapter = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Adapter') + + test = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.Test') + + rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM') +except: + adapter = "" + + test = "" -rfcomm = dbus.Interface(bus.get_object('org.bluez', manager.DefaultAdapter()), 'org.bluez.RFCOMM') + rfcomm = "" def create_service(identifier): @@ -40,11 +49,11 @@ audio = create_service("audio") headset = create_service("headset") -def connect_transfer(): +def connect_headset(): try: - conn = manager.ActivateService("transfer") + conn = manager.ActivateService("headset") except: conn = "" if (conn != ""): - return dbus.Interface(bus.get_object(conn, "/org/bluez/transfer"), 'org.bluez.transfer.Manager') + return dbus.Interface(bus.get_object(conn, "/org/bluez/audio"), 'org.bluez.audio.Manager') -- cgit From 232610dea7be7fc8ca6a6bd22a02eca4a072b9c1 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 5 Apr 2007 20:10:01 +0000 Subject: Use generic service connect function --- test/dbusdef.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/dbusdef.py') diff --git a/test/dbusdef.py b/test/dbusdef.py index 97a0eb4d..ca6debf4 100644 --- a/test/dbusdef.py +++ b/test/dbusdef.py @@ -49,11 +49,11 @@ audio = create_service("audio") headset = create_service("headset") -def connect_headset(): +def connect_service(identifier): try: - conn = manager.ActivateService("headset") + conn = manager.ActivateService(identifier) except: conn = "" if (conn != ""): - return dbus.Interface(bus.get_object(conn, "/org/bluez/audio"), 'org.bluez.audio.Manager') + return dbus.Interface(bus.get_object(conn, "/org/bluez/" + identifier), 'org.bluez.' + identifier + '.Manager') -- cgit