Skip to content

F
fwatch
Commit c0ad6092 authored by Theodor-Adrian Stana's avatar Theodor-Adrian Stana
Browse files
Options

gpscoord: Seemingly correct coordinate display 

Some open-field testing needs to be performed on GPS reception, as the GPS
readouts are ~1 arcsec. off from reference Android app (`My GPS Coordinates').
However, this does translate in 30m accuracy, so it's not a big deal.
parent f49b2ff1
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 41 deletions
sw/common/drivers/gps/gps.c
View file @ c0ad6092
......@@ -186,7 +186,7 @@ void gps_get_utc(struct gps_utc *utc)
void gps_get_coord(struct gps_coord *coord, int format)
{
if (format == 0) {
/* Raw [deg][min].[sec/60] data */
/* Raw [deg][min].[sec/60] */
coord->lat = gps_info.lat;
coord->lon = gps_info.lon;
} else if (format == 1) {
......@@ -195,6 +195,13 @@ void gps_get_coord(struct gps_coord *coord, int format)
gps_info.lat - (int)gps_info.lat);
coord->lon = (int)gps_info.lon + 0.6 * (
gps_info.lon - (int)gps_info.lon);
} else if (format == 2) {
/* [deg].[min/60] */
float tmp;
tmp = gps_info.lat/100;
coord->lat = (int)tmp + (tmp - (int)tmp) / 0.6;
tmp = gps_info.lon/100;
coord->lon = (int)tmp + (tmp - (int)tmp) / 0.6;
}
coord->elev = gps_info.elv;
}
......
sw/freertos/Makefile
View file @ c0ad6092
......@@ -105,7 +105,7 @@ override ASMFLAGS += -x assembler-with-cpp -D$(DEVICE) -Wall -Wextra -mcpu=corte
# NOTE: The -Wl,--gc-sections flag may interfere with debugging using gdb.
#
override LDFLAGS += -Xlinker -Map=$(LST_DIR)/$(PROJECTNAME).map -mcpu=cortex-m3 \
-mthumb -T../common/Device/EnergyMicro/EFM32GG/Source/GCC/efm32gg_bootld.ld \
-mthumb -T../common/Device/EnergyMicro/EFM32GG/Source/GCC/efm32gg.ld \
-Wl,--gc-sections
LIBS = -Wl,--start-group -lgcc -lc -lnosys -Wl,--end-group
......
sw/freertos/src/apps/gpscoord.c
View file @ c0ad6092
......@@ -37,7 +37,8 @@
#include "application.h"
static struct gps_coord coord;
static int coord_format;
static int coord_format = 1;
static int gpsscreen = 0;
static void gps_redraw(struct ui_widget *w)
{
......@@ -63,42 +64,44 @@ static void gps_redraw(struct ui_widget *w)
gfx_clear(&w->dc, 0);
/* Display latitude and longitude depending on format */
if (coord_format == 0) {
/* raw [deg][min].[sec/60] */
sprintf(buf, "L: %d deg", (int)latdeg);
gfx_text(&w->dc, &font_helv22b, 0, 0, buf, 0);
sprintf(buf, "%2.5f'", latmin);
gfx_text(&w->dc, &font_helv22b, 20, 20, buf, 0);
sprintf(buf, "l: %d deg", (int)(londeg));
gfx_text(&w->dc, &font_helv22b, 0, 40, buf, 0);
sprintf(buf, "%2.5f'", lonmin);
gfx_text(&w->dc, &font_helv22b, 15, 60, buf, 0);
} else if (coord_format == 1) {
/* [deg] [min] [sec] */
sprintf(buf, "L: %d deg", (int)latdeg);
gfx_text(&w->dc, &font_helv22b, 0, 0, buf, 0);
sprintf(buf, "%d' %2.2f''", (int)latmin, 0.6 * latsec);
gfx_text(&w->dc, &font_helv22b, 20, 20, buf, 0);
sprintf(buf, "l: %d deg", (int)londeg);
gfx_text(&w->dc, &font_helv22b, 0, 40, buf, 0);
sprintf(buf, "%d' %2.2f''", (int)lonmin, 60 * lonsec);
gfx_text(&w->dc, &font_helv22b, 15, 60, buf, 0);
} else if (coord_format == 2) {
/* [deg].[min/60] */
latdeg = latdeg/0.6;
sprintf(buf, "L: %2.5f", latdeg);
gfx_text(&w->dc, &font_helv22b, 0, 0, buf, 0);
londeg = londeg/0.6;
sprintf(buf, "l: %2.5f", londeg);
if (gpsscreen == 0) {
if (coord_format == 0) {
/* raw [deg][min].[sec/60] */
sprintf(buf, "L: %d deg", (int)latdeg);
gfx_text(&w->dc, &font_helv22b, 0, 0, buf, 0);
sprintf(buf, "%2.4f'", latmin);
gfx_text(&w->dc, &font_helv22b, 22, 20, buf, 0);
sprintf(buf, "l: %d deg", (int)(londeg));
gfx_text(&w->dc, &font_helv22b, 0, 50, buf, 0);
sprintf(buf, "%2.4f'", lonmin);
gfx_text(&w->dc, &font_helv22b, 15, 70, buf, 0);
} else if (coord_format == 1) {
/* [deg] [min] [sec] */
sprintf(buf, "L: %d deg", (int)latdeg);
gfx_text(&w->dc, &font_helv22b, 0, 0, buf, 0);
sprintf(buf, "%d'%2.2f''", (int)latmin, 0.6 * latsec);
gfx_text(&w->dc, &font_helv22b, 22, 20, buf, 0);
sprintf(buf, "l: %d deg", (int)londeg);
gfx_text(&w->dc, &font_helv22b, 0, 50, buf, 0);
sprintf(buf, "%d'%2.2f''", (int)lonmin, 60 * lonsec);
gfx_text(&w->dc, &font_helv22b, 15, 70, buf, 0);
} else if (coord_format == 2) {
/* [deg].[min/60] */
sprintf(buf, "L: %2.4f", coord.lat);
gfx_text(&w->dc, &font_helv22b, 0, 0, buf, 0);
sprintf(buf, "l: %2.4f", coord.lon);
gfx_text(&w->dc, &font_helv22b, 0, 50, buf, 0);
}
/* Display elevation */
} else {
sprintf(buf, "elev:");
gfx_text(&w->dc, &font_helv22b, 0, 20, buf, 0);
sprintf(buf, "%5.3f", coord.elev);
gfx_text(&w->dc, &font_helv22b, 0, 40, buf, 0);
}
/* Display elevation */
sprintf(buf, "h: %5.2f", coord.elev);
gfx_text(&w->dc, &font_helv22b, 0, 75, buf, 0);
}
static void gps_event(struct ui_widget *w, const struct event *evt)
......@@ -150,10 +153,12 @@ void gpscoord_main(void *params)
if (evt.data.button == BUT_TR)
return;
else if (evt.data.button == BUT_BR) {
/* increment coordinate format and wrap
* around at 3 */
coord_format += 1;
coord_format %= 3;
/*
* Toggle between coordinate and
* elevation screens
*/
gpsscreen += 1;
gpsscreen %= 2;
}
break;
case RTC_TICK:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment