diff --git a/processall.m b/processall.m index 5e20280f64467cf77d64c0611941a6356168ba94..ba46c5a8d88928a979f0bf3165e87451fc9867f0 100644 --- a/processall.m +++ b/processall.m @@ -64,11 +64,11 @@ function ExpData = processall(idFile) [arduShort, ~] = loadardu(ExpData(iTest).arduFile); % DEBUG - figure; - hold on; - plot(tunnelData(:, 1)); - plot(tunnelData(:, 3)); - grid on; + % figure; + % hold on; + % plot(tunnelData(:, 1)); + % plot(tunnelData(:, 3)); + % grid on; [arduShort, tunnelData, ExpData(iTest).arduStart, ExpData(iTest).tunnelStart] = ... syncdata(arduShort, tunnelData); @@ -77,6 +77,7 @@ function ExpData = processall(idFile) ExpData(iTest).time = arduShort(:, 1); ExpData(iTest).Front.angles = arduShort(:, 2); ExpData(iTest).Front.power = arduShort(:, 4); + ExpData(iTest).Aft.angles = arduShort(:, 3); ExpData(iTest).Aft.power = arduShort(:, 5); else @@ -108,7 +109,12 @@ function ExpData = processall(idFile) ExpData(iTest).Testcase.press = idTable(iTest, :).pres_air; if PLOT_CLEANED - plottime(ExpData(iTest), 'arduShort', false); + figure; + hold on; + plot(ExpData(iTest).Front.angles); + yyaxis right; + plot(ExpData(iTest).Front.forces(:, 3)); + end % Save the cleaned data diff --git a/resultsanalysis.m b/resultsanalysis.m index 14dc9fb6bff5871fda9fca06eb76f3cd613f2d5a..d8b87aa8c055466049edae858de0ddacfddd24fd 100644 --- a/resultsanalysis.m +++ b/resultsanalysis.m @@ -33,9 +33,10 @@ function ResData = resultsanalysis(matFiles) end % Remove useless data ResData = rmfield(ResData, {'arduStart', 'tunnelStart'}); % Useless + % FIXME: remove deprecated ResData = rmfield(ResData, {'arduFile', 'tunnelFile', ... - 'dx', 'airspeed', 'freq', 'front', 'aft'}); + 'dx', 'airspeed', 'freq'}); % Cache values to prevent excessive reloads matFiles_ = matFiles;