Merge branch 'master' into mixer_fix

src/drivers/drv_gps.h

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

src/drivers/gps/gps.cpp

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

src/drivers/gps/ubx.cpp

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