diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-21 15:32:59 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-21 15:32:59 +0100 |
| commit | 25e304c8691f2162b34cde46414f5b7f805cff67 (patch) | |
| tree | 3cdbd19f0b3280beee7f764173eb10634a454114 /ROMFS | |
| parent | ffda224b414204af7fb0a4f660f7b72ee013bcd2 (diff) | |
| download | px4-firmware-25e304c8691f2162b34cde46414f5b7f805cff67.tar.gz px4-firmware-25e304c8691f2162b34cde46414f5b7f805cff67.tar.bz2 px4-firmware-25e304c8691f2162b34cde46414f5b7f805cff67.zip | |
Added vicon, actuator controls effective and optical flow to logging
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/logging/logconv.m | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ROMFS/logging/logconv.m b/ROMFS/logging/logconv.m index 88bcfec96..48399f1eb 100644 --- a/ROMFS/logging/logconv.m +++ b/ROMFS/logging/logconv.m @@ -32,7 +32,7 @@ if exist(filePath, 'file') fileSize = fileInfo.bytes; fid = fopen(filePath, 'r'); - elements = int64(fileSize./(16*4+8))/4 + elements = int64(fileSize./(8+(3+3+3+1+1+1+4+8+1+3+3+3+3+9+6+4+6)*4)) for i=1:elements % timestamp @@ -79,6 +79,15 @@ if exist(filePath, 'file') % RotMatrix (9 channels) sensors(i,39:47) = fread(fid, 9, 'float', 0, 'ieee-le'); + + % vicon position (6 channels) + sensors(i,48:53) = fread(fid, 6, 'float', 0, 'ieee-le'); + + % actuator control effective (4 channels) + sensors(i,54:57) = fread(fid, 4, 'float', 0, 'ieee-le'); + + % optical flow (6 values) + sensors(i,58:63) = fread(fid, 6, 'float', 0, 'ieee-le'); end time_us = sensors(elements,1) - sensors(1,1); time_s = time_us*1e-6 |