dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Code style fix

This commit is contained in:
Denis Yeldandi 2014-10-09 11:15:11 +04:00
parent 1bf1cec567
commit 09b5206404
3 changed files with 551 additions and 461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

987
src/drivers/gps/ashtech.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/drivers/gps/ashtech.h
View File

@ -67,8 +67,8 @@ class ASHTECH : public GPS_Helper
bool _parse_error; // parse error flag bool _parse_error; // parse error flag
char *_parse_pos; // parse position char *_parse_pos; // parse position
bool _gsv_in_progress; // Indicates that gsv data parsing is in progress bool _gsv_in_progress; /**< Indicates that gsv data parsing is in progress */
//int _satellites_count; // Number of satellites info parsed. //int _satellites_count; /**< Number of satellites info parsed. */
uint8_t count; /**< Number of satellites in satellite info */ uint8_t count; /**< Number of satellites in satellite info */
uint8_t svid[SAT_INFO_MAX_SATELLITES]; /**< Space vehicle ID [1..255], see scheme below */ uint8_t svid[SAT_INFO_MAX_SATELLITES]; /**< Space vehicle ID [1..255], see scheme below */
uint8_t used[SAT_INFO_MAX_SATELLITES]; /**< 0: Satellite not used, 1: used for navigation */ uint8_t used[SAT_INFO_MAX_SATELLITES]; /**< 0: Satellite not used, 1: used for navigation */

13
src/drivers/gps/gps.cpp
View File

@ -343,7 +343,6 @@ GPS::task_main()
break; break;
case GPS_DRIVER_MODE_ASHTECH: case GPS_DRIVER_MODE_ASHTECH:
_Helper = new ASHTECH(_serial_fd, &_report_gps_pos, _p_report_sat_info); _Helper = new ASHTECH(_serial_fd, &_report_gps_pos, _p_report_sat_info);
break; break;
@ -408,9 +407,9 @@ GPS::task_main()
mode_str = "MTK"; mode_str = "MTK";
break; break;
case GPS_DRIVER_MODE_ASHTECH: case GPS_DRIVER_MODE_ASHTECH:
mode_str = "ASHTECH"; mode_str = "ASHTECH";
break; break;
default: default:
break; break;
@ -439,10 +438,10 @@ GPS::task_main()
break; break;
case GPS_DRIVER_MODE_MTK: case GPS_DRIVER_MODE_MTK:
_mode = GPS_DRIVER_MODE_ASHTECH; _mode = GPS_DRIVER_MODE_ASHTECH;
break; break;
case GPS_DRIVER_MODE_ASHTECH: case GPS_DRIVER_MODE_ASHTECH:
_mode = GPS_DRIVER_MODE_UBX; _mode = GPS_DRIVER_MODE_UBX;
break; break;