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

Hotfix for USB: Starting MAVLink only on USB if connected. Needs rewrite of MAVLink and delay / retries for correct approach

This commit is contained in:
Lorenz Meier 2013-09-03 08:17:22 +02:00
parent 791e22f442
commit 2457013bbb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ROMFS/px4fmu_common/init.d/rcS
View File

@ -63,9 +63,8 @@ then
if sercon if sercon
then then
echo "USB connected" echo "USB connected"
else sleep 3
# second attempt mavlink start -d /dev/ttyACM0 -b 230400
sercon &
fi fi
# #
@ -105,7 +104,7 @@ then
fi fi
# Try to get an USB console # Try to get an USB console
nshterm /dev/ttyACM0 & #nshterm /dev/ttyACM0 &
# #
# Upgrade PX4IO firmware # Upgrade PX4IO firmware
@ -219,5 +218,6 @@ then
gps start gps start
fi fi
# End of autostart # End of autostart
fi fi

1
src/modules/mavlink/mavlink.c
View File

@ -516,7 +516,6 @@ void mavlink_update_system(void)
int mavlink_thread_main(int argc, char *argv[]) int mavlink_thread_main(int argc, char *argv[])
{ {
/* initialize mavlink text message buffering */ /* initialize mavlink text message buffering */
usleep(1000);
mavlink_logbuffer_init(&lb, 10); mavlink_logbuffer_init(&lb, 10);
int ch; int ch;