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

Merge branch 'master' into mixer_fix

This commit is contained in:
Lorenz Meier 2013-09-22 12:05:12 +02:00
parent 5a54354044 9eb4e05c9d
commit c38e692ebb
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/drv_gps.h
View File

@ -51,8 +51,7 @@
typedef enum { typedef enum {
GPS_DRIVER_MODE_NONE = 0, GPS_DRIVER_MODE_NONE = 0,
GPS_DRIVER_MODE_UBX, GPS_DRIVER_MODE_UBX,
GPS_DRIVER_MODE_MTK, GPS_DRIVER_MODE_MTK
GPS_DRIVER_MODE_NMEA,
} gps_driver_mode_t; } gps_driver_mode_t;

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

@ -279,10 +279,6 @@ GPS::task_main()
_Helper = new MTK(_serial_fd, &_report); _Helper = new MTK(_serial_fd, &_report);
break; break;
case GPS_DRIVER_MODE_NMEA:
//_Helper = new NMEA(); //TODO: add NMEA
break;
default: default:
break; break;
} }
@ -328,10 +324,6 @@ GPS::task_main()
mode_str = "MTK"; mode_str = "MTK";
break; break;
case GPS_DRIVER_MODE_NMEA:
mode_str = "NMEA";
break;
default: default:
break; break;
} }
@ -362,9 +354,6 @@ GPS::task_main()
_mode = GPS_DRIVER_MODE_UBX; _mode = GPS_DRIVER_MODE_UBX;
break; break;
// case GPS_DRIVER_MODE_NMEA:
// _mode = GPS_DRIVER_MODE_UBX;
// break;
default: default:
break; break;
} }
@ -400,10 +389,6 @@ GPS::print_info()
warnx("protocol: MTK"); warnx("protocol: MTK");
break; break;
case GPS_DRIVER_MODE_NMEA:
warnx("protocol: NMEA");
break;
default: default:
break; break;
} }

1
src/drivers/gps/ubx.cpp
View File

@ -281,7 +281,6 @@ UBX::receive(unsigned timeout)
return 1; return 1;
} else { } else {
warnx("ubx: timeout - no messages");
return -1; return -1;
} }