From f6a5fb5a8382a3af5ecc7709a28063faa451e71b Mon Sep 17 00:00:00 2001 From: steffen Date: Fri, 29 Mar 2013 02:38:54 +0000 Subject: [PATCH] some changes gui and gps.. --- base/config.c | 6 ++++++ draw/draw.c | 1 + main/gps.c | 1 + main/gps.h | 2 +- main/gui_config.c | 11 ++++++++++- 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/base/config.c b/base/config.c index 1946a8d..2372a8c 100644 --- a/base/config.c +++ b/base/config.c @@ -135,6 +135,12 @@ void config_init () { #endif config_load (); config_save (); + + if (cfg.gps_flags) SETFLAG(gpsflags, GPSF_LOG); + else DELFLAG(gpsflags, GPSF_LOG); + + if (cfg.debug) SETFLAG(view_flags, DRAW_DEBUG); + else DELFLAG(view_flags, DRAW_DEBUG); }; diff --git a/draw/draw.c b/draw/draw.c index 19aa2f5..9c43a65 100644 --- a/draw/draw.c +++ b/draw/draw.c @@ -742,6 +742,7 @@ void draw_map () { default: sprintf (text, "?"); c = &color[COLOR_red][3]; + break; } gfx_draw_text (img_map, p1.x-4, p1.y-4, text, c); gfx_draw_text (img_map, p1.x-strlen(cpoi->name)*2, p1.y+8, cpoi->name, c); diff --git a/main/gps.c b/main/gps.c index 99a7d50..af28679 100644 --- a/main/gps.c +++ b/main/gps.c @@ -688,6 +688,7 @@ struct gps_data *gps_loop () { line[i] = 0; /* write into logfile */ +// d_printf ("gps line:'%s'", line); if (i > 0) { if (gpslasttype != GPS_T_FILE && gpsflags & GPSF_LOG) gps_save_log (logfile, line); if (gps_convert_line (line, &gpspos) == 0) gpspos.valid = 0; diff --git a/main/gps.h b/main/gps.h index 5f326dc..7c5daf2 100644 --- a/main/gps.h +++ b/main/gps.h @@ -37,7 +37,7 @@ #define GPS_DEVICELEN 256 #define GPS_ROUTEPOILEN 128 -#define GPS_INBUFSIZE 128 +#define GPS_INBUFSIZE 1024 #define GPS_LINELEN 100 #define GPS_MAXSAT 32 diff --git a/main/gui_config.c b/main/gui_config.c index a8d068b..96c2c30 100644 --- a/main/gui_config.c +++ b/main/gui_config.c @@ -47,7 +47,11 @@ GUIItem *label1 = NULL; GUIItem *label2 = NULL; char gpscfg_dev[8][LEN_FILENAME] = { +#ifdef ANDROID + "android:", +#else "serial:/dev/rfcomm0", +#endif "serial:com1,38400", "serial:com1,4800", "", @@ -125,10 +129,15 @@ void gui_config_close () { void gui_config_checkbox_changed () { - cfg.debug = GUI_CHECKBOX_T(cb_debug)->checked; + if (cfg.debug = GUI_CHECKBOX_T(cb_debug)->checked) SETFLAG(view_flags, DRAW_DEBUG); + else DELFLAG(view_flags, DRAW_DEBUG); + cfg.softkeyboard = GUI_CHECKBOX_T(cb_softkeyb)->checked; if (GUI_CHECKBOX_T(log_file)->checked) cfg.gps_flags |= GPSF_LOG; else cfg.gps_flags &= (0x0FFFF-GPSF_LOG); + + if (cfg.gps_flags) SETFLAG(gpsflags, GPSF_LOG); + else DELFLAG(gpsflags, GPSF_LOG); }; void gui_config_gpslist (int nr) {