diff options
| -rw-r--r-- | api/franca/fsa/FuelStopAdvisor.fidl | 11 | ||||
| -rwxr-xr-x | src/clone_and_build.sh | 2 | ||||
| -rw-r--r-- | src/hmi/qml/CameraSettings.qml | 6 | ||||
| -rw-r--r-- | src/hmi/qml/Core/genivi-capi.js | 210 | ||||
| -rw-r--r-- | src/hmi/qml/Core/genivi-origin.js | 146 | ||||
| -rw-r--r-- | src/hmi/qml/EntryFreeText.qml | 4 | ||||
| -rw-r--r-- | src/hmi/qml/NavigationBrowseMap.qml | 30 | ||||
| -rw-r--r-- | src/hmi/qml/NavigationSearchAddress.qml | 66 | ||||
| -rw-r--r-- | src/hmi/qml/NavigationSearchFreeText.qml | 8 | ||||
| -rw-r--r-- | src/hmi/qml/POI.qml | 1 | ||||
| -rw-r--r-- | src/hmi/qml/TripComputer.qml | 23 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/script/simulation-dashboard-capi.py | 32 |
12 files changed, 359 insertions, 180 deletions
diff --git a/api/franca/fsa/FuelStopAdvisor.fidl b/api/franca/fsa/FuelStopAdvisor.fidl index 1af6ef1..ccef9be 100644 --- a/api/franca/fsa/FuelStopAdvisor.fidl +++ b/api/franca/fsa/FuelStopAdvisor.fidl @@ -20,10 +20,7 @@ interface FuelStopAdvisor { INVALID = 0 } - enumeration TripNumber { - TRIP1 = 0 - TRIP2 = 1 - } + typedef TripNumber is UInt8 enumeration UnitAttribute { ODOMETER = 32 @@ -50,10 +47,10 @@ interface FuelStopAdvisor { enumeration InstantDataAttribute extends BasicEnum { ODOMETER = 32 FUEL_LEVEL = 33 - INSTANT_SPEED = 34 + TANK_DISTANCE = 34 INSTANT_FUEL_CONSUMPTION_PER_DISTANCE = 35 - TANK_DISTANCE = 52 - ENHANCED_TANK_DISTANCE = 53 + ENHANCED_TANK_DISTANCE = 36 + INSTANT_SPEED = 37 } union InstantDataValue { diff --git a/src/clone_and_build.sh b/src/clone_and_build.sh index e62ff43..af0197b 100755 --- a/src/clone_and_build.sh +++ b/src/clone_and_build.sh @@ -1,7 +1,7 @@ #!/bin/bash build_option="" -navigation_version='4c5be944a506f64427a25ada714a4a6f64e5ebf3' +navigation_version='91a5f1c511c21533fc4ae2314ece462e42a155e9' positioning_version='f341b4a2cb216d6204136794d33076170ab1bf80' navit_version='c1b0faace0e241f743a1421e8826d84aacb2d153' diff --git a/src/hmi/qml/CameraSettings.qml b/src/hmi/qml/CameraSettings.qml index ce2ce3b..b980868 100644 --- a/src/hmi/qml/CameraSettings.qml +++ b/src/hmi/qml/CameraSettings.qml @@ -73,7 +73,7 @@ HMIMenu { property real clamp_value; onTriggered: { if (active) { - var res=Genivi.mapviewercontrol_message(dbusIf, "Get"+camera_value, []); + var res=Genivi.mapviewer_GetCameraValue(dbusIf,camera_value); res[1]+=step; if (clamp) { if (step > 0 && res[1] > clamp_value) { @@ -83,7 +83,7 @@ HMIMenu { res[1]=clamp_value; } } - Genivi.mapviewercontrol_message(dbusIf, "Set"+camera_value, res); + Genivi.mapviewer_SetCameraValue(dbusIf,camera_value, res); interval=50; restart(); } @@ -129,7 +129,7 @@ HMIMenu { function set_angle(angle) { - Genivi.mapviewercontrol_message(dbusIf, "SetMapViewRotation", ["int32",angle,"int32",15]); + Genivi.mapviewer_SetMapViewRotation(dbusIf,angle); } function updateMapViewer() diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js index a5e0de2..792e16b 100644 --- a/src/hmi/qml/Core/genivi-capi.js +++ b/src/hmi/qml/Core/genivi-capi.js @@ -240,7 +240,98 @@ function poi_message(par, iface, func, args) // Send a message to demonstrator (basic) function demonstrator_message(par, iface, func, args) { - return par.message("org.genivi.demonstrator."+iface,"/org/genivi/demonstrator"+iface,"org.genivi.demonstrator."+iface, func, args); + return par.message("org.genivi.demonstrator."+iface+"_"+iface,"/"+iface,"org.genivi.demonstrator."+iface, func, args); +} + +//----------------- DBus signals ----------------- +function connect_simulationStatusChangedSignal(interface,menu) +{ + return interface.connect("","/MapMatchedPosition","org.genivi.navigation.navigationcore.MapMatchedPosition","simulationStatusChanged",menu,"simulationStatusChanged"); +} + +function connect_simulationSpeedChangedSignal(interface,menu) +{ + return interface.connect("","/MapMatchedPosition","org.genivi.navigation.navigationcore.MapMatchedPosition","simulationSpeedChanged",menu,"simulationSpeedChanged"); +} + +function connect_searchStatusSignal(interface,menu) +{ + return interface.connect("","/LocationInput","org.genivi.navigation.navigationcore.LocationInput","searchStatus",menu,"searchStatus"); +} + +function connect_searchResultListSignal(interface,menu) +{ + return interface.connect("","/LocationInput","org.genivi.navigation.navigationcore.LocationInput","searchResultList",menu,"searchResultList"); +} + +function connect_spellResultSignal(interface,menu) +{ + return interface.connect("","/LocationInput","org.genivi.navigation.navigationcore.LocationInput","spellResult",menu,"spellResult"); +} + +function connect_guidanceWaypointReachedSignal(interface,menu) +{ + return interface.connect("","/Guidance","org.genivi.navigation.navigationcore.Guidance","waypointReached",menu,"guidanceWaypointReached"); +} + +function connect_guidanceManeuverChangedSignal(interface,menu) +{ + return interface.connect("","/Guidance","org.genivi.navigation.navigationcore.Guidance","maneuverChanged",menu,"guidanceManeuverChanged"); +} + +function connect_guidancePositionOnRouteChangedSignal(interface,menu) +{ + return interface.connect("","/Guidance","org.genivi.navigation.navigationcore.Guidance","positionOnRouteChanged",menu,"guidancePositionOnRouteChanged"); +} + +function connect_mapmatchedpositionPositionUpdateSignal(interface,menu) +{ + return interface.connect("","/MapMatchedPosition","org.genivi.navigation.navigationcore.MapMatchedPosition","positionUpdate",menu,"mapmatchedpositionPositionUpdate"); +} + +function connect_mapmatchedpositionAddressUpdateSignal(interface,menu) +{ + return interface.connect("","/MapMatchedPosition","org.genivi.navigation.navigationcore.MapMatchedPosition","addressUpdate",menu,"mapmatchedpositionAddressUpdate"); +} + +function connect_routeCalculationSuccessfulSignal(interface,menu) +{ + return interface.connect("","/Routing","org.genivi.navigation.navigationcore.Routing","routeCalculationSuccessful",menu,"routeCalculationSuccessful"); +} + +function connect_routeCalculationFailedSignal(interface,menu) +{ + return interface.connect("","/Routing","org.genivi.navigation.navigationcore.Routing","routeCalculationFailed",menu,"routeCalculationFailed"); +} + +function connect_routeCalculationProgressUpdateSignal(interface,menu) +{ + return interface.connect("","/Routing","org.genivi.navigation.navigationcore.Routing","routeCalculationProgressUpdate",menu,"routeCalculationProgressUpdate"); +} + +function connect_currentSelectionCriterionSignal(interface,menu) +{ + return interface.connect("","/LocationInput","org.genivi.navigation.navigationcore.LocationInput","currentSelectionCriterion",menu,"currentSelectionCriterion"); +} + +function connect_contentUpdatedSignal(interface,menu) +{ + return interface.connect("","/LocationInput","org.genivi.navigation.navigationcore.LocationInput","contentUpdated",menu,"contentUpdated"); +} + +function connect_configurationChangedSignal(interface,menu) +{ + return interface.connect("","/Configuration","org.genivi.navigation.navigationcore.Configuration","configurationChanged",menu,"configurationChanged"); +} + +function connect_tripDataUpdatedSignal(interface,menu) +{ + return interface.connect("","/FuelStopAdvisor","org.genivi.demonstrator.FuelStopAdvisor","tripDataUpdated",menu,"tripDataUpdated"); +} + +function connect_fuelStopAdvisorSignal(interface,menu) +{ + return interface.connect("","/FuelStopAdvisor","org.genivi.demonstrator.FuelStopAdvisor","fuelStopAdvisorWarning",menu,"fuelStopAdvisorWarning"); } //----------------- NavigationCore dbus messages ----------------- @@ -256,7 +347,7 @@ function navigationcore_session_message(par, func, args) function navigationcore_session(par) { if (!g_nav_session[1]) { - var res=navigationcore_session_message(par,"CreateSession", ["string","TestHMI"]); + var res=navigationcore_session_message(par,"createSession", ["string","TestHMI"]); g_nav_session[1]=res[3]; } return g_nav_session; @@ -316,7 +407,7 @@ function locationinput_handle(par) { if (!g_locationinput_handle[1]) { - var res=navigationcore_message(par, "LocationInput","createLocationInput", navigationcore_session(par)).slice(0,2); + var res=navigationcore_message(par, "LocationInput","createLocationInput", navigationcore_session(par)); g_locationinput_handle[1]=res[3]; } return g_locationinput_handle; @@ -363,18 +454,24 @@ function locationinput_handle_clear(par) //----------------- Routing messages ----------------- -// Send a message to routing with session handle +// Send a message to routing with session handle and route handle function routing_message(par, func, args) { //session handle sent return navigationcore_message(par, "Routing", func, navigationcore_session(par).concat(routing_handle(par),args)); } -// Send a message to routing without session handle +// Send a message to routing with route handle function routing_get(par, func, args) { return navigationcore_message(par, "Routing", func, routing_handle(par).concat(args)); } +// Send a message to routing +function routing(par, func, args) +{ + return navigationcore_message(par, "Routing", func, args); +} + // Create a new routing handle or get the current handle function routing_handle(par) { if (!g_routing_handle[1]) @@ -405,7 +502,7 @@ function routing_GetRouteOverviewTimeAndDistance(dbusIf) function routing_GetCostModel(dbusIf) { - return routing_message(dbusIf,"getCostModel",[]); + return routing_get(dbusIf,"getCostModel",[]); } function routing_SetCostModel(dbusIf,costModel) @@ -415,12 +512,12 @@ function routing_SetCostModel(dbusIf,costModel) function routing_GetSupportedCostModels(dbusIf) { - return routing_message(dbusIf,"getSupportedCostModels",[]); + return routing(dbusIf,"getSupportedCostModels",[]); } function routing_GetSupportedRoutePreferences(dbusIf) { - return routing_message(dbusIf,"getSupportedRoutePreferences",[]); + return routing(dbusIf,"getSupportedRoutePreferences",[]); } function routing_GetRoutePreferences(dbusIf,countryCode) @@ -435,7 +532,6 @@ function routing_SetRoutePreferences(dbusIf,countryCode) var message=["string",countryCode]; message=message.concat(roadMessage.concat(conditionMessage)); var res=routing_message(dbusIf,"setRoutePreferences",message); - dump("setRoutePreferences",res); } function routing_GetRouteSegments(dbusIf,detailLevel,numberOfSegments,offset) @@ -482,51 +578,51 @@ function routing_GetRouteBoundingBox(dbusIf,routeHandle) //----------------- Guidance messages ----------------- // Send a message to guidance with session handle -function guidance_s(par, func, args) +function guidance_message(par, func, args) { return navigationcore_message(par, "Guidance", func, navigationcore_session(par).concat(args)); } // Send a message to guidance without session handle -function guidance_message(par, func, args) +function guidance_get(par, func, args) { return navigationcore_message(par, "Guidance", func, args); } function guidance_StartGuidance(dbusIf,routeHandle) { - guidance_s(dbusIf,"startGuidance",routeHandle); + guidance_message(dbusIf,"startGuidance",routeHandle); } function guidance_StopGuidance(dbusIf) { - guidance_s(dbusIf,"stopGuidance",[]); + guidance_message(dbusIf,"stopGuidance",[]); } function guidance_GetGuidanceStatus(dbusIf) { - return guidance_message(dbusIf,"getGuidanceStatus",[]); + return guidance_get(dbusIf,"getGuidanceStatus",[]); } function guidance_GetDestinationInformation(dbusIf) { - return guidance_message(dbusIf,"getDestinationInformation",[]); + return guidance_get(dbusIf,"getDestinationInformation",[]); } function guidance_GetManeuversList(dbusIf,requestedNumberOfManeuvers,maneuverOffset) { - return guidance_message(dbusIf,"getManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]); + return guidance_get(dbusIf,"getManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]); } //---------------- Map matched position messages ---------------- // Send a message to mapmatchedposition with session handle -function mapmatchedposition_s(par, func, args) +function mapmatchedposition_message(par, func, args) { return navigationcore_message(par, "MapMatchedPosition", func, navigationcore_session(par).concat(args)); } // Send a message to mapmatchedposition without session handle -function mapmatchedposition_message(par, func, args) +function mapmatchedposition_get(par, func, args) { return navigationcore_message(par, "MapMatchedPosition", func, args); } @@ -535,44 +631,44 @@ function mapmatchedposition_GetCurrentAddress(dbusIf) { var valuesToReturn=["int32",NAVIGATIONCORE_STREET]; - return mapmatchedposition_message(dbusIf,"getCurrentAddress",["array",valuesToReturn]); + return mapmatchedposition_get(dbusIf,"getCurrentAddress",["array",valuesToReturn]); } function mapmatchedposition_SetSimulationMode(dbusIf,activate) { - mapmatchedposition_s(dbusIf,"setSimulationMode",["boolean",activate]); + mapmatchedposition_message(dbusIf,"setSimulationMode",["boolean",activate]); } function mapmatchedposition_StartSimulation(dbusIf) { - mapmatchedposition_s(dbusIf,"startSimulation",[]); + mapmatchedposition_message(dbusIf,"startSimulation",[]); } function mapmatchedposition_PauseSimulation(dbusIf) { - mapmatchedposition_s(dbusIf,"pauseSimulation",[]); + mapmatchedposition_message(dbusIf,"pauseSimulation",[]); } function mapmatchedposition_GetSimulationStatus(dbusIf) { - return mapmatchedposition_message(dbusIf,"getSimulationStatus",[]); + return mapmatchedposition_get(dbusIf,"getSimulationStatus",[]); } function mapmatchedposition_GetSimulationSpeed(dbusIf) { - return mapmatchedposition_message(dbusIf,"getSimulationSpeed",[]); + return mapmatchedposition_get(dbusIf,"getSimulationSpeed",[]); } function mapmatchedposition_SetSimulationSpeed(dbusIf,speedFactor) { - mapmatchedposition_s(dbusIf,"setSimulationSpeed",["uint8",speedFactor]); + mapmatchedposition_message(dbusIf,"setSimulationSpeed",["uint8",speedFactor]); } function mapmatchedposition_GetPosition(dbusIf) { var valuesToReturn=["int32",NAVIGATIONCORE_SPEED,"int32",NAVIGATIONCORE_LATITUDE,"int32",NAVIGATIONCORE_LONGITUDE]; - return mapmatchedposition_message(dbusIf,"getPosition",["array",valuesToReturn]); + return mapmatchedposition_get(dbusIf,"getPosition",["array",valuesToReturn]); } //---------------- MapViewer messages (handle 1) ---------------- @@ -622,14 +718,20 @@ function mapviewercontrol_message(par, func, args) return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle,args)); } +// Send a message to map viewer control without session handle +function mapviewercontrol_get(par, func, args) +{ + return mapviewer_message(par, "MapViewerControl", func, g_mapviewer_handle,args); +} + function mapviewer_GetMapViewScale(dbusIf) { - return mapviewercontrol_message(dbusIf,"getMapViewScale", []); + return mapviewercontrol_get(dbusIf,"getMapViewScale", []); } function mapviewer_GetDisplayedRoutes(dbusIf) { - return mapviewercontrol_message(dbusIf,"getDisplayedRoutes", []); + return mapviewercontrol_get(dbusIf,"getDisplayedRoutes", []); } function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta) @@ -639,7 +741,7 @@ function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta) function mapviewer_GetMapViewTheme(dbusIf) { - return mapviewercontrol_message(dbusIf,"getMapViewTheme", []); + return mapviewercontrol_get(dbusIf,"getMapViewTheme", []); } function mapviewer_SetMapViewTheme(dbusIf,mapViewTheme) @@ -649,7 +751,7 @@ function mapviewer_SetMapViewTheme(dbusIf,mapViewTheme) function mapviewer_GetMapViewPerspective(dbusIf) { - return mapviewercontrol_message(dbusIf,"getMapViewPerspective", []); + return mapviewercontrol_get(dbusIf,"getMapViewPerspective", []); } function mapviewer_SetMapViewPerspective(dbusIf,perspective) @@ -681,7 +783,37 @@ function mapviewer_SetMapViewBoundingBox(dbusIf,boundingBox) function mapviewer_GetTargetPoint(dbusIf) { - return mapviewercontrol_message(dbusIf,"getTargetPoint", []); + return mapviewercontrol_get(dbusIf,"getTargetPoint", []); +} + +function mapviewer_GetCameraValue(dbusIf,camera) +{ + return mapviewercontrol_get(dbusIf,"get"+camera, []); +} + +function mapviewer_SetCameraValue(dbusIf,camera,value) +{ + mapviewercontrol_message(dbusIf,"set"+camera, value); +} + +function mapviewer_SetMapViewRotation(dbusIf,angle) +{ + mapviewercontrol_message(dbusIf, "setMapViewRotation", ["int32",angle,"int32",15]); +} + +function mapviewer_SetCameraHeadingAngle(dbusIf,angle) +{ + mapviewercontrol_message(dbusIf, "setCameraHeadingAngle", ["int32",angle]); +} + +function mapviewer_SetCameraHeadingTrackUp(dbusIf) +{ + mapviewercontrol_message(dbusIf, "setCameraHeadingTrackUp", []); +} + +function mapviewer_SetMapViewPan(dbusIf,panningAction,x,y) +{ + mapviewercontrol_message(dbusIf, "setMapViewPan", ["int32",panningAction,"array",["structure",["uint16",x,"uint16",y]]]); } //---------------- MapViewer messages (handle 2) ---------------- @@ -780,7 +912,7 @@ function poisearch_handle(par) { if (!g_poisearch_handle[1]) { var res=poisearch_message_get(par, "createPoiSearchHandle", []); - g_poisearch_handle[1]=res[3]; + g_poisearch_handle[1]=res[1]; } return g_poisearch_handle; } @@ -869,3 +1001,17 @@ function fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,advisorMode,distanceThres fuelstopadvisor_message(dbusIf,"setFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]); } +function fuelstopadvisor_GetTripData(dbusIf,trip) +{ + return fuelstopadvisor_message(dbusIf,"getTripData",["uint8",trip]); +} + +function fuelstopadvisor_GetInstantData(dbusIf) +{ + return fuelstopadvisor_message(dbusIf,"getInstantData",[]); +} + +function fuelstopadvisor_ResetTripData(dbusIf,trip) +{ + fuelstopadvisor_message(dbusIf,"resetTripData",["uint8",trip]); +} diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js index 1f79f33..cfdbec3 100644 --- a/src/hmi/qml/Core/genivi-origin.js +++ b/src/hmi/qml/Core/genivi-origin.js @@ -240,7 +240,7 @@ function poi_message(par, iface, func, args) // Send a message to demonstrator (basic) function demonstrator_message(par, iface, func, args) { - return par.message("org.genivi.demonstrator."+iface,"/org/genivi/demonstrator"+iface,"org.genivi.demonstrator."+iface, func, args); + return par.message("org.genivi.demonstrator."+iface,"/org/genivi/demonstrator/"+iface,"org.genivi.demonstrator."+iface, func, args); } //----------------- DBus signals ----------------- @@ -284,16 +284,6 @@ function connect_guidancePositionOnRouteChangedSignal(interface,menu) return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Guidance","PositionOnRouteChanged",menu,"guidancePositionOnRouteChanged"); } -function connect_simulationStatusChangedSignal(interface,menu) -{ - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","SimulationStatusChanged",menu,"simulationStatusChanged"); -} - -function connect_simulationSpeedChangedSignal(interface,menu) -{ - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","SimulationSpeedChanged",menu,"simulationSpeedChanged"); -} - function connect_mapmatchedpositionPositionUpdateSignal(interface,menu) { return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","PositionUpdate",menu,"mapmatchedpositionPositionUpdate"); @@ -304,11 +294,6 @@ function connect_mapmatchedpositionAddressUpdateSignal(interface,menu) return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","AddressUpdate",menu,"mapmatchedpositionAddressUpdate"); } -function connect_fuelStopAdvisorSignal(interface,menu) -{ - return interface.connect("","/org/genivi/demonstrator/FuelStopAdvisor","org.genivi.demonstrator.FuelStopAdvisor","FuelStopAdvisorWarning",menu,"fuelStopAdvisorWarning"); -} - function connect_routeCalculationSuccessfulSignal(interface,menu) { return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Routing","RouteCalculationSuccessful",menu,"routeCalculationSuccessful"); @@ -324,26 +309,11 @@ function connect_routeCalculationProgressUpdateSignal(interface,menu) return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Routing","RouteCalculationProgressUpdate",menu,"routeCalculationProgressUpdate"); } -function connect_mapmatchedpositionPositionUpdateSignal(interface,menu) -{ - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","PositionUpdate",menu,"mapmatchedpositionPositionUpdate"); -} - function connect_currentSelectionCriterionSignal(interface,menu) { return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","CurrentSelectionCriterion",menu,"currentSelectionCriterion"); } -function connect_searchStatusSignal(interface,menu) -{ - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","SearchStatus",menu,"searchStatus"); -} - -function connect_searchResultListSignal(interface,menu) -{ - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","SearchResultList",menu,"searchResultList"); -} - function connect_contentUpdatedSignal(interface,menu) { return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","ContentUpdated",menu,"contentUpdated"); @@ -359,6 +329,11 @@ function connect_tripDataUpdatedSignal(interface,menu) return interface.connect("","/org/genivi/demonstrator/FuelStopAdvisor","org.genivi.demonstrator.FuelStopAdvisor","TripDataUpdated",menu,"tripDataUpdated"); } +function connect_fuelStopAdvisorSignal(interface,menu) +{ + return interface.connect("","/org/genivi/demonstrator/FuelStopAdvisor","org.genivi.demonstrator.FuelStopAdvisor","FuelStopAdvisorWarning",menu,"fuelStopAdvisorWarning"); +} + //----------------- NavigationCore dbus messages ----------------- //----------------- Navigation core Session messages ----------------- @@ -477,18 +452,24 @@ function locationinput_handle_clear(par) //----------------- Routing messages ----------------- -// Send a message to routing with session handle +// Send a message to routing with session handle and route handle function routing_message(par, func, args) { //session handle sent return navigationcore_message(par, "Routing", func, navigationcore_session(par).concat(routing_handle(par),args)); } -// Send a message to routing without session handle +// Send a message to routing with route handle function routing_get(par, func, args) { return navigationcore_message(par, "Routing", func, routing_handle(par).concat(args)); } +// Send a message to routing +function routing(par, func, args) +{ + return navigationcore_message(par, "Routing", func, args); +} + // Create a new routing handle or get the current handle function routing_handle(par) { if (!g_routing_handle[1]) @@ -519,7 +500,7 @@ function routing_GetRouteOverviewTimeAndDistance(dbusIf) function routing_GetCostModel(dbusIf) { - return routing_message(dbusIf,"GetCostModel",[]); + return routing_get(dbusIf,"GetCostModel",[]); } function routing_SetCostModel(dbusIf,costModel) @@ -529,12 +510,12 @@ function routing_SetCostModel(dbusIf,costModel) function routing_GetSupportedCostModels(dbusIf) { - return routing_message(dbusIf,"GetSupportedCostModels",[]); + return routing(dbusIf,"GetSupportedCostModels",[]); } function routing_GetSupportedRoutePreferences(dbusIf) { - return routing_message(dbusIf,"GetSupportedRoutePreferences",[]); + return routing(dbusIf,"GetSupportedRoutePreferences",[]); } function routing_GetRoutePreferences(dbusIf,countryCode) @@ -600,7 +581,7 @@ function guidance_s(par, func, args) return navigationcore_message(par, "Guidance", func, navigationcore_session(par).concat(args)); } // Send a message to guidance without session handle -function guidance_message(par, func, args) +function guidance_get(par, func, args) { return navigationcore_message(par, "Guidance", func, args); } @@ -617,29 +598,29 @@ function guidance_StopGuidance(dbusIf) function guidance_GetGuidanceStatus(dbusIf) { - return guidance_message(dbusIf,"GetGuidanceStatus",[]); + return guidance_get(dbusIf,"GetGuidanceStatus",[]); } function guidance_GetDestinationInformation(dbusIf) { - return guidance_message(dbusIf,"GetDestinationInformation",[]); + return guidance_get(dbusIf,"GetDestinationInformation",[]); } function guidance_GetManeuversList(dbusIf,requestedNumberOfManeuvers,maneuverOffset) { - return guidance_message(dbusIf,"GetManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]); + return guidance_get(dbusIf,"GetManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]); } //---------------- Map matched position messages ---------------- // Send a message to mapmatchedposition with session handle -function mapmatchedposition_s(par, func, args) +function mapmatchedposition_message(par, func, args) { return navigationcore_message(par, "MapMatchedPosition", func, navigationcore_session(par).concat(args)); } // Send a message to mapmatchedposition without session handle -function mapmatchedposition_message(par, func, args) +function mapmatchedposition_get(par, func, args) { return navigationcore_message(par, "MapMatchedPosition", func, args); } @@ -648,44 +629,44 @@ function mapmatchedposition_GetCurrentAddress(dbusIf) { var valuesToReturn=["int32",NAVIGATIONCORE_STREET]; - return mapmatchedposition_message(dbusIf,"GetCurrentAddress",["array",valuesToReturn]); + return mapmatchedposition_get(dbusIf,"GetCurrentAddress",["array",valuesToReturn]); } function mapmatchedposition_SetSimulationMode(dbusIf,activate) { - mapmatchedposition_s(dbusIf,"SetSimulationMode",["boolean",activate]); + mapmatchedposition_message(dbusIf,"SetSimulationMode",["boolean",activate]); } function mapmatchedposition_StartSimulation(dbusIf) { - mapmatchedposition_s(dbusIf,"StartSimulation",[]); + mapmatchedposition_message(dbusIf,"StartSimulation",[]); } function mapmatchedposition_PauseSimulation(dbusIf) { - mapmatchedposition_s(dbusIf,"PauseSimulation",[]); + mapmatchedposition_message(dbusIf,"PauseSimulation",[]); } function mapmatchedposition_GetSimulationStatus(dbusIf) { - return mapmatchedposition_message(dbusIf,"GetSimulationStatus",[]); + return mapmatchedposition_get(dbusIf,"GetSimulationStatus",[]); } function mapmatchedposition_GetSimulationSpeed(dbusIf) { - return mapmatchedposition_message(dbusIf,"GetSimulationSpeed",[]); + return mapmatchedposition_get(dbusIf,"GetSimulationSpeed",[]); } function mapmatchedposition_SetSimulationSpeed(dbusIf,speedFactor) { - mapmatchedposition_s(dbusIf,"SetSimulationSpeed",["uint8",speedFactor]); + mapmatchedposition_message(dbusIf,"SetSimulationSpeed",["uint8",speedFactor]); } function mapmatchedposition_GetPosition(dbusIf) { var valuesToReturn=["int32",NAVIGATIONCORE_SPEED,"int32",NAVIGATIONCORE_LATITUDE,"int32",NAVIGATIONCORE_LONGITUDE]; - return mapmatchedposition_message(dbusIf,"GetPosition",["array",valuesToReturn]); + return mapmatchedposition_get(dbusIf,"GetPosition",["array",valuesToReturn]); } //---------------- MapViewer messages (handle 1) ---------------- @@ -735,14 +716,20 @@ function mapviewercontrol_message(par, func, args) return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle,args)); } +// Send a message to map viewer control without session handle +function mapviewercontrol_get(par, func, args) +{ + return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle,args)); +} + function mapviewer_GetMapViewScale(dbusIf) { - return mapviewercontrol_message(dbusIf,"GetMapViewScale", []); + return mapviewercontrol_get(dbusIf,"GetMapViewScale", []); } function mapviewer_GetDisplayedRoutes(dbusIf) { - return mapviewercontrol_message(dbusIf,"GetDisplayedRoutes", []); + return mapviewercontrol_get(dbusIf,"GetDisplayedRoutes", []); } function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta) @@ -752,7 +739,7 @@ function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta) function mapviewer_GetMapViewTheme(dbusIf) { - return mapviewercontrol_message(dbusIf,"GetMapViewTheme", []); + return mapviewercontrol_get(dbusIf,"GetMapViewTheme", []); } function mapviewer_SetMapViewTheme(dbusIf,mapViewTheme) @@ -762,7 +749,7 @@ function mapviewer_SetMapViewTheme(dbusIf,mapViewTheme) function mapviewer_GetMapViewPerspective(dbusIf) { - return mapviewercontrol_message(dbusIf,"GetMapViewPerspective", []); + return mapviewercontrol_get(dbusIf,"GetMapViewPerspective", []); } function mapviewer_SetMapViewPerspective(dbusIf,perspective) @@ -794,9 +781,40 @@ function mapviewer_SetMapViewBoundingBox(dbusIf,boundingBox) function mapviewer_GetTargetPoint(dbusIf) { - return mapviewercontrol_message(dbusIf,"GetTargetPoint", []); + return mapviewercontrol_get(dbusIf,"GetTargetPoint", []); +} + +function mapviewer_GetCameraValue(dbusIf,camera) +{ + return mapviewercontrol_get(dbusIf,"Get"+camera, []); +} + +function mapviewer_SetCameraValue(dbusIf,camera,value) +{ + mapviewercontrol_message(dbusIf,"Set"+camera, value); +} + +function mapviewer_SetMapViewRotation(dbusIf,angle) +{ + mapviewercontrol_message(dbusIf, "SetMapViewRotation", ["int32",angle,"int32",15]); +} + +function mapviewer_SetCameraHeadingAngle(dbusIf,angle) +{ + mapviewercontrol_message(dbusIf, "SetCameraHeadingAngle", ["int32",angle]); } +function mapviewer_SetCameraHeadingTrackUp(dbusIf) +{ + mapviewercontrol_message(dbusIf, "SetCameraHeadingTrackUp", []); +} + +function mapviewer_SetMapViewPan(dbusIf,panningAction,x,y) +{ + mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",panningAction,"array",["structure",["uint16",x,"uint16",y]]]); +} + + //---------------- MapViewer messages (handle 2) ---------------- // Create a new map handle or get the current handle @@ -893,7 +911,7 @@ function poisearch_handle(par) { if (!g_poisearch_handle[1]) { var res=poisearch_message_get(par, "CreatePoiSearchHandle", []); - g_poisearch_handle[1]=res[3]; + g_poisearch_handle[1]=res[1]; } return g_poisearch_handle; } @@ -982,3 +1000,19 @@ function fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,advisorMode,distanceThres fuelstopadvisor_message(dbusIf,"SetFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]); } +function fuelstopadvisor_GetTripData(dbusIf,trip) +{ + return fuelstopadvisor_message(dbusIf,"GetTripData",["uint8",trip]); +} + +function fuelstopadvisor_GetInstantData(dbusIf) +{ + return fuelstopadvisor_message(dbusIf,"GetInstantData",[]); +} + +function fuelstopadvisor_ResetTripData(dbusIf,trip) +{ + fuelstopadvisor_message(dbusIf,"ResetTripData",["uint8",trip]); +} + + diff --git a/src/hmi/qml/EntryFreeText.qml b/src/hmi/qml/EntryFreeText.qml index 22f65d3..c72084c 100644 --- a/src/hmi/qml/EntryFreeText.qml +++ b/src/hmi/qml/EntryFreeText.qml @@ -84,7 +84,7 @@ HMIMenu { function search(input) { - Genivi.locationinput_message(dbusIf,"Search",["string",input,"uint16",10]); + Genivi.locationinput_Search(dbusIf,input,10); } function connectSignals() @@ -226,7 +226,7 @@ HMIMenu { if (Genivi.entrycriterion) { criterion=Genivi.entrycriterion; Genivi.entrycriterion=0; - Genivi.locationinput_message(dbusIf,"SetSelectionCriterion",["uint16",criterion]); + Genivi.locationinput_SetSelectionCriterion(dbusIf,criterion); } connectSignals(); } diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml index 6ba5e19..fdc93f1 100644 --- a/src/hmi/qml/NavigationBrowseMap.qml +++ b/src/hmi/qml/NavigationBrowseMap.qml @@ -265,9 +265,13 @@ HMIMenu { function showZoom() { var res=Genivi.mapviewer_GetMapViewScale(dbusIf); - var text=res[1]; - if (res[3]) + var text=res[1].toString(); + if (res[3] === Genivi.MAPVIEWER_MAX) { text+="*"; + } else { + if (res[3] === Genivi.MAPVIEWER_MIN) + text="*"+text; + } zoomlevel.text=text; } @@ -319,10 +323,10 @@ HMIMenu { { north=!north; if (north) { - Genivi.mapviewercontrol_message(dbusIf, "SetCameraHeadingAngle", ["int32",0]); + Genivi.mapviewer_SetCameraHeadingAngle(dbusIf,0); orientation.setState("D"); } else { - Genivi.mapviewercontrol_message(dbusIf, "SetCameraHeadingTrackUp", []); + Genivi.mapviewer_SetCameraHeadingTrackUp(dbusIf); orientation.setState("N"); } } @@ -710,29 +714,29 @@ HMIMenu { StdButton { source:StyleSheetScroll.scrollup[Constants.SOURCE]; x:StyleSheetScroll.scrollup[Constants.X]; y:StyleSheetScroll.scrollup[Constants.Y]; width:StyleSheetScroll.scrollup[Constants.WIDTH]; height:StyleSheetScroll.scrollup[Constants.HEIGHT]; id:scrollup; explode:false; next:scrollleft; prev:scrolldown; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 + scroll.panY]]]);} + onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);} + onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 + scroll.panY);} } StdButton { source:StyleSheetScroll.scrollleft[Constants.SOURCE]; x:StyleSheetScroll.scrollleft[Constants.X]; y:StyleSheetScroll.scrollleft[Constants.Y]; width:StyleSheetScroll.scrollleft[Constants.WIDTH]; height:StyleSheetScroll.scrollleft[Constants.HEIGHT]; id:scrollleft; explode:false; next:scrollright; prev:scrollup; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 + scroll.panX,"uint16",map.height/2]]]);} + onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);} + onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 + scroll.panX,map.height/2);} } StdButton { source:StyleSheetScroll.scrollright[Constants.SOURCE]; x:StyleSheetScroll.scrollright[Constants.X]; y:StyleSheetScroll.scrollright[Constants.Y]; width:StyleSheetScroll.scrollright[Constants.WIDTH]; height:StyleSheetScroll.scrollright[Constants.HEIGHT]; id:scrollright; explode:false; next:scrolldown; prev:scrollleft; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 - scroll.panX,"uint16",map.height/2]]]);} + onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);} + onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 - scroll.panX,map.height/2);} } StdButton { source:StyleSheetScroll.scrolldown[Constants.SOURCE]; x:StyleSheetScroll.scrolldown[Constants.X]; y:StyleSheetScroll.scrolldown[Constants.Y]; width:StyleSheetScroll.scrolldown[Constants.WIDTH]; height:StyleSheetScroll.scrolldown[Constants.HEIGHT]; id:scrolldown; explode:false; next:scrollup; prev:scrollright; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 - scroll.panY]]]);} + onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);} + onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 - scroll.panY);} } } } @@ -884,7 +888,7 @@ HMIMenu { if (Genivi.data['zoom_route_handle']) { var res=Genivi.routing_GetRouteBoundingBox(dbusIf,Genivi.data['zoom_route_handle']); if (res[0] == "structure") { - Genivi.mapviewercontrol_message(dbusIf, "SetMapViewBoundingBox", res); + Genivi.mapviewer_SetMapViewBoundingBox(dbusIf,res); } else { console.log("Unexpected result from GetRouteBoundingBox:"); Genivi.dump("",res); diff --git a/src/hmi/qml/NavigationSearchAddress.qml b/src/hmi/qml/NavigationSearchAddress.qml index fddb82d..8a59ae7 100644 --- a/src/hmi/qml/NavigationSearchAddress.qml +++ b/src/hmi/qml/NavigationSearchAddress.qml @@ -75,7 +75,8 @@ HMIMenu { function searchStatus(args) { //locationInputHandle 1, statusValue 3 var statusValue=args[3]; - if (statusValue == Genivi.NAVIGATIONCORE_FINISHED) + Genivi.dump("searchStatus",args); + if (statusValue === Genivi.NAVIGATIONCORE_FINISHED) { Genivi.locationinput_SelectEntry(dbusIf,Genivi.entryselectedentry); } @@ -181,38 +182,7 @@ HMIMenu { } DBusIf { - id: dbusIf - Component.onCompleted: { - connectSignals(); - - var res=Genivi.navigationcore_session_GetVersion(dbusIf); - if (res[0] != "error") { - res=Genivi.navigationcore_session(dbusIf); - res=Genivi.locationinput_handle(dbusIf); - } else { - Genivi.dump("",res); - } - if (Genivi.entryselectedentry) { - Genivi.locationinput_SelectEntry(dbusIf,Genivi.entryselectedentry-1); - } - if (Genivi.entrydest == 'countryValue') - { - accept(countryValue); - } - if (Genivi.entrydest == 'cityValue') - { - accept(cityValue); - } - if (Genivi.entrydest == 'streetValue') - { - accept(streetValue); - } - if (Genivi.entrydest == 'numberValue') - { - accept(numberValue); - } - Genivi.entrydest=null; - } + id: dbusIf } HMIBgImage { @@ -323,6 +293,36 @@ HMIMenu { } } Component.onCompleted: { + connectSignals(); + + var res=Genivi.navigationcore_session_GetVersion(dbusIf); + if (res[0] != "error") { + res=Genivi.navigationcore_session(dbusIf); + res=Genivi.locationinput_handle(dbusIf); + } else { + Genivi.dump("",res); + } + if (Genivi.entryselectedentry) { + Genivi.locationinput_SelectEntry(dbusIf,Genivi.entryselectedentry-1); + } + if (Genivi.entrydest == 'countryValue') + { + accept(countryValue); + } + if (Genivi.entrydest == 'cityValue') + { + accept(cityValue); + } + if (Genivi.entrydest == 'streetValue') + { + accept(streetValue); + } + if (Genivi.entrydest == 'numberValue') + { + accept(numberValue); + } + Genivi.entrydest=null; + if (Genivi.preloadMode==true) { Genivi.preloadMode=false; diff --git a/src/hmi/qml/NavigationSearchFreeText.qml b/src/hmi/qml/NavigationSearchFreeText.qml index 796a6e1..d66a209 100644 --- a/src/hmi/qml/NavigationSearchFreeText.qml +++ b/src/hmi/qml/NavigationSearchFreeText.qml @@ -58,7 +58,7 @@ HMIMenu { function searchResultList(args) { Genivi.dump("searchResultList",args); - Genivi.locationinput_message(dbusIf,"SelectEntry",["uint16",0]); + Genivi.locationinput_SelectEntry(dbusIf,0); } function contentUpdated(args) @@ -100,8 +100,8 @@ HMIMenu { function accept(what) { - Genivi.locationinput_message(dbusIf,"SetSelectionCriterion",["uint16",what.criterion]); - Genivi.locationinput_message(dbusIf,"Search",["string",what.text,"uint16",10]); + Genivi.locationinput_SetSelectionCriterion(dbusIf,what.criterion); + Genivi.locationinput_Search(dbusIf,what.text,10); } @@ -127,7 +127,7 @@ HMIMenu { Genivi.dump("",res); } if (Genivi.entryselectedentry) { - Genivi.locationinput_message(dbusIf,"SelectEntry",["uint16",Genivi.entryselectedentry-1]); + Genivi.locationinput_SelectEntry(dbusIf,Genivi.entryselectedentry-1); } } } diff --git a/src/hmi/qml/POI.qml b/src/hmi/qml/POI.qml index 2188bdd..06c0147 100644 --- a/src/hmi/qml/POI.qml +++ b/src/hmi/qml/POI.qml @@ -145,7 +145,6 @@ HMIMenu { var attributeList=[]; attributeList[0]=0; var res=Genivi.poisearch_RequestResultList(dbusIf,Genivi.offset,Genivi.maxWindowSize,attributeList); - Genivi.dump("poisearch_RequestResultList",res) var res_win=res[5]; for (i = 0 ; i < res_win.length ; i+=2) { var id=res_win[i+1][1]; diff --git a/src/hmi/qml/TripComputer.qml b/src/hmi/qml/TripComputer.qml index a1bb1cf..ac26296 100644 --- a/src/hmi/qml/TripComputer.qml +++ b/src/hmi/qml/TripComputer.qml @@ -182,33 +182,32 @@ HMIMenu { var value; disableAllValue(); // By default set all the values to "--" if (tripnr > 0) { - res=Genivi.fuelstopadvisor_message(dbusIf,"GetTripData",["uint8",tripnr-1]); - Genivi.dump("update",res); + res=Genivi.fuelstopadvisor_GetTripData(dbusIf,tripnr-1); for (var i = 0 ; i < res[1].length ; i+=4) { if (res[1][i+1] == Genivi.FUELSTOPADVISOR_DISTANCE) { - value=res[1][i+3][1]/10; + value=res[1][i+3][3][1]/10; distance_value.text=value.toFixed(1); } if (res[1][i+1] == Genivi.FUELSTOPADVISOR_AVERAGE_SPEED) { - value=res[1][i+3][1]/10; + value=res[1][i+3][3][1]/10; avg_speed_value.text=value.toFixed(0); } if (res[1][i+1] == Genivi.FUELSTOPADVISOR_AVERAGE_FUEL_CONSUMPTION_PER_DISTANCE) { - value=res[1][i+3][1]/10; + value=res[1][i+3][3][1]/10; avg_fuel_value.text=value.toFixed(1); } } } else { - res=Genivi.fuelstopadvisor_message(dbusIf,"GetInstantData",[]); + res=Genivi.fuelstopadvisor_GetInstantData(dbusIf); for (var i = 0 ; i < res[1].length ; i+=4) { - if (res[1][i+1] == Genivi.FUELSTOPADVISOR_FUEL_LEVEL) { - fuel_value.text=res[1][i+3][1]; + if (res[1][i+1] == Genivi.FUELSTOPADVISOR_FUEL_LEVEL) { + fuel_value.text=res[1][i+3][3][1]; } if (res[1][i+1] == Genivi.FUELSTOPADVISOR_TANK_DISTANCE) { - tank_distance_value.text=res[1][i+3][1]; + tank_distance_value.text=res[1][i+3][3][1]; } if (res[1][i+1] == Genivi.FUELSTOPADVISOR_ENHANCED_TANK_DISTANCE) { - predictive_tank_distance_value.text=res[1][i+3][1]; + predictive_tank_distance_value.text=res[1][i+3][3][1]; } } @@ -395,10 +394,10 @@ HMIMenu { id:reset; text: Genivi.gettext("Reset"); explode:false; disabled:false; next:select_trip1; prev:back; onClicked:{ if (Genivi.tripMode == "TRIP_NUMBER1") { - Genivi.fuelstopadvisor_message(dbusIf,"ResetTripData",["uint8",0]); + Genivi.fuelstopadvisor_ResetTripData(dbusIf,0); } if (Genivi.tripMode == "TRIP_NUMBER2") { - Genivi.fuelstopadvisor_message(dbusIf,"ResetTripData",["uint8",1]); + Genivi.fuelstopadvisor_ResetTripData(dbusIf,1); } updateTripMode(); } diff --git a/test/script/simulation-dashboard-capi.py b/test/script/simulation-dashboard-capi.py index 4292593..87f2db0 100644..100755 --- a/test/script/simulation-dashboard-capi.py +++ b/test/script/simulation-dashboard-capi.py @@ -25,8 +25,8 @@ ************************************************************************** """ import sys,tty,termios,select,pygame,gi,time,dbus,re,argparse -import pdb - +#import pdb +#pdb.set_trace() from pygame.locals import * from threading import Timer from configTests import * @@ -214,15 +214,15 @@ def getDbus(): displayVehicleSpeed(str(int(odometer[0])*SPEED_CONVERSION)) # get the tank distance - instantData = fuelStopAdvisorInterface.GetInstantData() + instantData = fuelStopAdvisorInterface.getInstantData() if dbus.Int32(Genivi.FUELSTOPADVISOR_TANK_DISTANCE) in instantData: - tankDistance = int(instantData[dbus.Int32(Genivi.FUELSTOPADVISOR_TANK_DISTANCE)]) - displayFuelStopAdvisorTankDistance(str(tankDistance) + ' ') + tankDistance = dbus.Struct(instantData[dbus.Int32(Genivi.FUELSTOPADVISOR_TANK_DISTANCE)]) + displayFuelStopAdvisorTankDistance(str(int(tankDistance[1])) + ' ') else: displayFuelStopAdvisorTankDistance("-----") if dbus.Int32(Genivi.FUELSTOPADVISOR_ENHANCED_TANK_DISTANCE) in instantData: - enhancedTankDistance = int(instantData[dbus.Int32(Genivi.FUELSTOPADVISOR_ENHANCED_TANK_DISTANCE)]) - displayFuelStopAdvisorEnhancedTankDistance(str(enhancedTankDistance) + ' ') + enhancedTankDistance = dbus.Struct(instantData[dbus.Int32(Genivi.FUELSTOPADVISOR_ENHANCED_TANK_DISTANCE)]) + displayFuelStopAdvisorEnhancedTankDistance(str(int(enhancedTankDistance[1])) + ' ') else: displayFuelStopAdvisorEnhancedTankDistance('-----') @@ -251,11 +251,11 @@ def enhancedPositionPositionUpdateHandler(arg): # get the position enhancedPosition = enhancedPositionInterface.GetPositionInfo(arg) if (arg & Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE) == Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE: - latitude=float(enhancedPosition[1][dbus.UInt64(Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE)]) - displayLatitude("{:.3f}".format(latitude)) + latitude=dbus.Struct(enhancedPosition[1][Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE]) + displayLatitude("{:.3f}".format(float(latitude[1]))) if (arg & Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE) == Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE: - longitude=float(enhancedPosition[1][dbus.UInt64(Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE)]) - displayLongitude("{:.3f}".format(longitude)) + longitude=dbus.Struct(enhancedPosition[1][Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE]) + displayLongitude("{:.3f}".format(float(longitude[1]))) def mapMatchedPositionSimulationStatusHandler(arg): if arg==Genivi.NAVIGATIONCORE_SIMULATION_STATUS_NO_SIMULATION: @@ -329,7 +329,7 @@ ambOdometerInterface = dbus.Interface(ambOdometer, "org.automotive.Odometer") # Fuel Stop Advisor try: - fuelStopAdvisorObject = dbusConnectionBus.get_object("org.genivi.demonstrator.FuelStopAdvisor","/org/genivi/demonstrator/FuelStopAdvisor") + fuelStopAdvisorObject = dbusConnectionBus.get_object("org.genivi.demonstrator.FuelStopAdvisor_FuelStopAdvisor","/FuelStopAdvisor") except dbus.DBusException: print ("connection to Fuel Stop Advisor failed") print_exc() @@ -339,13 +339,13 @@ dbusConnectionBus.add_signal_receiver(fuelStopAdvisorWarningHandler, dbus_interf # Enhanced position try: - enhancedPositionObject = dbusConnectionBus.get_object("org.genivi.positioning.EnhancedPosition", "/org/genivi/positioning/EnhancedPosition") + enhancedPositionObject = dbusConnectionBus.get_object("org.genivi.EnhancedPositionService.EnhancedPosition_EnhancedPositionService", "/EnhancedPositionService") except dbus.DBusException: print ("connection to Enhanced position failed") print_exc() sys.exit(1) -enhancedPositionInterface = dbus.Interface(enhancedPositionObject, "org.genivi.positioning.EnhancedPosition") -dbusConnectionBus.add_signal_receiver(enhancedPositionPositionUpdateHandler, dbus_interface = "org.genivi.positioning.EnhancedPosition", signal_name = "PositionUpdate") +enhancedPositionInterface = dbus.Interface(enhancedPositionObject, "org.genivi.EnhancedPositionService.EnhancedPosition") +dbusConnectionBus.add_signal_receiver(enhancedPositionPositionUpdateHandler, dbus_interface = "org.genivi.EnhancedPositionService.EnhancedPosition", signal_name = "PositionUpdate") # Guidance try: @@ -359,7 +359,7 @@ dbusConnectionBus.add_signal_receiver(guidanceStatusHandler, dbus_interface = "o # Map matched position try: - mapMatchedPositionObject = dbusConnectionBus.get_object("org.genivi.navigationcore.MapMatchedPosition","/org/genivi/navigationcore") + mapMatchedPositionObject = dbusConnectionBus.get_object("org.genivi.navigation.navigationcore.MapMatchedPosition_MapMatchedPosition","/MapMatchedPosition") except dbus.DBusException: print ("connection to Map matched position failed") print_exc() |