rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/stac/logging_fixes' into revolution_sensors

Browse Source 
Conflicts:
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
This commit is contained in:
James Cotton 2011-12-14 10:38:05 -06:00
commit 4b6aab0513
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
View File

@ -635,6 +635,15 @@ int ScopeGadgetWidget::csvLoggingAddData()
ss << ", ";
if (plotData2->xData->isEmpty ())
{
ss << ", ";
if (plotData2->xData->isEmpty ())
{
}
else
{
ss << QString().sprintf("%3.6g",plotData2->yData->last());
m_csvLoggingDataValid=1;
}
}
else
{

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

@ -1,17 +1,8 @@
function [] = OPLogConvert()
function [] = OPLogConvert(logfile)
%% Define indices and arrays of structures to hold data
% THIS FILE IS AUTOMATICALLY GENERATED.
$(ALLOCATIONCODE)
%% Open log file
% [FileName,PathName,FilterIndex] = uigetfile('*.opl');
FileName='OP-2011-10-22_22-27-09.opl';
PathName='/Users/kenz/Movies/brisk_videos/rover_test_1/';
FilterIndex=1;
logfile = fullfile(PathName,FileName);
fid = fopen(logfile);
% Parse log file, entry by entry

3
ground/uavobjgenerator/generators/matlab/uavobjectgeneratormatlab.cpp
View File

@ -103,6 +103,9 @@ bool UAVObjectGeneratorMatlab::process_object(ObjectInfo* info)
}
else{
matlabAllocationCode.append("\t" + objectTableName + "=struct('timestamp', 0");
if (!info->isSingleInst) {
allocfields.append(",...\n\t\t 'instanceID', 0");
}
for (int n = 0; n < info->fields.length(); ++n) {
// Determine type
type = fieldTypeStrMatlab[info->fields[n]->type];