diff options
| author | px4dev <px4@purgatory.org> | 2012-12-01 22:52:59 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-12-01 22:52:59 -0800 |
| commit | 5609604af54a700d45b7b9495fe38ffbc5624479 (patch) | |
| tree | cd9e88d94209671af2e27e5b35ab25a9a6519330 | |
| parent | 404332aefe5e2ad3d0766f99bd8d8efebdd4d331 (diff) | |
| parent | 6f572637de44b364ff0bec3f3947fb73de74e88b (diff) | |
| download | px4-firmware-5609604af54a700d45b7b9495fe38ffbc5624479.tar.gz px4-firmware-5609604af54a700d45b7b9495fe38ffbc5624479.tar.bz2 px4-firmware-5609604af54a700d45b7b9495fe38ffbc5624479.zip | |
Merge pull request #85 from julianoes/hotfix_gps_heading
Fixed missing heading for mtkcustom and nmea
| -rw-r--r-- | apps/gps/mtk.c | 2 | ||||
| -rw-r--r-- | apps/gps/nmea_helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/gps/mtk.c b/apps/gps/mtk.c index 7ba4f52b0..3b0ee4565 100644 --- a/apps/gps/mtk.c +++ b/apps/gps/mtk.c @@ -128,7 +128,7 @@ int mtk_parse(uint8_t b, char *gps_rx_buffer) mtk_gps->eph = packet->hdop; mtk_gps->epv = 65535; //unknown in mtk custom mode mtk_gps->vel = packet->ground_speed; - mtk_gps->cog = 65535; //unknown in mtk custom mode + mtk_gps->cog = (uint16_t)packet->heading; //mtk: degrees *1e2, mavlink/ubx: degrees *1e2 mtk_gps->satellites_visible = packet->satellites; /* convert time and date information to unix timestamp */ diff --git a/apps/gps/nmea_helper.c b/apps/gps/nmea_helper.c index 577a3a01c..1a50371c1 100644 --- a/apps/gps/nmea_helper.c +++ b/apps/gps/nmea_helper.c @@ -214,7 +214,7 @@ void *nmea_loop(void *args) nmea_gps->eph = (uint16_t)(info->HDOP * 100); //TODO:test scaling nmea_gps->epv = (uint16_t)(info->VDOP * 100); //TODO:test scaling nmea_gps->vel = (uint16_t)(info->speed * 1000 / 36); //*1000/3600*100 - nmea_gps->cog = 65535; + nmea_gps->cog = (uint16_t)info->direction*100; //nmea: degrees float, ubx/mavlink: degrees*1e2 nmea_gps->satellites_visible = (uint8_t)info->satinfo.inview; int i = 0; |