rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next

Browse Source
This commit is contained in:
PT_Dreamer 2012-09-21 18:56:21 +01:00
commit 738cc44930
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/plugins.pro
View File

@ -174,6 +174,7 @@ plugin_logging.subdir = logging
plugin_logging.depends = plugin_coreplugin plugin_logging.depends = plugin_coreplugin
plugin_logging.depends += plugin_uavobjects plugin_logging.depends += plugin_uavobjects
plugin_logging.depends += plugin_uavtalk plugin_logging.depends += plugin_uavtalk
plugin_logging.depends += plugin_scope
SUBDIRS += plugin_logging SUBDIRS += plugin_logging
#GCS Control of UAV gadget #GCS Control of UAV gadget
@ -217,6 +218,7 @@ SUBDIRS += plugin_uavsettingsimportexport
plugin_uavobjectwidgetutils.subdir = uavobjectwidgetutils plugin_uavobjectwidgetutils.subdir = uavobjectwidgetutils
plugin_uavobjectwidgetutils.depends = plugin_coreplugin plugin_uavobjectwidgetutils.depends = plugin_coreplugin
plugin_uavobjectwidgetutils.depends += plugin_uavobjects plugin_uavobjectwidgetutils.depends += plugin_uavobjects
plugin_uavobjectwidgetutils.depends += plugin_uavobjectutil
plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport
SUBDIRS += plugin_uavobjectwidgetutils SUBDIRS += plugin_uavobjectwidgetutils

2
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
View File

@ -126,7 +126,7 @@ $(SWITCHCODE)
if msgBytesLeft > 255 if msgBytesLeft > 255
msgBytesLeft = 0; msgBytesLeft = 0;
end end
bufferIdx=bufferIdx+msgBytesLeft; bufferIdx=bufferIdx+double(msgBytesLeft);
end end
catch catch
% One of the reads failed - indicates EOF % One of the reads failed - indicates EOF