diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2018-05-02 10:02:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 10:02:46 +0200 |
| commit | de4680665398c523dfaa0879c18b0f6e39264d57 (patch) | |
| tree | 5769f2076e6e041c07ad7fd6fa052ae0b8e5b914 /navit/vehicle/demo/vehicle_demo.c | |
| parent | 53315091a2aa5a4469a743f29516cc1ae78b6b14 (diff) | |
| parent | a9f61c26e31eca52b1bf1a444f6283bb26bc2391 (diff) | |
| download | navit-de4680665398c523dfaa0879c18b0f6e39264d57.tar.gz | |
Merge branch 'trunk' into Android_gradleAndroid_gradle
Diffstat (limited to 'navit/vehicle/demo/vehicle_demo.c')
| -rw-r--r-- | navit/vehicle/demo/vehicle_demo.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/navit/vehicle/demo/vehicle_demo.c b/navit/vehicle/demo/vehicle_demo.c index 1e2991300..036e97e27 100644 --- a/navit/vehicle/demo/vehicle_demo.c +++ b/navit/vehicle/demo/vehicle_demo.c @@ -170,7 +170,7 @@ vehicle_demo_set_attr_do(struct vehicle_priv *priv, struct attr *attr) callback_list_call_attr_0(priv->cbl, attr_position_valid); } priv->position_set=1; - dbg(lvl_debug,"position_set %f %f\n", priv->geo.lat, priv->geo.lng); + dbg(lvl_debug,"position_set %f %f", priv->geo.lat, priv->geo.lng); break; case attr_profilename: case attr_source: @@ -180,7 +180,7 @@ vehicle_demo_set_attr_do(struct vehicle_priv *priv, struct attr *attr) // Ignore; used by Navit's infrastructure, but not relevant for this vehicle. break; default: - dbg(lvl_error,"unsupported attribute %s\n",attr_to_name(attr->type)); + dbg(lvl_error,"unsupported attribute %s",attr_to_name(attr->type)); return 0; } return 1; @@ -209,7 +209,7 @@ vehicle_demo_timer(struct vehicle_priv *priv) struct item *item=NULL; len = (priv->config_speed * priv->interval / 1000)/ 3.6; - dbg(lvl_debug, "###### Entering simulation loop\n"); + dbg(lvl_debug, "###### Entering simulation loop"); if (!priv->config_speed) return; if (priv->route) @@ -228,10 +228,10 @@ vehicle_demo_timer(struct vehicle_priv *priv) item=map_rect_get_item(mr); if (item && item_coord_get(item, &pos, 1)) { priv->position_set=0; - dbg(lvl_debug, "current pos=0x%x,0x%x\n", pos.x, pos.y); - dbg(lvl_debug, "last pos=0x%x,0x%x\n", priv->last.x, priv->last.y); + dbg(lvl_debug, "current pos=0x%x,0x%x", pos.x, pos.y); + dbg(lvl_debug, "last pos=0x%x,0x%x", priv->last.x, priv->last.y); if (priv->last.x == pos.x && priv->last.y == pos.y) { - dbg(lvl_warning, "endless loop\n"); + dbg(lvl_warning, "endless loop"); } priv->last = pos; while (item && priv->config_speed) { @@ -239,9 +239,9 @@ vehicle_demo_timer(struct vehicle_priv *priv) item=map_rect_get_item(mr); continue; } - dbg(lvl_debug, "next pos=0x%x,0x%x\n", c.x, c.y); + dbg(lvl_debug, "next pos=0x%x,0x%x", c.x, c.y); slen = transform_distance(projection_mg, &pos, &c); - dbg(lvl_debug, "len=%d slen=%d\n", len, slen); + dbg(lvl_debug, "len=%d slen=%d", len, slen); if (slen < len) { len -= slen; pos = c; @@ -258,9 +258,9 @@ vehicle_demo_timer(struct vehicle_priv *priv) ci.x = pos.x; ci.y = pos.y; priv->speed=0; - dbg(lvl_debug,"destination reached\n"); + dbg(lvl_debug,"destination reached"); } - dbg(lvl_debug, "ci=0x%x,0x%x\n", ci.x, ci.y); + dbg(lvl_debug, "ci=0x%x,0x%x", ci.x, ci.y); transform_to_geo(projection_mg, &ci, &priv->geo); if (priv->valid != attr_position_valid_valid) { @@ -288,7 +288,7 @@ vehicle_demo_new(struct vehicle_methods { struct vehicle_priv *ret; - dbg(lvl_debug, "enter\n"); + dbg(lvl_debug, "enter"); ret = g_new0(struct vehicle_priv, 1); ret->cbl = cbl; ret->interval=1000; @@ -306,7 +306,7 @@ vehicle_demo_new(struct vehicle_methods void plugin_init(void) { - dbg(lvl_debug, "enter\n"); + dbg(lvl_debug, "enter"); plugin_register_category_vehicle("demo", vehicle_demo_new); } |