diff options
Diffstat (limited to 'src/navigation/navigation-core')
| -rw-r--r-- | src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx index 94eb39a..42a649a 100644 --- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx +++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx @@ -117,9 +117,6 @@ class GuidanceObj std::string m_kind_of_voice; struct item *get_item(struct map_rect *mr); struct map_rect *get_map_rect(void); - void SetSimulationMode(uint32_t SessionHandle, bool Activate); - void GetSimulationMode(bool& SimulationMode); - void SetSimulationSpeed(uint32_t sessionHandle); void PauseGuidance(uint32_t sessionHandle); void ResumeGuidance(uint32_t sessionHandle); void SetVoiceGuidance(const bool& activate, const std::string& voice); @@ -218,28 +215,6 @@ class Guidance m_guidance_active=false; } - void - SetSimulationMode(const uint32_t& SessionHandle, const bool& Activate) - { - dbg(lvl_debug,"enter Activate=%d\n",Activate); - struct attr vehicle; - vehicle.type=attr_vehicle; - vehicle.u.vehicle=get_vehicle(Activate?"enhancedposition:":"demo:"); - if (vehicle.u.vehicle) { - m_simulationMode = Activate; - struct navit *navit=get_navit(); - navit_set_attr(navit, &vehicle); - } else { - dbg(lvl_debug,"Failed to get vehicle\n"); - } - } - - bool - GetSimulationMode() - { - return (m_simulationMode); - } - void StartGuidance(const uint32_t& SessionHandle, const uint32_t& RouteHandle) { @@ -292,20 +267,6 @@ class Guidance } void - SetSimulationSpeed(const uint32_t& sessionHandle, const uint8_t& speedFactor) - { - vehicle_speed.u.num=speedFactor*40/4; - if (m_guidance_active==true) - s_guidance->SetSimulationSpeed(sessionHandle); - } - - uint8_t - GetSimulationSpeed() - { - return vehicle_speed.u.num*4/40; - } - - void PauseGuidance(const uint32_t& sessionHandle) { if (m_guidance_active==false) { @@ -690,14 +651,6 @@ GuidanceObj::GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const } void -GuidanceObj::SetSimulationSpeed(uint32_t sessionHandle) -{ - struct vehicle *vehicle=get_vehicle("demo:"); - if (vehicle && !m_paused) - vehicle_set_attr(vehicle, &vehicle_speed); -} - -void GuidanceObj::PauseGuidance(uint32_t sessionHandle) { struct vehicle *vehicle=get_vehicle("demo:"); @@ -779,7 +732,7 @@ GuidanceObj_Callback(GuidanceObj *obj) dbg(lvl_debug,"level=%d\n",(int) level.u.num); switch(level.u.num) { case 3: - maneuver=GENIVI_NAVIGATIONCORE_CRUISE; + maneuver=GENIVI_NAVIGATIONCORE_PASSED; break; case 2: maneuver=GENIVI_NAVIGATIONCORE_MANEUVER_APPEARED; |