Restructuring sensor data folder

- Sensor data folder restructured to support multiple virtual sensors
- cleanup of lib folder files

signed-off-by: Ramasamy <ram.kannan@samsung.com>
Change-Id: I93c4623891800d58246559fe3fc432ca5777aa57

diff --git a/src/sensor_fusion/design/data/100ms/pitch/accel.txt b/src/sensor_fusion/design/data/100ms/orientation/pitch/accel.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/pitch/accel.txt
rename to src/sensor_fusion/design/data/100ms/orientation/pitch/accel.txt

diff --git a/src/sensor_fusion/design/data/100ms/pitch/gyro.txt b/src/sensor_fusion/design/data/100ms/orientation/pitch/gyro.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/pitch/gyro.txt
rename to src/sensor_fusion/design/data/100ms/orientation/pitch/gyro.txt

diff --git a/src/sensor_fusion/design/data/100ms/pitch/magnetic.txt b/src/sensor_fusion/design/data/100ms/orientation/pitch/magnetic.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/pitch/magnetic.txt
rename to src/sensor_fusion/design/data/100ms/orientation/pitch/magnetic.txt

diff --git a/src/sensor_fusion/design/data/100ms/roll/accel.txt b/src/sensor_fusion/design/data/100ms/orientation/roll/accel.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/roll/accel.txt
rename to src/sensor_fusion/design/data/100ms/orientation/roll/accel.txt

diff --git a/src/sensor_fusion/design/data/100ms/roll/gyro.txt b/src/sensor_fusion/design/data/100ms/orientation/roll/gyro.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/roll/gyro.txt
rename to src/sensor_fusion/design/data/100ms/orientation/roll/gyro.txt

diff --git a/src/sensor_fusion/design/data/100ms/roll/magnetic.txt b/src/sensor_fusion/design/data/100ms/orientation/roll/magnetic.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/roll/magnetic.txt
rename to src/sensor_fusion/design/data/100ms/orientation/roll/magnetic.txt

diff --git a/src/sensor_fusion/design/data/100ms/roll_pitch_yaw/accel.txt b/src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/accel.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/roll_pitch_yaw/accel.txt
rename to src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/accel.txt

diff --git a/src/sensor_fusion/design/data/100ms/roll_pitch_yaw/gyro.txt b/src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/gyro.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/roll_pitch_yaw/gyro.txt
rename to src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/gyro.txt

diff --git a/src/sensor_fusion/design/data/100ms/roll_pitch_yaw/magnetic.txt b/src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/magnetic.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/roll_pitch_yaw/magnetic.txt
rename to src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/magnetic.txt

diff --git a/src/sensor_fusion/design/data/100ms/yaw/accel.txt b/src/sensor_fusion/design/data/100ms/orientation/yaw/accel.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/yaw/accel.txt
rename to src/sensor_fusion/design/data/100ms/orientation/yaw/accel.txt

diff --git a/src/sensor_fusion/design/data/100ms/yaw/gyro.txt b/src/sensor_fusion/design/data/100ms/orientation/yaw/gyro.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/yaw/gyro.txt
rename to src/sensor_fusion/design/data/100ms/orientation/yaw/gyro.txt

diff --git a/src/sensor_fusion/design/data/100ms/yaw/magnetic.txt b/src/sensor_fusion/design/data/100ms/orientation/yaw/magnetic.txt
similarity index 100%
rename from src/sensor_fusion/design/data/100ms/yaw/magnetic.txt
rename to src/sensor_fusion/design/data/100ms/orientation/yaw/magnetic.txt

diff --git a/src/sensor_fusion/design/lib/quat2euler.m b/src/sensor_fusion/design/lib/quat2euler.m
index 16e46b3..f788ea4 100755 (executable)
--- a/src/sensor_fusion/design/lib/quat2euler.m
+++ b/src/sensor_fusion/design/lib/quat2euler.m
@@ -1,5 +1,5 @@
 function euler = quat2euler(q)
-% Quat2Euler
+% quat2euler
 %
 % Copyright (c) 2014 Samsung Electronics Co., Ltd.
 %

diff --git a/src/sensor_fusion/design/lib/quat2rot_mat.m b/src/sensor_fusion/design/lib/quat2rot_mat.m
index bb11d08..62db364 100755 (executable)
--- a/src/sensor_fusion/design/lib/quat2rot_mat.m
+++ b/src/sensor_fusion/design/lib/quat2rot_mat.m
@@ -1,5 +1,5 @@
 function R = quat2rot_mat(q)
-% Quat2RotMat
+% quat2rot_mat
 %
 % Copyright (c) 2014 Samsung Electronics Co., Ltd.
 %

diff --git a/src/sensor_fusion/design/lib/quat_prod.m b/src/sensor_fusion/design/lib/quat_prod.m
index 40d2c57..21a48dc 100755 (executable)
--- a/src/sensor_fusion/design/lib/quat_prod.m
+++ b/src/sensor_fusion/design/lib/quat_prod.m
@@ -1,5 +1,5 @@
 function ab = quat_prod(a, b)
-% QuatProd
+% quat_prod
 %
 % Copyright (c) 2014 Samsung Electronics Co., Ltd.
 %

diff --git a/src/sensor_fusion/design/lib/rot_mat2quat.m b/src/sensor_fusion/design/lib/rot_mat2quat.m
index dcc3410..53ad96c 100755 (executable)
--- a/src/sensor_fusion/design/lib/rot_mat2quat.m
+++ b/src/sensor_fusion/design/lib/rot_mat2quat.m
@@ -1,5 +1,5 @@
 function q = rot_mat2quat(R)
-% RotMat2Quat
+% rot_mat2quat
 %
 % Copyright (c) 2014 Samsung Electronics Co., Ltd.
 %

diff --git a/src/sensor_fusion/design/sf_orientation.m b/src/sensor_fusion/design/sf_orientation.m
index 44ec7d8..d1c927c 100755 (executable)
--- a/src/sensor_fusion/design/sf_orientation.m
+++ b/src/sensor_fusion/design/sf_orientation.m
@@ -52,16 +52,16 @@ OR_err = zeros(3,BUFFER_SIZE);
 % Sensor Data simulating orientation motions
 
 % get accel x,y,z axis data from stored file
-Accel_data(1,:) = (((dlmread("data/100ms/roll_pitch_yaw/accel.txt")(:,1))') - Bias_Ax)(1:BUFFER_SIZE);
-Accel_data(2,:) = (((dlmread("data/100ms/roll_pitch_yaw/accel.txt")(:,2))') - Bias_Ay)(1:BUFFER_SIZE);
-Accel_data(3,:) = (((dlmread("data/100ms/roll_pitch_yaw/accel.txt")(:,3))') - Bias_Az)(1:BUFFER_SIZE);
-Accel_data(4,:) = ((dlmread("data/100ms/roll_pitch_yaw/accel.txt")(:,4))')(1:BUFFER_SIZE);
+Accel_data(1,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/accel.txt")(:,1))') - Bias_Ax)(1:BUFFER_SIZE);
+Accel_data(2,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/accel.txt")(:,2))') - Bias_Ay)(1:BUFFER_SIZE);
+Accel_data(3,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/accel.txt")(:,3))') - Bias_Az)(1:BUFFER_SIZE);
+Accel_data(4,:) = ((dlmread("data/100ms/orientation/roll_pitch_yaw/accel.txt")(:,4))')(1:BUFFER_SIZE);
 
 % get gyro x,y,z axis data from stored file
-Gyro_data(1,:) = (((dlmread("data/100ms/roll_pitch_yaw/gyro.txt")(:,1))') - Bias_Gx)(1:BUFFER_SIZE);
-Gyro_data(2,:) = (((dlmread("data/100ms/roll_pitch_yaw/gyro.txt")(:,2))') - Bias_Gy)(1:BUFFER_SIZE);
-Gyro_data(3,:) = (((dlmread("data/100ms/roll_pitch_yaw/gyro.txt")(:,3))') - Bias_Gz)(1:BUFFER_SIZE);
-Gyro_data(4,:) = ((dlmread("data/100ms/roll_pitch_yaw/gyro.txt")(:,4))')(1:BUFFER_SIZE);
+Gyro_data(1,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/gyro.txt")(:,1))') - Bias_Gx)(1:BUFFER_SIZE);
+Gyro_data(2,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/gyro.txt")(:,2))') - Bias_Gy)(1:BUFFER_SIZE);
+Gyro_data(3,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/gyro.txt")(:,3))') - Bias_Gz)(1:BUFFER_SIZE);
+Gyro_data(4,:) = ((dlmread("data/100ms/orientation/roll_pitch_yaw/gyro.txt")(:,4))')(1:BUFFER_SIZE);
 
 scale_Gyro = 575;
 Gyro_data(1,:) = Gyro_data(1,:)/scale_Gyro;
@@ -69,10 +69,10 @@ Gyro_data(2,:) = Gyro_data(2,:)/scale_Gyro;
 Gyro_data(3,:) = Gyro_data(3,:)/scale_Gyro;
 
 % get magnetometer x,y,z axis data from stored file
-Mag_data(1,:) = (((dlmread("data/100ms/roll_pitch_yaw/magnetic.txt")(:,1))'))(1:BUFFER_SIZE);
-Mag_data(2,:) = (((dlmread("data/100ms/roll_pitch_yaw/magnetic.txt")(:,2))'))(1:BUFFER_SIZE);
-Mag_data(3,:) = (((dlmread("data/100ms/roll_pitch_yaw/magnetic.txt")(:,3))'))(1:BUFFER_SIZE);
-Mag_data(4,:) = ((dlmread("data/100ms/roll_pitch_yaw/magnetic.txt")(:,4))')(1:BUFFER_SIZE);
+Mag_data(1,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/magnetic.txt")(:,1))'))(1:BUFFER_SIZE);
+Mag_data(2,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/magnetic.txt")(:,2))'))(1:BUFFER_SIZE);
+Mag_data(3,:) = (((dlmread("data/100ms/orientation/roll_pitch_yaw/magnetic.txt")(:,3))'))(1:BUFFER_SIZE);
+Mag_data(4,:) = ((dlmread("data/100ms/orientation/roll_pitch_yaw/magnetic.txt")(:,4))')(1:BUFFER_SIZE);
 
 % estimate orientation
 [OR_driv, OR_aid, OR_err]  = estimate_orientation(Accel_data, Gyro_data, Mag_data);