Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 10:26:52 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fixed some formatting

Browse Source
This commit is contained in:
Fredmcc
2017-02-24 17:42:48 +01:00
committed by Lorenz Meier
parent 4ffbaed500
commit 96cffd4077
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/frsky_telemetry/sPort_data.c
+9 -6
View File
@@ -90,8 +90,8 @@ bool sPort_init()
gps_position = malloc(sizeof(struct vehicle_gps_position_s)); gps_position = malloc(sizeof(struct vehicle_gps_position_s));
if (sensor_combined == NULL || global_pos == NULL || local_pos == NULL || battery_status == NULL || vehicle_status == NULL if (sensor_combined == NULL || global_pos == NULL || local_pos == NULL || battery_status == NULL
|| gps_position == NULL) { || vehicle_status == NULL || gps_position == NULL) {
return false; return false;
} }
@@ -318,7 +318,8 @@ void sPort_send_GPS_CRS(int uart)
/* 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 */
int32_t iYaw = local_pos->yaw * 18000.0f / M_PI_F; int32_t iYaw = local_pos->yaw * 18000.0f / M_PI_F;
if (iYaw < 0) iYaw += 36000;
if (iYaw < 0) { iYaw += 36000; }
sPort_send_data(uart, SMARTPORT_ID_GPS_CRS, iYaw); sPort_send_data(uart, SMARTPORT_ID_GPS_CRS, iYaw);
} }
@@ -331,14 +332,16 @@ void sPort_send_GPS_TIME(int uart)
time_t time_gps = gps_position->time_utc_usec / 1000000ULL; time_t time_gps = gps_position->time_utc_usec / 1000000ULL;
struct tm *tm_gps = gmtime(&time_gps); struct tm *tm_gps = gmtime(&time_gps);
if(date){ if (date) {
sPort_send_data(uart, SMARTPORT_ID_GPS_TIME, (uint32_t) 0xff | (tm_gps->tm_mday << 8 ) | ((tm_gps->tm_mon + 1) << 16 ) | ((tm_gps->tm_year -100) << 24 ) ); sPort_send_data(uart, SMARTPORT_ID_GPS_TIME,
(uint32_t) 0xff | (tm_gps->tm_mday << 8) | ((tm_gps->tm_mon + 1) << 16) | ((tm_gps->tm_year - 100) << 24));
date = 0; date = 0;
} else { } else {
sPort_send_data(uart, SMARTPORT_ID_GPS_TIME, (uint32_t) 0x00 | (tm_gps->tm_sec << 8 ) | (tm_gps->tm_min << 16 ) | (tm_gps->tm_hour << 24 )); sPort_send_data(uart, SMARTPORT_ID_GPS_TIME,
(uint32_t) 0x00 | (tm_gps->tm_sec << 8) | (tm_gps->tm_min << 16) | (tm_gps->tm_hour << 24));
date = 1; date = 1;
} }