aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-02-16 18:35:46 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-02-16 18:35:46 +0100
commit730916cd17648253a2f7c331baa8da0c74fdf6ef (patch)
tree6ff15f34bee65434a5219f97a9b3053bdefa2d99
parent598622a00f71fac330c7bc919382466cfa059601 (diff)
parent2d1009a89727582bc38093c67b930015cdbcc353 (diff)
downloadpx4-firmware-730916cd17648253a2f7c331baa8da0c74fdf6ef.tar.gz
px4-firmware-730916cd17648253a2f7c331baa8da0c74fdf6ef.tar.bz2
px4-firmware-730916cd17648253a2f7c331baa8da0c74fdf6ef.zip
Merge branch 'master' into px4io-i2c
-rwxr-xr-xROMFS/logging/logconv.m7
1 files changed, 3 insertions, 4 deletions
diff --git a/ROMFS/logging/logconv.m b/ROMFS/logging/logconv.m
index c405410de..5ea2aeb95 100755
--- a/ROMFS/logging/logconv.m
+++ b/ROMFS/logging/logconv.m
@@ -65,10 +65,9 @@ logFormat{17} = struct('name', 'rot_matrix', 'bytes', 4, 'array', 9, '
logFormat{18} = struct('name', 'vicon_position', 'bytes', 4, 'array', 6, 'precision', 'float', 'machineformat', 'ieee-le');
logFormat{19} = struct('name', 'actuator_control', 'bytes', 4, 'array', 4, 'precision', 'float', 'machineformat', 'ieee-le');
logFormat{20} = struct('name', 'optical_flow', 'bytes', 4, 'array', 6, 'precision', 'float', 'machineformat', 'ieee-le');
-logFormat{21} = struct('name', 'omnidirectional_flow', 'bytes', 4, 'array', 22,'precision', 'float', 'machineformat', 'ieee-le');
-logFormat{22} = struct('name', 'diff_pressure', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le');
-logFormat{23} = struct('name', 'ind_airspeed', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le');
-logFormat{24} = struct('name', 'true_airspeed', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le');
+logFormat{21} = struct('name', 'diff_pressure', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le');
+logFormat{22} = struct('name', 'ind_airspeed', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le');
+logFormat{23} = struct('name', 'true_airspeed', 'bytes', 4, 'array', 1, 'precision', 'float', 'machineformat', 'ieee-le');
% First get length of one line
columns = length(logFormat);