From a402b3beeb51f56d6bde5f6f92a65a1e7a28b020 Mon Sep 17 00:00:00 2001 From: Mark Whitehorn Date: Fri, 22 Jan 2016 14:42:39 -0700 Subject: [PATCH] change frsky_telemetry default port to USART8 for pixracer add a 50msec timeout to poll calls in sPort_telemetry to prevent hangs --- src/drivers/frsky_telemetry/frsky_telemetry.c | 2 +- src/drivers/sPort_telemetry/sPort_telemetry.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/drivers/frsky_telemetry/frsky_telemetry.c b/src/drivers/frsky_telemetry/frsky_telemetry.c index 6100f5f1d0..94b68448fa 100644 --- a/src/drivers/frsky_telemetry/frsky_telemetry.c +++ b/src/drivers/frsky_telemetry/frsky_telemetry.c @@ -133,7 +133,7 @@ static void usage() static int frsky_telemetry_thread_main(int argc, char *argv[]) { /* Default values for arguments */ - char *device_name = "/dev/ttyS1"; /* USART2 */ + char *device_name = "/dev/ttyS6"; /* USART8 */ /* Work around some stupidity in task_create's argv handling */ argc -= 2; diff --git a/src/drivers/sPort_telemetry/sPort_telemetry.c b/src/drivers/sPort_telemetry/sPort_telemetry.c index 877a685b3e..3adde806da 100644 --- a/src/drivers/sPort_telemetry/sPort_telemetry.c +++ b/src/drivers/sPort_telemetry/sPort_telemetry.c @@ -185,8 +185,9 @@ static int sPort_telemetry_thread_main(int argc, char *argv[]) /* wait for poll frame starting with value 0x7E * note that only the bus master is supposed to put a 0x7E on the bus. * slaves use byte stuffing to send 0x7E and 0x7D. + * we expect a poll frame every 12msec */ - int status = poll(fds, sizeof(fds) / sizeof(fds[0]), -1); + int status = poll(fds, sizeof(fds) / sizeof(fds[0]), 50); if (status < 1) { continue; } @@ -196,7 +197,7 @@ static int sPort_telemetry_thread_main(int argc, char *argv[]) if (newBytes < 1 || sbuf[0] != 0x7E) { continue; } /* wait for ID byte */ - status = poll(fds, sizeof(fds) / sizeof(fds[0]), -1); + status = poll(fds, sizeof(fds) / sizeof(fds[0]), 50); if (status < 1) { continue; }