fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 16:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SPort scale for GPS coords and Altitude

Browse Source
This commit is contained in:
Fredmcc
2017-06-04 04:43:07 +08:00
committed by Lorenz Meier
parent 0c3a34fb7f
commit 5290e6cfe1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/frsky_telemetry/sPort_data.c
+4 -4
View File
@@ -270,7 +270,8 @@ void sPort_send_GPS_LON(int uart)
/* send longitude */ /* send longitude */
/* convert to 30 bit signed magnitude degrees*6E5 with MSb = 1 and bit 30=sign */ /* convert to 30 bit signed magnitude degrees*6E5 with MSb = 1 and bit 30=sign */
/* precision is approximately 0.1m */ /* precision is approximately 0.1m */
uint32_t iLon = 6E5 * fabs(gps_position->lon); uint32_t iLon = 6E-2 * fabs(gps_position->lon);
iLon |= (1 << 31); iLon |= (1 << 31);
if (gps_position->lon < 0) { iLon |= (1 << 30); } if (gps_position->lon < 0) { iLon |= (1 << 30); }
@@ -282,7 +283,7 @@ void sPort_send_GPS_LAT(int uart)
{ {
/* send latitude */ /* send latitude */
/* convert to 30 bit signed magnitude degrees*6E5 with MSb = 0 and bit 30=sign */ /* convert to 30 bit signed magnitude degrees*6E5 with MSb = 0 and bit 30=sign */
uint32_t iLat = 6E5 * fabs(gps_position->lat); uint32_t iLat = 6E-2 * fabs(gps_position->lat);
if (gps_position->lat < 0) { iLat |= (1 << 30); } if (gps_position->lat < 0) { iLat |= (1 << 30); }
@@ -292,8 +293,7 @@ void sPort_send_GPS_LAT(int uart)
void sPort_send_GPS_ALT(int uart) void sPort_send_GPS_ALT(int uart)
{ {
/* send altitude */ /* send altitude */
/* convert to 100 * m/sec */ uint32_t iAlt = gps_position->alt / 10;
uint32_t iAlt = 100 * gps_position->alt;
sPort_send_data(uart, SMARTPORT_ID_GPS_ALT, iAlt); sPort_send_data(uart, SMARTPORT_ID_GPS_ALT, iAlt);
} }