diff options
Diffstat (limited to 'src')
3 files changed, 21 insertions, 12 deletions
diff --git a/src/navigation/build.sh b/src/navigation/build.sh index c1d36e4..906bc2c 100755 --- a/src/navigation/build.sh +++ b/src/navigation/build.sh @@ -60,10 +60,18 @@ fi if [ "$clean" = 1 ] then - echo 'clean up the build folder' if [ -d "./build" ] then - find ./build ! -name '*.cbp' -type f -exec rm -f {} + + if [ "$navit" = 1 ] + then + echo 'clean up the build folder and regenerate all the stuff' + find ./build ! -name '*.cbp' -type f -exec rm -f {} + + else + echo 'clean up the build folder and regenerate all the stuff except navit ' + rm ./build/CMakeCache.txt + rm ./build/cmake_install.cmake + rm ./build/Makefile + fi fi fi 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 d653a14..0437239 100644 --- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx +++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx @@ -314,10 +314,11 @@ class Guidance guidance->ResumeGuidance(sessionHandle); } - void + int32_t SetVoiceGuidance(const bool& activate, const std::string& voice) { guidance->SetVoiceGuidance(activate,voice); + return(0); //not implemented yet } void @@ -461,7 +462,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& DistanceToManeuver, int32_ switch (item->type) { case type_nav_straight: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; - data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT); break; case type_nav_turnaround: Maneuver=GENIVI_NAVIGATIONCORE_CROSSROAD; @@ -506,7 +507,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& DistanceToManeuver, int32_ break; case type_nav_roundabout_r4: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT); break; case type_nav_roundabout_r5: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; @@ -539,7 +540,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& DistanceToManeuver, int32_ break; case type_nav_roundabout_l4: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; - data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT); break; case type_nav_roundabout_l5: Maneuver=GENIVI_NAVIGATIONCORE_ROUNDABOUT; @@ -559,7 +560,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& DistanceToManeuver, int32_ break; case type_nav_destination: Maneuver=GENIVI_NAVIGATIONCORE_DESTINATION; - data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT_ON); + data._2=variant_enumeration(GENIVI_NAVIGATIONCORE_STRAIGHT); break; default: dbg(lvl_error,"Unable to convert type %s\n",item_to_name(item->type)); diff --git a/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx index ac341eb..564ee2e 100644 --- a/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx +++ b/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx @@ -422,7 +422,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& offsetOfManeuver, Guidance { struct attr length, street_name; Guidance::ManeuverDataAttribute maneuverDataAttribute; - Guidance::ManeuverDataValue maneuverDataValue; + Guidance::ManeuverDirection maneuverDataValue; if (item_attr_get(item, attr_length, &length)) { offsetOfManeuver=length.u.num; @@ -435,7 +435,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& offsetOfManeuver, Guidance switch (item->type) { case type_nav_straight: maneuverType=Guidance::ManeuverType::CROSSROAD; - maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT_ON; + maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT; break; case type_nav_turnaround: maneuverType=Guidance::ManeuverType::CROSSROAD; @@ -480,7 +480,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& offsetOfManeuver, Guidance break; case type_nav_roundabout_r4: maneuverType=Guidance::ManeuverType::ROUNDABOUT; - maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT_ON; + maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT; break; case type_nav_roundabout_r5: maneuverType=Guidance::ManeuverType::ROUNDABOUT; @@ -513,7 +513,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& offsetOfManeuver, Guidance break; case type_nav_roundabout_l4: maneuverType=Guidance::ManeuverType::ROUNDABOUT; - maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT_ON; + maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT; break; case type_nav_roundabout_l5: maneuverType=Guidance::ManeuverType::ROUNDABOUT; @@ -533,7 +533,7 @@ GuidanceObj::GetManeuver(struct item *item, uint32_t& offsetOfManeuver, Guidance break; case type_nav_destination: maneuverType=Guidance::ManeuverType::DESTINATION; - maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT_ON; + maneuverDataValue = Guidance::ManeuverDirection::STRAIGHT; break; default: dbg(lvl_error,"Unable to convert type %s\n",item_to_name(item->type)); |