From 64d8f64ea725f26465dd4ab8971536410f9d6fb1 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 20 Sep 2012 15:28:47 -0500 Subject: [PATCH 1/2] Matlab parser: small fix from Kenz --- ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m b/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m index 29ea1e084..0b4e50950 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m @@ -126,7 +126,7 @@ $(SWITCHCODE) if msgBytesLeft > 255 msgBytesLeft = 0; end - bufferIdx=bufferIdx+msgBytesLeft; + bufferIdx=bufferIdx+double(msgBytesLeft); end catch % One of the reads failed - indicates EOF From aff29b5af544cd6f2b78ed927b861d1dceec33f4 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 20 Sep 2012 15:55:16 -0500 Subject: [PATCH 2/2] GCS: Add some plugin dependencies. Thanks to Amedee for finding these. --- ground/openpilotgcs/src/plugins/plugins.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/plugins.pro b/ground/openpilotgcs/src/plugins/plugins.pro index fcd84239d..f28dc17c1 100644 --- a/ground/openpilotgcs/src/plugins/plugins.pro +++ b/ground/openpilotgcs/src/plugins/plugins.pro @@ -174,6 +174,7 @@ plugin_logging.subdir = logging plugin_logging.depends = plugin_coreplugin plugin_logging.depends += plugin_uavobjects plugin_logging.depends += plugin_uavtalk +plugin_logging.depends += plugin_scope SUBDIRS += plugin_logging #GCS Control of UAV gadget @@ -217,6 +218,7 @@ SUBDIRS += plugin_uavsettingsimportexport plugin_uavobjectwidgetutils.subdir = uavobjectwidgetutils plugin_uavobjectwidgetutils.depends = plugin_coreplugin plugin_uavobjectwidgetutils.depends += plugin_uavobjects +plugin_uavobjectwidgetutils.depends += plugin_uavobjectutil plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport SUBDIRS += plugin_uavobjectwidgetutils