diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2016-11-05 13:48:42 +0100 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2016-11-05 13:48:42 +0100 |
| commit | 8d509d896186808fe63c90f14e7be328bd83db76 (patch) | |
| tree | 67c8f5b17ca2322c4c93bd0724badf32aac03043 /test | |
| parent | 3903f43272400d5dbaecfad6c45fdeec4fe8fff4 (diff) | |
| download | navigation-8d509d896186808fe63c90f14e7be328bd83db76.tar.gz | |
fix bug in qml/dbus wrapper, adapt paths to CommonAPI 3.1.9
Diffstat (limited to 'test')
| -rwxr-xr-x | test/script/simulation-dashboard-capi.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/script/simulation-dashboard-capi.py b/test/script/simulation-dashboard-capi.py index 87f2db0..b451b1e 100755 --- a/test/script/simulation-dashboard-capi.py +++ b/test/script/simulation-dashboard-capi.py @@ -329,43 +329,43 @@ ambOdometerInterface = dbus.Interface(ambOdometer, "org.automotive.Odometer") # Fuel Stop Advisor try: - fuelStopAdvisorObject = dbusConnectionBus.get_object("org.genivi.demonstrator.FuelStopAdvisor_FuelStopAdvisor","/FuelStopAdvisor") + fuelStopAdvisorObject = dbusConnectionBus.get_object("org.genivi.demonstrator.FuelStopAdvisor.v1_0_FuelStopAdvisor","/FuelStopAdvisor") except dbus.DBusException: print ("connection to Fuel Stop Advisor failed") print_exc() sys.exit(1) -fuelStopAdvisorInterface = dbus.Interface(fuelStopAdvisorObject, "org.genivi.demonstrator.FuelStopAdvisor") -dbusConnectionBus.add_signal_receiver(fuelStopAdvisorWarningHandler, dbus_interface = "org.genivi.demonstrator.FuelStopAdvisor", signal_name = "FuelStopAdvisorWarning") +fuelStopAdvisorInterface = dbus.Interface(fuelStopAdvisorObject, "org.genivi.demonstrator.FuelStopAdvisor.v1_0") +dbusConnectionBus.add_signal_receiver(fuelStopAdvisorWarningHandler, dbus_interface = "org.genivi.demonstrator.FuelStopAdvisor.v1_0", signal_name = "FuelStopAdvisorWarning") # Enhanced position try: - enhancedPositionObject = dbusConnectionBus.get_object("org.genivi.EnhancedPositionService.EnhancedPosition_EnhancedPositionService", "/EnhancedPositionService") + enhancedPositionObject = dbusConnectionBus.get_object("org.genivi.EnhancedPositionService.EnhancedPosition.v0_0_EnhancedPositionService", "/EnhancedPositionService") except dbus.DBusException: print ("connection to Enhanced position failed") print_exc() sys.exit(1) -enhancedPositionInterface = dbus.Interface(enhancedPositionObject, "org.genivi.EnhancedPositionService.EnhancedPosition") -dbusConnectionBus.add_signal_receiver(enhancedPositionPositionUpdateHandler, dbus_interface = "org.genivi.EnhancedPositionService.EnhancedPosition", signal_name = "PositionUpdate") +enhancedPositionInterface = dbus.Interface(enhancedPositionObject, "org.genivi.EnhancedPositionService.EnhancedPosition.v0_0") +dbusConnectionBus.add_signal_receiver(enhancedPositionPositionUpdateHandler, dbus_interface = "org.genivi.EnhancedPositionService.EnhancedPosition.v0_0", signal_name = "PositionUpdate") # Guidance try: - guidanceObject = dbusConnectionBus.get_object('org.genivi.navigation.navigationcore.Guidance_Guidance','/Guidance') + guidanceObject = dbusConnectionBus.get_object('org.genivi.navigation.navigationcore.Guidance.v4_0_Guidance','/Guidance') except dbus.DBusException: print ("connection to Guidance failed") print_exc() sys.exit(1) -guidanceInterface = dbus.Interface(guidanceObject, 'org.genivi.navigation.navigationcore.Guidance') -dbusConnectionBus.add_signal_receiver(guidanceStatusHandler, dbus_interface = "org.genivi.navigation.navigationcore.Guidance", signal_name = "guidanceStatusChanged") +guidanceInterface = dbus.Interface(guidanceObject, 'org.genivi.navigation.navigationcore.Guidance.v4_0') +dbusConnectionBus.add_signal_receiver(guidanceStatusHandler, dbus_interface = "org.genivi.navigation.navigationcore.Guidance.v4_0", signal_name = "guidanceStatusChanged") # Map matched position try: - mapMatchedPositionObject = dbusConnectionBus.get_object("org.genivi.navigation.navigationcore.MapMatchedPosition_MapMatchedPosition","/MapMatchedPosition") + mapMatchedPositionObject = dbusConnectionBus.get_object("org.genivi.navigation.navigationcore.MapMatchedPosition.v4_0_MapMatchedPosition","/MapMatchedPosition") except dbus.DBusException: print ("connection to Map matched position failed") print_exc() sys.exit(1) -mapMatchedPositionInterface = dbus.Interface(mapMatchedPositionObject, "org.genivi.navigationcore.MapMatchedPosition") -dbusConnectionBus.add_signal_receiver(mapMatchedPositionSimulationStatusHandler, dbus_interface = "org.genivi.navigationcore.MapMatchedPosition", signal_name = "SimulationStatusChanged") +mapMatchedPositionInterface = dbus.Interface(mapMatchedPositionObject, "org.genivi.navigationcore.MapMatchedPosition.v4_0") +dbusConnectionBus.add_signal_receiver(mapMatchedPositionSimulationStatusHandler, dbus_interface = "org.genivi.navigationcore.MapMatchedPosition.v4_0", signal_name = "SimulationStatusChanged") displayStatus( 'Start simulation' ) |