summaryrefslogtreecommitdiff
path: root/navit/vehicle/maemo/vehicle_maemo.c
diff options
context:
space:
mode:
Diffstat (limited to 'navit/vehicle/maemo/vehicle_maemo.c')
-rw-r--r--navit/vehicle/maemo/vehicle_maemo.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/navit/vehicle/maemo/vehicle_maemo.c b/navit/vehicle/maemo/vehicle_maemo.c
index 015f1c8e3..2ff6296d5 100644
--- a/navit/vehicle/maemo/vehicle_maemo.c
+++ b/navit/vehicle/maemo/vehicle_maemo.c
@@ -72,7 +72,7 @@ static void vehicle_maemo_callback(LocationGPSDevice *device, gpointer user_data
priv->sats_used=device->satellites_in_use;
callback_list_call_attr_0(priv->cbl, attr_position_sats);
- dbg(lvl_debug,"Got update with %u/%u satellites\n",priv->sats_used,priv->sats);
+ dbg(lvl_debug,"Got update with %u/%u satellites",priv->sats_used,priv->sats);
if (device->fix) {
switch(device->fix->mode) {
@@ -91,28 +91,28 @@ static void vehicle_maemo_callback(LocationGPSDevice *device, gpointer user_data
priv->geo.lng=device->fix->longitude;
priv->hdop=device->fix->eph/100;
callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
- dbg(lvl_debug,"Position: %f %f with error %f meters\n",priv->geo.lat,priv->geo.lng,priv->hdop);
+ dbg(lvl_debug,"Position: %f %f with error %f meters",priv->geo.lat,priv->geo.lng,priv->hdop);
}
if (device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
priv->speed=device->fix->speed;
callback_list_call_attr_0(priv->cbl, attr_position_speed);
- dbg(lvl_debug,"Speed: %f\n ",priv->speed);
+ dbg(lvl_debug,"Speed: %f ",priv->speed);
}
if (device->fix->fields & LOCATION_GPS_DEVICE_TRACK_SET) {
priv->direction=device->fix->track;
- dbg(lvl_debug,"Direction: %f\n",priv->direction);
+ dbg(lvl_debug,"Direction: %f",priv->direction);
}
if (device->fix->fields & LOCATION_GPS_DEVICE_TIME_SET) {
priv->fix_time=device->fix->time;
- dbg(lvl_debug,"Time: %f\n",priv->fix_time);
+ dbg(lvl_debug,"Time: %f",priv->fix_time);
}
if (device->fix->fields & LOCATION_GPS_DEVICE_ALTITUDE_SET) {
priv->height=device->fix->altitude;
- dbg(lvl_debug,"Elevation: %f\n",priv->height);
+ dbg(lvl_debug,"Elevation: %f",priv->height);
}
}
@@ -124,19 +124,19 @@ static void vehicle_maemo_error(LocationGPSDControl *control, LocationGPSDContro
{
switch (error) {
case LOCATION_ERROR_USER_REJECTED_DIALOG:
- dbg(lvl_error,"User didn't enable requested methods\n");
+ dbg(lvl_error,"User didn't enable requested methods");
break;
case LOCATION_ERROR_USER_REJECTED_SETTINGS:
- dbg(lvl_error,"User changed settings, which disabled location\n");
+ dbg(lvl_error,"User changed settings, which disabled location");
break;
case LOCATION_ERROR_BT_GPS_NOT_AVAILABLE:
- dbg(lvl_error,"Problems with BT GPS\n");
+ dbg(lvl_error,"Problems with BT GPS");
break;
case LOCATION_ERROR_METHOD_NOT_ALLOWED_IN_OFFLINE_MODE:
- dbg(lvl_error,"Requested method is not allowed in offline mode\n");
+ dbg(lvl_error,"Requested method is not allowed in offline mode");
break;
case LOCATION_ERROR_SYSTEM:
- dbg(lvl_error,"System error\n");
+ dbg(lvl_error,"System error");
break;
}
}
@@ -153,54 +153,54 @@ vehicle_maemo_open(struct vehicle_priv *priv)
if (!strcasecmp(priv->source+8,"cwp")) {
g_object_set(G_OBJECT(priv->control), "preferred-method", LOCATION_METHOD_CWP, NULL);
- dbg(lvl_debug,"Method set: CWP\n");
+ dbg(lvl_debug,"Method set: CWP");
} else if (!strcasecmp(priv->source+8,"acwp")) {
g_object_set(G_OBJECT(priv->control), "preferred-method", LOCATION_METHOD_ACWP, NULL);
- dbg(lvl_debug,"Method set: ACWP\n");
+ dbg(lvl_debug,"Method set: ACWP");
} else if (!strcasecmp(priv->source+8,"gnss")) {
g_object_set(G_OBJECT(priv->control), "preferred-method", LOCATION_METHOD_GNSS, NULL);
- dbg(lvl_debug,"Method set: GNSS\n");
+ dbg(lvl_debug,"Method set: GNSS");
} else if (!strcasecmp(priv->source+8,"agnss")) {
g_object_set(G_OBJECT(priv->control), "preferred-method", LOCATION_METHOD_AGNSS, NULL);
- dbg(lvl_debug,"Method set: AGNSS\n");
+ dbg(lvl_debug,"Method set: AGNSS");
} else {
g_object_set(G_OBJECT(priv->control), "preferred-method", LOCATION_METHOD_USER_SELECTED, NULL);
- dbg(lvl_debug,"Method set: ANY\n");
+ dbg(lvl_debug,"Method set: ANY");
}
switch (priv->retry_interval) {
case 2:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_2S, NULL);
- dbg(lvl_debug,"Interval set: 2s\n");
+ dbg(lvl_debug,"Interval set: 2s");
break;
case 5:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_5S, NULL);
- dbg(lvl_debug,"Interval set: 5s\n");
+ dbg(lvl_debug,"Interval set: 5s");
break;
case 10:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_10S, NULL);
- dbg(lvl_debug,"Interval set: 10s\n");
+ dbg(lvl_debug,"Interval set: 10s");
break;
case 20:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_20S, NULL);
- dbg(lvl_debug,"Interval set: 20s\n");
+ dbg(lvl_debug,"Interval set: 20s");
break;
case 30:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_30S, NULL);
- dbg(lvl_debug,"Interval set: 30s\n");
+ dbg(lvl_debug,"Interval set: 30s");
break;
case 60:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_60S, NULL);
- dbg(lvl_debug,"Interval set: 60s\n");
+ dbg(lvl_debug,"Interval set: 60s");
break;
case 120:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_120S, NULL);
- dbg(lvl_debug,"Interval set: 120s\n");
+ dbg(lvl_debug,"Interval set: 120s");
break;
case 1:
default:
g_object_set(G_OBJECT(priv->control), "preferred-interval", LOCATION_INTERVAL_1S, NULL);
- dbg(lvl_debug,"Interval set: 1s\n");
+ dbg(lvl_debug,"Interval set: 1s");
break;
}
@@ -230,41 +230,41 @@ vehicle_maemo_position_attr_get(struct vehicle_priv *priv,
struct attr * active=NULL;
switch (type) {
case attr_position_fix_type:
- dbg(lvl_debug,"Attr requested: position_fix_type\n");
+ dbg(lvl_debug,"Attr requested: position_fix_type");
attr->u.num = priv->fix_type;
break;
case attr_position_height:
- dbg(lvl_debug,"Attr requested: position_height\n");
+ dbg(lvl_debug,"Attr requested: position_height");
attr->u.numd = &priv->height;
break;
case attr_position_speed:
- dbg(lvl_debug,"Attr requested: position_speed\n");
+ dbg(lvl_debug,"Attr requested: position_speed");
attr->u.numd = &priv->speed;
break;
case attr_position_direction:
- dbg(lvl_debug,"Attr requested: position_direction\n");
+ dbg(lvl_debug,"Attr requested: position_direction");
attr->u.numd = &priv->direction;
break;
case attr_position_hdop:
- dbg(lvl_debug,"Attr requested: position_hdop\n");
+ dbg(lvl_debug,"Attr requested: position_hdop");
attr->u.numd = &priv->hdop;
break;
case attr_position_sats:
- dbg(lvl_debug,"Attr requested: position_sats\n");
+ dbg(lvl_debug,"Attr requested: position_sats");
attr->u.num = priv->sats;
break;
case attr_position_sats_used:
- dbg(lvl_debug,"Attr requested: position_sats_used\n");
+ dbg(lvl_debug,"Attr requested: position_sats_used");
attr->u.num = priv->sats_used;
break;
case attr_position_coord_geo:
- dbg(lvl_debug,"Attr requested: position_coord_geo\n");
+ dbg(lvl_debug,"Attr requested: position_coord_geo");
attr->u.coord_geo = &priv->geo;
break;
case attr_position_time_iso8601:
{
struct tm tm;
- dbg(lvl_debug,"Attr requested: position_time_iso8601\n");
+ dbg(lvl_debug,"Attr requested: position_time_iso8601");
if (!priv->fix_time)
return 0;
if (gmtime_r(&priv->fix_time, &tm)) {
@@ -276,7 +276,7 @@ vehicle_maemo_position_attr_get(struct vehicle_priv *priv,
}
break;
case attr_active:
- dbg(lvl_debug,"Attr requested: position_active\n");
+ dbg(lvl_debug,"Attr requested: position_active");
active = attr_search(priv->attrs,NULL,attr_active);
if(active != NULL) {
attr->u.num=active->u.num;
@@ -304,7 +304,7 @@ vehicle_maemo_new_maemo(struct vehicle_methods
struct vehicle_priv *ret;
struct attr *source, *retry_int;
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
source = attr_search(attrs, NULL, attr_source);
ret = g_new0(struct vehicle_priv, 1);
ret->source = g_strdup(source->u.str);
@@ -312,13 +312,13 @@ vehicle_maemo_new_maemo(struct vehicle_methods
if (retry_int) {
ret->retry_interval = retry_int->u.num;
if (ret->retry_interval !=1 && ret->retry_interval !=2 && ret->retry_interval !=5 && ret->retry_interval !=10 && ret->retry_interval !=20 && ret->retry_interval !=30 && ret->retry_interval !=60 && ret->retry_interval !=120 ) {
- dbg(lvl_error, "Retry interval %d invalid, setting to 1\n", ret->retry_interval,1);
+ dbg(lvl_error, "Retry interval %d invalid, setting to 1", ret->retry_interval,1);
ret->retry_interval = 1;
}
} else {
ret->retry_interval = 1;
}
- dbg(lvl_debug,"source: %s, interval: %u\n",ret->source,ret->retry_interval);
+ dbg(lvl_debug,"source: %s, interval: %u",ret->source,ret->retry_interval);
ret->cbl = cbl;
*meth = vehicle_maemo_methods;
ret->attrs = attrs;
@@ -329,6 +329,6 @@ vehicle_maemo_new_maemo(struct vehicle_methods
void
plugin_init(void)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
plugin_register_category_vehicle("maemo", vehicle_maemo_new_maemo);
}
View Lorry Controller Status