Merge branch 'sbus' of https://github.com/PX4/Firmware into #61-px4io-spektrum-decoder

apps/drivers/px4io/px4io.cpp

@@ -338,7 +338,6 @@ PX4IO::task_main()
 		/* this would be bad... */
 		if (ret < 0) {
 			log("poll error %d", errno);
-			usleep(1000000);
 			continue;
 		}
 

apps/drivers/px4io/uploader.cpp

@@ -189,8 +189,10 @@ PX4IO_Uploader::drain()
 	int ret;
 
 	do {
-		ret = recv(c, 10);
-		//log("discard 0x%02x", c);
+		ret = recv(c, 250);
+		if (ret == OK) {
+			//log("discard 0x%02x", c);
+		}
 	} while (ret == OK);
 }