diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2012-12-14 11:12:59 +0200 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-14 11:24:19 +0200 |
commit | ce25879be449dd80f2bce5d8aaa1b3012d255de1 (patch) | |
tree | 8af060f0f2144c1b3103ab7173d51666f7cf7bc4 /test | |
parent | 942fe3bb79344791094cfe5afa4e964cf26286a5 (diff) |
thermometer: Append version to Thermometer interfaces
Diffstat (limited to 'test')
-rwxr-xr-x | test/test-thermometer | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/test/test-thermometer b/test/test-thermometer index fdb772f7cf..6c143befcd 100755 --- a/test/test-thermometer +++ b/test/test-thermometer @@ -15,8 +15,13 @@ import dbus.mainloop.glib from optparse import OptionParser, make_option import bluezutils +BUS_NAME = 'org.bluez' +THERMOMETER_MANAGER_INTERFACE = 'org.bluez.ThermometerManager1' +THERMOMETER_WATCHER_INTERFACE = 'org.bluez.ThermometerWatcher1' +THERMOMETER_INTERFACE = 'org.bluez.Thermometer1' + class Watcher(dbus.service.Object): - @dbus.service.method("org.bluez.ThermometerWatcher", + @dbus.service.method(THERMOMETER_WATCHER_INTERFACE, in_signature="oa{sv}", out_signature="") def MeasurementReceived(self, device, measure): print("%s measurement received from %s" % (measure["Measurement"], device)) @@ -31,7 +36,7 @@ class Watcher(dbus.service.Object): print("Type: ", measure["Type"]) def properties_changed(interface, changed, invalidated): - if interface != "org.bluez.Thermometer": + if interface != THERMOMETER_INTERFACE: return for name, value in changed.iteritems(): print("Property %s changed: %s" % (name, str(value))) @@ -63,15 +68,15 @@ if __name__ == "__main__": options.adapter) adapter_path = adapter.object_path - thermometer_manager = dbus.Interface(bus.get_object("org.bluez", - adapter_path), "org.bluez.ThermometerManager") + thermometer_manager = dbus.Interface(bus.get_object(BUS_NAME, + adapter_path), THERMOMETER_MANAGER_INTERFACE) device = bluezutils.find_device_in_objects(managed_objects, options.address, options.adapter) device_path = device.object_path - bus.add_signal_receiver(properties_changed, bus_name="org.bluez", + bus.add_signal_receiver(properties_changed, bus_name=BUS_NAME, path=device_path, dbus_interface="org.freedesktop.DBus.Properties", signal_name="PropertiesChanged") |