From cd1123aea0257b0fb77b7d29aa622a5d9b6781fe Mon Sep 17 00:00:00 2001 From: Adarsh Shree Ram Date: Thu, 22 Oct 2015 12:21:19 +0530 Subject: [PATCH] Restructuring the sensord framework codebase The codebase is segregated into 4 directories :libsensord,server,shared and plugins .The plugins directory contains all the sensor plugins under one folder. Changes: Moved all individual sensor folders into a single folder plugins/ Moved sensor_event definitions files from libsensord(client) to shared as they are being used by plugins/server/client Change-Id: I42900352c7068cf9fde188a83c92580c62274168 --- src/CMakeLists.txt | 37 +++++++++++---------- src/libsensord/CMakeLists.txt | 25 +------------- src/{ => plugins}/accel/CMakeLists.txt | 0 src/{ => plugins}/accel/accel_sensor.cpp | 0 src/{ => plugins}/accel/accel_sensor.h | 0 src/{ => plugins}/accel/accel_sensor_hal.cpp | 0 src/{ => plugins}/accel/accel_sensor_hal.h | 0 src/{ => plugins}/auto_rotation/CMakeLists.txt | 0 .../auto_rotation/auto_rotation_alg.cpp | 0 .../auto_rotation/auto_rotation_alg.h | 0 .../auto_rotation/auto_rotation_alg_emul.cpp | 0 .../auto_rotation/auto_rotation_alg_emul.h | 0 .../auto_rotation/auto_rotation_sensor.cpp | 0 .../auto_rotation/auto_rotation_sensor.h | 0 src/{ => plugins}/bio_led_red/CMakeLists.txt | 0 .../bio_led_red/bio_led_red_sensor.cpp | 0 src/{ => plugins}/bio_led_red/bio_led_red_sensor.h | 0 .../bio_led_red/bio_led_red_sensor_hal.cpp | 0 .../bio_led_red/bio_led_red_sensor_hal.h | 0 src/{ => plugins}/fusion/CMakeLists.txt | 2 +- src/{ => plugins}/fusion/fusion_sensor.cpp | 0 src/{ => plugins}/fusion/fusion_sensor.h | 0 .../fusion/hardware_fusion_sensor.html | 0 src/{ => plugins}/geo/CMakeLists.txt | 0 src/{ => plugins}/geo/geo_sensor.cpp | 0 src/{ => plugins}/geo/geo_sensor.h | 0 src/{ => plugins}/geo/geo_sensor_hal.cpp | 0 src/{ => plugins}/geo/geo_sensor_hal.h | 0 src/{ => plugins}/gravity/CMakeLists.txt | 2 +- src/{ => plugins}/gravity/gravity_sensor.cpp | 0 src/{ => plugins}/gravity/gravity_sensor.h | 0 src/{ => plugins}/gyro/CMakeLists.txt | 0 src/{ => plugins}/gyro/gyro_sensor.cpp | 0 src/{ => plugins}/gyro/gyro_sensor.h | 0 src/{ => plugins}/gyro/gyro_sensor_hal.cpp | 0 src/{ => plugins}/gyro/gyro_sensor_hal.h | 0 src/{ => plugins}/light/CMakeLists.txt | 0 src/{ => plugins}/light/light_sensor.cpp | 0 src/{ => plugins}/light/light_sensor.h | 0 src/{ => plugins}/light/light_sensor_hal.cpp | 0 src/{ => plugins}/light/light_sensor_hal.h | 0 src/{ => plugins}/linear_accel/CMakeLists.txt | 2 +- .../linear_accel/linear_accel_sensor.cpp | 0 .../linear_accel/linear_accel_sensor.h | 0 src/{ => plugins}/orientation/CMakeLists.txt | 2 +- .../orientation/orientation_sensor.cpp | 0 src/{ => plugins}/orientation/orientation_sensor.h | 0 src/{ => plugins}/pressure/CMakeLists.txt | 0 src/{ => plugins}/pressure/pressure_sensor.cpp | 0 src/{ => plugins}/pressure/pressure_sensor.h | 0 src/{ => plugins}/pressure/pressure_sensor_hal.cpp | 0 src/{ => plugins}/pressure/pressure_sensor_hal.h | 0 src/{ => plugins}/proxi/CMakeLists.txt | 0 src/{ => plugins}/proxi/proxi_sensor.cpp | 0 src/{ => plugins}/proxi/proxi_sensor.h | 0 src/{ => plugins}/proxi/proxi_sensor_hal.cpp | 0 src/{ => plugins}/proxi/proxi_sensor_hal.h | 0 src/{ => plugins}/rotation_vector/CMakeLists.txt | 0 .../rotation_vector/gaming_rv/CMakeLists.txt | 2 +- .../rotation_vector/gaming_rv/gaming_rv_sensor.cpp | 0 .../rotation_vector/gaming_rv/gaming_rv_sensor.h | 0 .../rotation_vector/geomagnetic_rv/CMakeLists.txt | 2 +- .../geomagnetic_rv/geomagnetic_rv_sensor.cpp | 0 .../geomagnetic_rv/geomagnetic_rv_sensor.h | 0 .../rotation_vector/rv/CMakeLists.txt | 2 +- src/{ => plugins}/rotation_vector/rv/rv_sensor.cpp | 0 src/{ => plugins}/rotation_vector/rv/rv_sensor.h | 0 .../rotation_vector/rv_raw/CMakeLists.txt | 0 .../rotation_vector/rv_raw/rv_raw_sensor.cpp | 0 .../rotation_vector/rv_raw/rv_raw_sensor.h | 0 .../rotation_vector/rv_raw/rv_raw_sensor_hal.cpp | 0 .../rotation_vector/rv_raw/rv_raw_sensor_hal.h | 0 src/{ => plugins}/sensor_fusion/CMakeLists.txt | 0 .../data/100ms/gravity/single_roll_throw/accel.txt | 0 .../data/100ms/gravity/single_roll_throw/gyro.txt | 0 .../100ms/gravity/single_roll_throw/magnetic.txt | 0 .../100ms/linear_acceleration/move_x_y_z/accel.txt | 0 .../100ms/linear_acceleration/move_x_y_z/gyro.txt | 0 .../linear_acceleration/move_x_y_z/magnetic.txt | 0 .../100ms/orientation/roll_pitch_yaw/accel.txt | 0 .../data/100ms/orientation/roll_pitch_yaw/gyro.txt | 0 .../100ms/orientation/roll_pitch_yaw/magnetic.txt | 0 .../data/25ms/pedo/Climb_stairs_down/In_hand/accel | 0 .../data/25ms/pedo/Climb_stairs_down/In_hand/gyro | 0 .../25ms/pedo/Climb_stairs_down/In_hand/magnetic | 0 .../25ms/pedo/Climb_stairs_down/Pant_pocket/accel | 0 .../25ms/pedo/Climb_stairs_down/Pant_pocket/gyro | 0 .../pedo/Climb_stairs_down/Pant_pocket/magnetic | 0 .../25ms/pedo/Climb_stairs_down/Shirt_pocket/accel | 0 .../25ms/pedo/Climb_stairs_down/Shirt_pocket/gyro | 0 .../pedo/Climb_stairs_down/Shirt_pocket/magnetic | 0 .../pedo/Climb_stairs_down/While_talking/accel | 0 .../25ms/pedo/Climb_stairs_down/While_talking/gyro | 0 .../pedo/Climb_stairs_down/While_talking/magnetic | 0 .../data/25ms/pedo/Climb_stairs_up/In_hand/accel | 0 .../data/25ms/pedo/Climb_stairs_up/In_hand/gyro | 0 .../25ms/pedo/Climb_stairs_up/In_hand/magnetic | 0 .../25ms/pedo/Climb_stairs_up/Pant_pocket/accel | 0 .../25ms/pedo/Climb_stairs_up/Pant_pocket/gyro | 0 .../25ms/pedo/Climb_stairs_up/Pant_pocket/magnetic | 0 .../25ms/pedo/Climb_stairs_up/Shirt_pocket/accel | 0 .../25ms/pedo/Climb_stairs_up/Shirt_pocket/gyro | 0 .../pedo/Climb_stairs_up/Shirt_pocket/magnetic | 0 .../25ms/pedo/Climb_stairs_up/While_talking/accel | 0 .../25ms/pedo/Climb_stairs_up/While_talking/gyro | 0 .../pedo/Climb_stairs_up/While_talking/magnetic | 0 .../design/data/25ms/pedo/Walk_fast/In_hand/accel | 0 .../design/data/25ms/pedo/Walk_fast/In_hand/gyro | 0 .../data/25ms/pedo/Walk_fast/In_hand/magnetic | 0 .../data/25ms/pedo/Walk_fast/Pant_pocket/accel | 0 .../data/25ms/pedo/Walk_fast/Pant_pocket/gyro | 0 .../data/25ms/pedo/Walk_fast/Pant_pocket/magnetic | 0 .../data/25ms/pedo/Walk_fast/Shirt_pocket/accel | 0 .../data/25ms/pedo/Walk_fast/Shirt_pocket/gyro | 0 .../data/25ms/pedo/Walk_fast/Shirt_pocket/magnetic | 0 .../data/25ms/pedo/Walk_fast/While_talking/accel | 0 .../data/25ms/pedo/Walk_fast/While_talking/gyro | 0 .../25ms/pedo/Walk_fast/While_talking/magnetic | 0 .../design/data/25ms/pedo/Walk_slow/In_hand/accel | 0 .../design/data/25ms/pedo/Walk_slow/In_hand/gyro | 0 .../data/25ms/pedo/Walk_slow/In_hand/magnetic | 0 .../data/25ms/pedo/Walk_slow/Pant_pocket/accel | 0 .../data/25ms/pedo/Walk_slow/Pant_pocket/gyro | 0 .../data/25ms/pedo/Walk_slow/Pant_pocket/magnetic | 0 .../data/25ms/pedo/Walk_slow/Shirt_pocket/accel | 0 .../data/25ms/pedo/Walk_slow/Shirt_pocket/gyro | 0 .../data/25ms/pedo/Walk_slow/Shirt_pocket/magnetic | 0 .../data/25ms/pedo/Walk_slow/While_talking/accel | 0 .../data/25ms/pedo/Walk_slow/While_talking/gyro | 0 .../25ms/pedo/Walk_slow/While_talking/magnetic | 0 ...ock_diagram_gravity_and_linear_acceleration.png | Bin .../block_diagram_orientation_estimation.png | Bin .../documentation/diagram/device_orientation.png | Bin .../documentation/diagram/kalman_filter_stages.png | Bin .../diagram/orientation_effect_on_gravity.png | Bin .../projection_diagram_gravity_computation.png | Bin .../design/documentation/equation/equation_1.png | Bin .../design/documentation/equation/equation_10.png | Bin .../design/documentation/equation/equation_11.png | Bin .../design/documentation/equation/equation_12.png | Bin .../design/documentation/equation/equation_13.png | Bin .../documentation/equation/equation_13_updated.png | Bin .../design/documentation/equation/equation_14.png | Bin .../design/documentation/equation/equation_15.png | Bin .../design/documentation/equation/equation_16.png | Bin .../design/documentation/equation/equation_17.png | Bin .../design/documentation/equation/equation_18.png | Bin .../design/documentation/equation/equation_19.png | Bin .../design/documentation/equation/equation_2.png | Bin .../design/documentation/equation/equation_20.png | Bin .../design/documentation/equation/equation_21.png | Bin .../design/documentation/equation/equation_22.png | Bin .../design/documentation/equation/equation_23.png | Bin .../design/documentation/equation/equation_24.png | Bin .../design/documentation/equation/equation_25.png | Bin .../design/documentation/equation/equation_26.png | Bin .../design/documentation/equation/equation_27.png | Bin .../design/documentation/equation/equation_28.png | Bin .../design/documentation/equation/equation_29.png | Bin .../design/documentation/equation/equation_3.png | Bin .../design/documentation/equation/equation_30.png | Bin .../design/documentation/equation/equation_31.png | Bin .../design/documentation/equation/equation_32.png | Bin .../design/documentation/equation/equation_33.png | Bin .../design/documentation/equation/equation_34.png | Bin .../design/documentation/equation/equation_35.png | Bin .../design/documentation/equation/equation_36.png | Bin .../design/documentation/equation/equation_37.png | Bin .../design/documentation/equation/equation_38.png | Bin .../design/documentation/equation/equation_39.png | Bin .../design/documentation/equation/equation_4.png | Bin .../design/documentation/equation/equation_40.png | Bin .../design/documentation/equation/equation_5.png | Bin .../design/documentation/equation/equation_6.png | Bin .../design/documentation/equation/equation_7.png | Bin .../design/documentation/equation/equation_8.png | Bin .../design/documentation/equation/equation_9.png | Bin .../design/documentation/sensor_fusion.htm | 0 .../sensor_fusion/design/lib/axis_rot2quat.m | 0 .../sensor_fusion/design/lib/estimate_gaming_rv.m | 0 .../design/lib/estimate_geomagnetic_rv.m | 0 .../sensor_fusion/design/lib/estimate_gravity.m | 0 .../design/lib/estimate_linear_acceleration.m | 0 .../design/lib/estimate_orientation.m | 0 .../sensor_fusion/design/lib/euler2quat.m | 0 .../sensor_fusion/design/lib/quat2euler.m | 0 .../sensor_fusion/design/lib/quat2rot_mat.m | 0 .../sensor_fusion/design/lib/quat_prod.m | 0 .../sensor_fusion/design/lib/rot_mat2quat.m | 0 .../sensor_fusion/design/lib/sf_pedometer.m | 0 src/{ => plugins}/sensor_fusion/design/readme | 0 .../sensor_fusion/design/sf_gaming_rv.m | 0 .../sensor_fusion/design/sf_geomagnetic_rv.m | 0 .../sensor_fusion/design/sf_gravity.m | 0 .../sensor_fusion/design/sf_linear_acceleration.m | 0 .../sensor_fusion/design/sf_orientation.m | 0 src/{ => plugins}/sensor_fusion/euler_angles.cpp | 0 src/{ => plugins}/sensor_fusion/euler_angles.h | 0 src/{ => plugins}/sensor_fusion/matrix.cpp | 0 src/{ => plugins}/sensor_fusion/matrix.h | 0 .../sensor_fusion/orientation_filter.cpp | 0 .../sensor_fusion/orientation_filter.h | 0 src/{ => plugins}/sensor_fusion/quaternion.cpp | 0 src/{ => plugins}/sensor_fusion/quaternion.h | 0 .../sensor_fusion/rotation_matrix.cpp | 0 src/{ => plugins}/sensor_fusion/rotation_matrix.h | 0 src/{ => plugins}/sensor_fusion/sensor_data.cpp | 0 src/{ => plugins}/sensor_fusion/sensor_data.h | 0 .../sensor_fusion/test/gravity_sensor.cpp | 0 .../sensor_fusion/test/gravity_sensor.h | 0 .../test/linear_acceleration_sensor.cpp | 0 .../test/linear_acceleration_sensor.h | 0 .../sensor_fusion/test/orientation_sensor.cpp | 0 .../sensor_fusion/test/orientation_sensor.h | 0 .../test/test_projects/euler_angles_test/.cproject | 0 .../test/test_projects/euler_angles_test/.project | 0 .../euler_angles_test/euler_angles_main.cpp | 0 .../test_projects/gravity_sensor_test/.cproject | 0 .../test_projects/gravity_sensor_test/.project | 0 .../gravity_sensor_test/gravity_sensor_main.cpp | 0 .../linear_acceleration_sensor_test/.cproject | 0 .../linear_acceleration_sensor_test/.project | 0 .../linear_acceleration_sensor_main.cpp | 0 .../test/test_projects/matrix_test/.cproject | 0 .../test/test_projects/matrix_test/.project | 0 .../test/test_projects/matrix_test/matrix_main.cpp | 0 .../orientation_sensor_test/.cproject | 0 .../test_projects/orientation_sensor_test/.project | 0 .../orientation_sensor_main.cpp | 0 .../test/test_projects/quaternion_test/.cproject | 0 .../test/test_projects/quaternion_test/.project | 0 .../quaternion_test/quaternion_main.cpp | 0 .../test_projects/rotation_matrix_test/.cproject | 0 .../test_projects/rotation_matrix_test/.project | 0 .../rotation_matrix_test/rotation_matrix_main.cpp | 0 .../test/test_projects/sensor_data_test/.cproject | 0 .../test/test_projects/sensor_data_test/.project | 0 .../sensor_data_test/sensor_data_main.cpp | 0 .../test/test_projects/vector_test/.cproject | 0 .../test/test_projects/vector_test/.project | 0 .../test/test_projects/vector_test/vector_main.cpp | 0 src/{ => plugins}/sensor_fusion/vector.cpp | 0 src/{ => plugins}/sensor_fusion/vector.h | 0 src/{ => plugins}/temperature/CMakeLists.txt | 0 .../temperature/temperature_sensor.cpp | 0 src/{ => plugins}/temperature/temperature_sensor.h | 0 .../temperature/temperature_sensor_hal.cpp | 0 .../temperature/temperature_sensor_hal.h | 0 src/{ => plugins}/tilt/CMakeLists.txt | 2 +- src/{ => plugins}/tilt/tilt_sensor.cpp | 0 src/{ => plugins}/tilt/tilt_sensor.h | 0 src/{ => plugins}/ultraviolet/CMakeLists.txt | 0 .../ultraviolet/ultraviolet_sensor.cpp | 0 src/{ => plugins}/ultraviolet/ultraviolet_sensor.h | 0 .../ultraviolet/ultraviolet_sensor_hal.cpp | 0 .../ultraviolet/ultraviolet_sensor_hal.h | 0 src/{ => plugins}/uncal_gyro/CMakeLists.txt | 2 +- src/{ => plugins}/uncal_gyro/uncal_gyro_sensor.cpp | 0 src/{ => plugins}/uncal_gyro/uncal_gyro_sensor.h | 0 src/shared/CMakeLists.txt | 24 +++++++++++++ src/{libsensord => shared}/sensor_accel.h | 0 src/{libsensord => shared}/sensor_auto_rotation.h | 0 src/{libsensord => shared}/sensor_bio_led_red.h | 0 src/{libsensord => shared}/sensor_context.h | 0 src/{libsensord => shared}/sensor_deprecated.h | 0 src/{libsensord => shared}/sensor_fusion.h | 0 src/{libsensord => shared}/sensor_gaming_rv.h | 0 src/{libsensord => shared}/sensor_geomag.h | 0 src/{libsensord => shared}/sensor_geomagnetic_rv.h | 0 src/{libsensord => shared}/sensor_gravity.h | 0 src/{libsensord => shared}/sensor_gyro.h | 0 src/{libsensord => shared}/sensor_internal.h | 0 .../sensor_internal_deprecated.h | 0 src/{libsensord => shared}/sensor_light.h | 0 src/{libsensord => shared}/sensor_linear_accel.h | 0 src/{libsensord => shared}/sensor_motion.h | 0 src/{libsensord => shared}/sensor_orientation.h | 0 src/{libsensord => shared}/sensor_pressure.h | 0 src/{libsensord => shared}/sensor_proxi.h | 0 src/{libsensord => shared}/sensor_rv.h | 0 src/{libsensord => shared}/sensor_temperature.h | 0 src/{libsensord => shared}/sensor_tilt.h | 0 src/{libsensord => shared}/sensor_ultraviolet.h | 0 src/{libsensord => shared}/sensor_uncal_gyro.h | 0 284 files changed, 53 insertions(+), 51 deletions(-) rename src/{ => plugins}/accel/CMakeLists.txt (100%) rename src/{ => plugins}/accel/accel_sensor.cpp (100%) rename src/{ => plugins}/accel/accel_sensor.h (100%) rename src/{ => plugins}/accel/accel_sensor_hal.cpp (100%) rename src/{ => plugins}/accel/accel_sensor_hal.h (100%) rename src/{ => plugins}/auto_rotation/CMakeLists.txt (100%) rename src/{ => plugins}/auto_rotation/auto_rotation_alg.cpp (100%) rename src/{ => plugins}/auto_rotation/auto_rotation_alg.h (100%) rename src/{ => plugins}/auto_rotation/auto_rotation_alg_emul.cpp (100%) rename src/{ => plugins}/auto_rotation/auto_rotation_alg_emul.h (100%) rename src/{ => plugins}/auto_rotation/auto_rotation_sensor.cpp (100%) rename src/{ => plugins}/auto_rotation/auto_rotation_sensor.h (100%) rename src/{ => plugins}/bio_led_red/CMakeLists.txt (100%) rename src/{ => plugins}/bio_led_red/bio_led_red_sensor.cpp (100%) rename src/{ => plugins}/bio_led_red/bio_led_red_sensor.h (100%) rename src/{ => plugins}/bio_led_red/bio_led_red_sensor_hal.cpp (100%) rename src/{ => plugins}/bio_led_red/bio_led_red_sensor_hal.h (100%) rename src/{ => plugins}/fusion/CMakeLists.txt (90%) rename src/{ => plugins}/fusion/fusion_sensor.cpp (100%) rename src/{ => plugins}/fusion/fusion_sensor.h (100%) rename src/{ => plugins}/fusion/hardware_fusion_sensor.html (100%) rename src/{ => plugins}/geo/CMakeLists.txt (100%) rename src/{ => plugins}/geo/geo_sensor.cpp (100%) rename src/{ => plugins}/geo/geo_sensor.h (100%) rename src/{ => plugins}/geo/geo_sensor_hal.cpp (100%) rename src/{ => plugins}/geo/geo_sensor_hal.h (100%) rename src/{ => plugins}/gravity/CMakeLists.txt (90%) rename src/{ => plugins}/gravity/gravity_sensor.cpp (100%) rename src/{ => plugins}/gravity/gravity_sensor.h (100%) rename src/{ => plugins}/gyro/CMakeLists.txt (100%) rename src/{ => plugins}/gyro/gyro_sensor.cpp (100%) rename src/{ => plugins}/gyro/gyro_sensor.h (100%) rename src/{ => plugins}/gyro/gyro_sensor_hal.cpp (100%) rename src/{ => plugins}/gyro/gyro_sensor_hal.h (100%) rename src/{ => plugins}/light/CMakeLists.txt (100%) rename src/{ => plugins}/light/light_sensor.cpp (100%) rename src/{ => plugins}/light/light_sensor.h (100%) rename src/{ => plugins}/light/light_sensor_hal.cpp (100%) rename src/{ => plugins}/light/light_sensor_hal.h (100%) rename src/{ => plugins}/linear_accel/CMakeLists.txt (90%) rename src/{ => plugins}/linear_accel/linear_accel_sensor.cpp (100%) rename src/{ => plugins}/linear_accel/linear_accel_sensor.h (100%) rename src/{ => plugins}/orientation/CMakeLists.txt (90%) rename src/{ => plugins}/orientation/orientation_sensor.cpp (100%) rename src/{ => plugins}/orientation/orientation_sensor.h (100%) rename src/{ => plugins}/pressure/CMakeLists.txt (100%) rename src/{ => plugins}/pressure/pressure_sensor.cpp (100%) rename src/{ => plugins}/pressure/pressure_sensor.h (100%) rename src/{ => plugins}/pressure/pressure_sensor_hal.cpp (100%) rename src/{ => plugins}/pressure/pressure_sensor_hal.h (100%) rename src/{ => plugins}/proxi/CMakeLists.txt (100%) rename src/{ => plugins}/proxi/proxi_sensor.cpp (100%) rename src/{ => plugins}/proxi/proxi_sensor.h (100%) rename src/{ => plugins}/proxi/proxi_sensor_hal.cpp (100%) rename src/{ => plugins}/proxi/proxi_sensor_hal.h (100%) rename src/{ => plugins}/rotation_vector/CMakeLists.txt (100%) rename src/{ => plugins}/rotation_vector/gaming_rv/CMakeLists.txt (90%) rename src/{ => plugins}/rotation_vector/gaming_rv/gaming_rv_sensor.cpp (100%) rename src/{ => plugins}/rotation_vector/gaming_rv/gaming_rv_sensor.h (100%) rename src/{ => plugins}/rotation_vector/geomagnetic_rv/CMakeLists.txt (90%) rename src/{ => plugins}/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp (100%) rename src/{ => plugins}/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.h (100%) rename src/{ => plugins}/rotation_vector/rv/CMakeLists.txt (89%) rename src/{ => plugins}/rotation_vector/rv/rv_sensor.cpp (100%) rename src/{ => plugins}/rotation_vector/rv/rv_sensor.h (100%) rename src/{ => plugins}/rotation_vector/rv_raw/CMakeLists.txt (100%) rename src/{ => plugins}/rotation_vector/rv_raw/rv_raw_sensor.cpp (100%) rename src/{ => plugins}/rotation_vector/rv_raw/rv_raw_sensor.h (100%) rename src/{ => plugins}/rotation_vector/rv_raw/rv_raw_sensor_hal.cpp (100%) rename src/{ => plugins}/rotation_vector/rv_raw/rv_raw_sensor_hal.h (100%) rename src/{ => plugins}/sensor_fusion/CMakeLists.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/gravity/single_roll_throw/accel.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/gravity/single_roll_throw/gyro.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/gravity/single_roll_throw/magnetic.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/accel.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/gyro.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/magnetic.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/accel.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/gyro.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/magnetic.txt (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/accel (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/gyro (100%) rename src/{ => plugins}/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/magnetic (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/diagram/block_diagram_gravity_and_linear_acceleration.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/diagram/block_diagram_orientation_estimation.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/diagram/device_orientation.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/diagram/kalman_filter_stages.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/diagram/orientation_effect_on_gravity.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/diagram/projection_diagram_gravity_computation.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_1.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_10.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_11.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_12.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_13.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_13_updated.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_14.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_15.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_16.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_17.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_18.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_19.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_2.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_20.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_21.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_22.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_23.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_24.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_25.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_26.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_27.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_28.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_29.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_3.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_30.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_31.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_32.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_33.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_34.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_35.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_36.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_37.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_38.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_39.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_4.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_40.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_5.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_6.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_7.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_8.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/equation/equation_9.png (100%) rename src/{ => plugins}/sensor_fusion/design/documentation/sensor_fusion.htm (100%) rename src/{ => plugins}/sensor_fusion/design/lib/axis_rot2quat.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/estimate_gaming_rv.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/estimate_geomagnetic_rv.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/estimate_gravity.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/estimate_linear_acceleration.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/estimate_orientation.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/euler2quat.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/quat2euler.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/quat2rot_mat.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/quat_prod.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/rot_mat2quat.m (100%) rename src/{ => plugins}/sensor_fusion/design/lib/sf_pedometer.m (100%) rename src/{ => plugins}/sensor_fusion/design/readme (100%) rename src/{ => plugins}/sensor_fusion/design/sf_gaming_rv.m (100%) rename src/{ => plugins}/sensor_fusion/design/sf_geomagnetic_rv.m (100%) rename src/{ => plugins}/sensor_fusion/design/sf_gravity.m (100%) rename src/{ => plugins}/sensor_fusion/design/sf_linear_acceleration.m (100%) rename src/{ => plugins}/sensor_fusion/design/sf_orientation.m (100%) rename src/{ => plugins}/sensor_fusion/euler_angles.cpp (100%) rename src/{ => plugins}/sensor_fusion/euler_angles.h (100%) rename src/{ => plugins}/sensor_fusion/matrix.cpp (100%) rename src/{ => plugins}/sensor_fusion/matrix.h (100%) rename src/{ => plugins}/sensor_fusion/orientation_filter.cpp (100%) rename src/{ => plugins}/sensor_fusion/orientation_filter.h (100%) rename src/{ => plugins}/sensor_fusion/quaternion.cpp (100%) rename src/{ => plugins}/sensor_fusion/quaternion.h (100%) rename src/{ => plugins}/sensor_fusion/rotation_matrix.cpp (100%) rename src/{ => plugins}/sensor_fusion/rotation_matrix.h (100%) rename src/{ => plugins}/sensor_fusion/sensor_data.cpp (100%) rename src/{ => plugins}/sensor_fusion/sensor_data.h (100%) rename src/{ => plugins}/sensor_fusion/test/gravity_sensor.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/gravity_sensor.h (100%) rename src/{ => plugins}/sensor_fusion/test/linear_acceleration_sensor.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/linear_acceleration_sensor.h (100%) rename src/{ => plugins}/sensor_fusion/test/orientation_sensor.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/orientation_sensor.h (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/euler_angles_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/euler_angles_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/euler_angles_test/euler_angles_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/gravity_sensor_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/gravity_sensor_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/gravity_sensor_test/gravity_sensor_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/linear_acceleration_sensor_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/matrix_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/matrix_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/matrix_test/matrix_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/orientation_sensor_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/orientation_sensor_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/orientation_sensor_test/orientation_sensor_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/quaternion_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/quaternion_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/quaternion_test/quaternion_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/rotation_matrix_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/rotation_matrix_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/rotation_matrix_test/rotation_matrix_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/sensor_data_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/sensor_data_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/sensor_data_test/sensor_data_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/vector_test/.cproject (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/vector_test/.project (100%) rename src/{ => plugins}/sensor_fusion/test/test_projects/vector_test/vector_main.cpp (100%) rename src/{ => plugins}/sensor_fusion/vector.cpp (100%) rename src/{ => plugins}/sensor_fusion/vector.h (100%) rename src/{ => plugins}/temperature/CMakeLists.txt (100%) rename src/{ => plugins}/temperature/temperature_sensor.cpp (100%) rename src/{ => plugins}/temperature/temperature_sensor.h (100%) rename src/{ => plugins}/temperature/temperature_sensor_hal.cpp (100%) rename src/{ => plugins}/temperature/temperature_sensor_hal.h (100%) rename src/{ => plugins}/tilt/CMakeLists.txt (89%) rename src/{ => plugins}/tilt/tilt_sensor.cpp (100%) rename src/{ => plugins}/tilt/tilt_sensor.h (100%) rename src/{ => plugins}/ultraviolet/CMakeLists.txt (100%) rename src/{ => plugins}/ultraviolet/ultraviolet_sensor.cpp (100%) rename src/{ => plugins}/ultraviolet/ultraviolet_sensor.h (100%) rename src/{ => plugins}/ultraviolet/ultraviolet_sensor_hal.cpp (100%) rename src/{ => plugins}/ultraviolet/ultraviolet_sensor_hal.h (100%) rename src/{ => plugins}/uncal_gyro/CMakeLists.txt (90%) rename src/{ => plugins}/uncal_gyro/uncal_gyro_sensor.cpp (100%) rename src/{ => plugins}/uncal_gyro/uncal_gyro_sensor.h (100%) rename src/{libsensord => shared}/sensor_accel.h (100%) rename src/{libsensord => shared}/sensor_auto_rotation.h (100%) rename src/{libsensord => shared}/sensor_bio_led_red.h (100%) rename src/{libsensord => shared}/sensor_context.h (100%) rename src/{libsensord => shared}/sensor_deprecated.h (100%) rename src/{libsensord => shared}/sensor_fusion.h (100%) rename src/{libsensord => shared}/sensor_gaming_rv.h (100%) rename src/{libsensord => shared}/sensor_geomag.h (100%) rename src/{libsensord => shared}/sensor_geomagnetic_rv.h (100%) rename src/{libsensord => shared}/sensor_gravity.h (100%) rename src/{libsensord => shared}/sensor_gyro.h (100%) rename src/{libsensord => shared}/sensor_internal.h (100%) rename src/{libsensord => shared}/sensor_internal_deprecated.h (100%) rename src/{libsensord => shared}/sensor_light.h (100%) rename src/{libsensord => shared}/sensor_linear_accel.h (100%) rename src/{libsensord => shared}/sensor_motion.h (100%) rename src/{libsensord => shared}/sensor_orientation.h (100%) rename src/{libsensord => shared}/sensor_pressure.h (100%) rename src/{libsensord => shared}/sensor_proxi.h (100%) rename src/{libsensord => shared}/sensor_rv.h (100%) rename src/{libsensord => shared}/sensor_temperature.h (100%) rename src/{libsensord => shared}/sensor_tilt.h (100%) rename src/{libsensord => shared}/sensor_ultraviolet.h (100%) rename src/{libsensord => shared}/sensor_uncal_gyro.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 91a8b40..1087d73 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,37 +5,37 @@ include_directories(${CMAKE_SOURCE_DIR}/src/shared) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) IF("${ACCEL}" STREQUAL "ON") -add_subdirectory(accel) +add_subdirectory(plugins/accel) ENDIF() IF("${GYRO}" STREQUAL "ON") -add_subdirectory(gyro) +add_subdirectory(plugins/gyro) ENDIF() IF("${PROXI}" STREQUAL "ON") -add_subdirectory(proxi) +add_subdirectory(plugins/proxi) ENDIF() IF("${LIGHT}" STREQUAL "ON") -add_subdirectory(light) +add_subdirectory(plugins/light) ENDIF() IF("${GEO}" STREQUAL "ON") -add_subdirectory(geo) +add_subdirectory(plugins/geo) ENDIF() IF("${AUTO_ROTATION}" STREQUAL "ON") -add_subdirectory(auto_rotation) +add_subdirectory(plugins/auto_rotation) ENDIF() IF("${PRESSURE}" STREQUAL "ON") -add_subdirectory(pressure) +add_subdirectory(plugins/pressure) ENDIF() IF("${TEMPERATURE}" STREQUAL "ON") -add_subdirectory(temperature) +add_subdirectory(plugins/temperature) ENDIF() IF("${HUMIDITY}" STREQUAL "ON") add_subdirectory(humidity) ENDIF() IF("${ULTRAVIOLET}" STREQUAL "ON") -add_subdirectory(ultraviolet) +add_subdirectory(plugins/ultraviolet) ENDIF() IF("${BIO_LED_RED}" STREQUAL "ON") -add_subdirectory(bio_led_red) +add_subdirectory(plugins/bio_led_red) ENDIF() IF("${ORIENTATION}" STREQUAL "ON") set(SENSOR_FUSION_ENABLE "1") @@ -67,26 +67,27 @@ set(GRAVITY_ENABLE "1") set(LINEAR_ACCELERATION_ENABLE "1") ENDIF() IF("${SENSOR_FUSION_ENABLE}" STREQUAL "1") -add_subdirectory(sensor_fusion) -add_subdirectory(fusion) +add_subdirectory(plugins/sensor_fusion) +add_subdirectory(plugins/fusion) ENDIF() IF("${ORIENTATION_ENABLE}" STREQUAL "1") -add_subdirectory(orientation) +add_subdirectory(plugins/orientation) ENDIF() IF("${GRAVITY_ENABLE}" STREQUAL "1") -add_subdirectory(gravity) +add_subdirectory(plugins/gravity) ENDIF() IF("${LINEAR_ACCELERATION_ENABLE}" STREQUAL "1") -add_subdirectory(linear_accel) +add_subdirectory(plugins/linear_accel) ENDIF() IF("${TILT_ENABLE}" STREQUAL "1") -add_subdirectory(tilt) +add_subdirectory(plugins/tilt) ENDIF() IF("${UNCAL_GYRO_ENABLE}" STREQUAL "1") -add_subdirectory(uncal_gyro) +add_subdirectory(plugins/uncal_gyro) ENDIF() -add_subdirectory(rotation_vector) +add_subdirectory(plugins/rotation_vector) add_subdirectory(server) add_subdirectory(libsensord) add_subdirectory(shared) + diff --git a/src/libsensord/CMakeLists.txt b/src/libsensord/CMakeLists.txt index 00e3a1b..3f989c8 100755 --- a/src/libsensord/CMakeLists.txt +++ b/src/libsensord/CMakeLists.txt @@ -35,34 +35,11 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries) -install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES poller.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES creg_event_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES csensor_event_listener.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES sensor_info_manager.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES csensor_handle_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES client_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_geomag.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_light.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_proxi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_pressure.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_context.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_auto_rotation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_gravity.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_linear_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_orientation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_tilt.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_geomagnetic_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_gaming_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_fusion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_ultraviolet.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_bio_led_red.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES sensor_uncal_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + diff --git a/src/accel/CMakeLists.txt b/src/plugins/accel/CMakeLists.txt similarity index 100% rename from src/accel/CMakeLists.txt rename to src/plugins/accel/CMakeLists.txt diff --git a/src/accel/accel_sensor.cpp b/src/plugins/accel/accel_sensor.cpp similarity index 100% rename from src/accel/accel_sensor.cpp rename to src/plugins/accel/accel_sensor.cpp diff --git a/src/accel/accel_sensor.h b/src/plugins/accel/accel_sensor.h similarity index 100% rename from src/accel/accel_sensor.h rename to src/plugins/accel/accel_sensor.h diff --git a/src/accel/accel_sensor_hal.cpp b/src/plugins/accel/accel_sensor_hal.cpp similarity index 100% rename from src/accel/accel_sensor_hal.cpp rename to src/plugins/accel/accel_sensor_hal.cpp diff --git a/src/accel/accel_sensor_hal.h b/src/plugins/accel/accel_sensor_hal.h similarity index 100% rename from src/accel/accel_sensor_hal.h rename to src/plugins/accel/accel_sensor_hal.h diff --git a/src/auto_rotation/CMakeLists.txt b/src/plugins/auto_rotation/CMakeLists.txt similarity index 100% rename from src/auto_rotation/CMakeLists.txt rename to src/plugins/auto_rotation/CMakeLists.txt diff --git a/src/auto_rotation/auto_rotation_alg.cpp b/src/plugins/auto_rotation/auto_rotation_alg.cpp similarity index 100% rename from src/auto_rotation/auto_rotation_alg.cpp rename to src/plugins/auto_rotation/auto_rotation_alg.cpp diff --git a/src/auto_rotation/auto_rotation_alg.h b/src/plugins/auto_rotation/auto_rotation_alg.h similarity index 100% rename from src/auto_rotation/auto_rotation_alg.h rename to src/plugins/auto_rotation/auto_rotation_alg.h diff --git a/src/auto_rotation/auto_rotation_alg_emul.cpp b/src/plugins/auto_rotation/auto_rotation_alg_emul.cpp similarity index 100% rename from src/auto_rotation/auto_rotation_alg_emul.cpp rename to src/plugins/auto_rotation/auto_rotation_alg_emul.cpp diff --git a/src/auto_rotation/auto_rotation_alg_emul.h b/src/plugins/auto_rotation/auto_rotation_alg_emul.h similarity index 100% rename from src/auto_rotation/auto_rotation_alg_emul.h rename to src/plugins/auto_rotation/auto_rotation_alg_emul.h diff --git a/src/auto_rotation/auto_rotation_sensor.cpp b/src/plugins/auto_rotation/auto_rotation_sensor.cpp similarity index 100% rename from src/auto_rotation/auto_rotation_sensor.cpp rename to src/plugins/auto_rotation/auto_rotation_sensor.cpp diff --git a/src/auto_rotation/auto_rotation_sensor.h b/src/plugins/auto_rotation/auto_rotation_sensor.h similarity index 100% rename from src/auto_rotation/auto_rotation_sensor.h rename to src/plugins/auto_rotation/auto_rotation_sensor.h diff --git a/src/bio_led_red/CMakeLists.txt b/src/plugins/bio_led_red/CMakeLists.txt similarity index 100% rename from src/bio_led_red/CMakeLists.txt rename to src/plugins/bio_led_red/CMakeLists.txt diff --git a/src/bio_led_red/bio_led_red_sensor.cpp b/src/plugins/bio_led_red/bio_led_red_sensor.cpp similarity index 100% rename from src/bio_led_red/bio_led_red_sensor.cpp rename to src/plugins/bio_led_red/bio_led_red_sensor.cpp diff --git a/src/bio_led_red/bio_led_red_sensor.h b/src/plugins/bio_led_red/bio_led_red_sensor.h similarity index 100% rename from src/bio_led_red/bio_led_red_sensor.h rename to src/plugins/bio_led_red/bio_led_red_sensor.h diff --git a/src/bio_led_red/bio_led_red_sensor_hal.cpp b/src/plugins/bio_led_red/bio_led_red_sensor_hal.cpp similarity index 100% rename from src/bio_led_red/bio_led_red_sensor_hal.cpp rename to src/plugins/bio_led_red/bio_led_red_sensor_hal.cpp diff --git a/src/bio_led_red/bio_led_red_sensor_hal.h b/src/plugins/bio_led_red/bio_led_red_sensor_hal.h similarity index 100% rename from src/bio_led_red/bio_led_red_sensor_hal.h rename to src/plugins/bio_led_red/bio_led_red_sensor_hal.h diff --git a/src/fusion/CMakeLists.txt b/src/plugins/fusion/CMakeLists.txt similarity index 90% rename from src/fusion/CMakeLists.txt rename to src/plugins/fusion/CMakeLists.txt index 9c6b3f4..131a2a8 100755 --- a/src/fusion/CMakeLists.txt +++ b/src/plugins/fusion/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME fusion_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${fusion_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/fusion/fusion_sensor.cpp b/src/plugins/fusion/fusion_sensor.cpp similarity index 100% rename from src/fusion/fusion_sensor.cpp rename to src/plugins/fusion/fusion_sensor.cpp diff --git a/src/fusion/fusion_sensor.h b/src/plugins/fusion/fusion_sensor.h similarity index 100% rename from src/fusion/fusion_sensor.h rename to src/plugins/fusion/fusion_sensor.h diff --git a/src/fusion/hardware_fusion_sensor.html b/src/plugins/fusion/hardware_fusion_sensor.html similarity index 100% rename from src/fusion/hardware_fusion_sensor.html rename to src/plugins/fusion/hardware_fusion_sensor.html diff --git a/src/geo/CMakeLists.txt b/src/plugins/geo/CMakeLists.txt similarity index 100% rename from src/geo/CMakeLists.txt rename to src/plugins/geo/CMakeLists.txt diff --git a/src/geo/geo_sensor.cpp b/src/plugins/geo/geo_sensor.cpp similarity index 100% rename from src/geo/geo_sensor.cpp rename to src/plugins/geo/geo_sensor.cpp diff --git a/src/geo/geo_sensor.h b/src/plugins/geo/geo_sensor.h similarity index 100% rename from src/geo/geo_sensor.h rename to src/plugins/geo/geo_sensor.h diff --git a/src/geo/geo_sensor_hal.cpp b/src/plugins/geo/geo_sensor_hal.cpp similarity index 100% rename from src/geo/geo_sensor_hal.cpp rename to src/plugins/geo/geo_sensor_hal.cpp diff --git a/src/geo/geo_sensor_hal.h b/src/plugins/geo/geo_sensor_hal.h similarity index 100% rename from src/geo/geo_sensor_hal.h rename to src/plugins/geo/geo_sensor_hal.h diff --git a/src/gravity/CMakeLists.txt b/src/plugins/gravity/CMakeLists.txt similarity index 90% rename from src/gravity/CMakeLists.txt rename to src/plugins/gravity/CMakeLists.txt index 9ebbb00..5491c47 100755 --- a/src/gravity/CMakeLists.txt +++ b/src/plugins/gravity/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME gravity_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${gravity_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/gravity/gravity_sensor.cpp b/src/plugins/gravity/gravity_sensor.cpp similarity index 100% rename from src/gravity/gravity_sensor.cpp rename to src/plugins/gravity/gravity_sensor.cpp diff --git a/src/gravity/gravity_sensor.h b/src/plugins/gravity/gravity_sensor.h similarity index 100% rename from src/gravity/gravity_sensor.h rename to src/plugins/gravity/gravity_sensor.h diff --git a/src/gyro/CMakeLists.txt b/src/plugins/gyro/CMakeLists.txt similarity index 100% rename from src/gyro/CMakeLists.txt rename to src/plugins/gyro/CMakeLists.txt diff --git a/src/gyro/gyro_sensor.cpp b/src/plugins/gyro/gyro_sensor.cpp similarity index 100% rename from src/gyro/gyro_sensor.cpp rename to src/plugins/gyro/gyro_sensor.cpp diff --git a/src/gyro/gyro_sensor.h b/src/plugins/gyro/gyro_sensor.h similarity index 100% rename from src/gyro/gyro_sensor.h rename to src/plugins/gyro/gyro_sensor.h diff --git a/src/gyro/gyro_sensor_hal.cpp b/src/plugins/gyro/gyro_sensor_hal.cpp similarity index 100% rename from src/gyro/gyro_sensor_hal.cpp rename to src/plugins/gyro/gyro_sensor_hal.cpp diff --git a/src/gyro/gyro_sensor_hal.h b/src/plugins/gyro/gyro_sensor_hal.h similarity index 100% rename from src/gyro/gyro_sensor_hal.h rename to src/plugins/gyro/gyro_sensor_hal.h diff --git a/src/light/CMakeLists.txt b/src/plugins/light/CMakeLists.txt similarity index 100% rename from src/light/CMakeLists.txt rename to src/plugins/light/CMakeLists.txt diff --git a/src/light/light_sensor.cpp b/src/plugins/light/light_sensor.cpp similarity index 100% rename from src/light/light_sensor.cpp rename to src/plugins/light/light_sensor.cpp diff --git a/src/light/light_sensor.h b/src/plugins/light/light_sensor.h similarity index 100% rename from src/light/light_sensor.h rename to src/plugins/light/light_sensor.h diff --git a/src/light/light_sensor_hal.cpp b/src/plugins/light/light_sensor_hal.cpp similarity index 100% rename from src/light/light_sensor_hal.cpp rename to src/plugins/light/light_sensor_hal.cpp diff --git a/src/light/light_sensor_hal.h b/src/plugins/light/light_sensor_hal.h similarity index 100% rename from src/light/light_sensor_hal.h rename to src/plugins/light/light_sensor_hal.h diff --git a/src/linear_accel/CMakeLists.txt b/src/plugins/linear_accel/CMakeLists.txt similarity index 90% rename from src/linear_accel/CMakeLists.txt rename to src/plugins/linear_accel/CMakeLists.txt index fbc726f..c819bf7 100755 --- a/src/linear_accel/CMakeLists.txt +++ b/src/plugins/linear_accel/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME linear_accel_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${linear_accel_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/linear_accel/linear_accel_sensor.cpp b/src/plugins/linear_accel/linear_accel_sensor.cpp similarity index 100% rename from src/linear_accel/linear_accel_sensor.cpp rename to src/plugins/linear_accel/linear_accel_sensor.cpp diff --git a/src/linear_accel/linear_accel_sensor.h b/src/plugins/linear_accel/linear_accel_sensor.h similarity index 100% rename from src/linear_accel/linear_accel_sensor.h rename to src/plugins/linear_accel/linear_accel_sensor.h diff --git a/src/orientation/CMakeLists.txt b/src/plugins/orientation/CMakeLists.txt similarity index 90% rename from src/orientation/CMakeLists.txt rename to src/plugins/orientation/CMakeLists.txt index 5418674..455f0f4 100755 --- a/src/orientation/CMakeLists.txt +++ b/src/plugins/orientation/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME orientation_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${orientation_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/orientation/orientation_sensor.cpp b/src/plugins/orientation/orientation_sensor.cpp similarity index 100% rename from src/orientation/orientation_sensor.cpp rename to src/plugins/orientation/orientation_sensor.cpp diff --git a/src/orientation/orientation_sensor.h b/src/plugins/orientation/orientation_sensor.h similarity index 100% rename from src/orientation/orientation_sensor.h rename to src/plugins/orientation/orientation_sensor.h diff --git a/src/pressure/CMakeLists.txt b/src/plugins/pressure/CMakeLists.txt similarity index 100% rename from src/pressure/CMakeLists.txt rename to src/plugins/pressure/CMakeLists.txt diff --git a/src/pressure/pressure_sensor.cpp b/src/plugins/pressure/pressure_sensor.cpp similarity index 100% rename from src/pressure/pressure_sensor.cpp rename to src/plugins/pressure/pressure_sensor.cpp diff --git a/src/pressure/pressure_sensor.h b/src/plugins/pressure/pressure_sensor.h similarity index 100% rename from src/pressure/pressure_sensor.h rename to src/plugins/pressure/pressure_sensor.h diff --git a/src/pressure/pressure_sensor_hal.cpp b/src/plugins/pressure/pressure_sensor_hal.cpp similarity index 100% rename from src/pressure/pressure_sensor_hal.cpp rename to src/plugins/pressure/pressure_sensor_hal.cpp diff --git a/src/pressure/pressure_sensor_hal.h b/src/plugins/pressure/pressure_sensor_hal.h similarity index 100% rename from src/pressure/pressure_sensor_hal.h rename to src/plugins/pressure/pressure_sensor_hal.h diff --git a/src/proxi/CMakeLists.txt b/src/plugins/proxi/CMakeLists.txt similarity index 100% rename from src/proxi/CMakeLists.txt rename to src/plugins/proxi/CMakeLists.txt diff --git a/src/proxi/proxi_sensor.cpp b/src/plugins/proxi/proxi_sensor.cpp similarity index 100% rename from src/proxi/proxi_sensor.cpp rename to src/plugins/proxi/proxi_sensor.cpp diff --git a/src/proxi/proxi_sensor.h b/src/plugins/proxi/proxi_sensor.h similarity index 100% rename from src/proxi/proxi_sensor.h rename to src/plugins/proxi/proxi_sensor.h diff --git a/src/proxi/proxi_sensor_hal.cpp b/src/plugins/proxi/proxi_sensor_hal.cpp similarity index 100% rename from src/proxi/proxi_sensor_hal.cpp rename to src/plugins/proxi/proxi_sensor_hal.cpp diff --git a/src/proxi/proxi_sensor_hal.h b/src/plugins/proxi/proxi_sensor_hal.h similarity index 100% rename from src/proxi/proxi_sensor_hal.h rename to src/plugins/proxi/proxi_sensor_hal.h diff --git a/src/rotation_vector/CMakeLists.txt b/src/plugins/rotation_vector/CMakeLists.txt similarity index 100% rename from src/rotation_vector/CMakeLists.txt rename to src/plugins/rotation_vector/CMakeLists.txt diff --git a/src/rotation_vector/gaming_rv/CMakeLists.txt b/src/plugins/rotation_vector/gaming_rv/CMakeLists.txt similarity index 90% rename from src/rotation_vector/gaming_rv/CMakeLists.txt rename to src/plugins/rotation_vector/gaming_rv/CMakeLists.txt index a56dc73..2d13a9f 100755 --- a/src/rotation_vector/gaming_rv/CMakeLists.txt +++ b/src/plugins/rotation_vector/gaming_rv/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME gaming_rv_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${gaming_rv_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/rotation_vector/gaming_rv/gaming_rv_sensor.cpp b/src/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.cpp similarity index 100% rename from src/rotation_vector/gaming_rv/gaming_rv_sensor.cpp rename to src/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.cpp diff --git a/src/rotation_vector/gaming_rv/gaming_rv_sensor.h b/src/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.h similarity index 100% rename from src/rotation_vector/gaming_rv/gaming_rv_sensor.h rename to src/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.h diff --git a/src/rotation_vector/geomagnetic_rv/CMakeLists.txt b/src/plugins/rotation_vector/geomagnetic_rv/CMakeLists.txt similarity index 90% rename from src/rotation_vector/geomagnetic_rv/CMakeLists.txt rename to src/plugins/rotation_vector/geomagnetic_rv/CMakeLists.txt index 6b44750..56bd3c1 100755 --- a/src/rotation_vector/geomagnetic_rv/CMakeLists.txt +++ b/src/plugins/rotation_vector/geomagnetic_rv/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME geomagnetic_rv_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${geomagnetic_rv_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp b/src/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp similarity index 100% rename from src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp rename to src/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp diff --git a/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.h b/src/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.h similarity index 100% rename from src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.h rename to src/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.h diff --git a/src/rotation_vector/rv/CMakeLists.txt b/src/plugins/rotation_vector/rv/CMakeLists.txt similarity index 89% rename from src/rotation_vector/rv/CMakeLists.txt rename to src/plugins/rotation_vector/rv/CMakeLists.txt index 1549c6f..4cbb90f 100755 --- a/src/rotation_vector/rv/CMakeLists.txt +++ b/src/plugins/rotation_vector/rv/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME rv_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${rv_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/rotation_vector/rv/rv_sensor.cpp b/src/plugins/rotation_vector/rv/rv_sensor.cpp similarity index 100% rename from src/rotation_vector/rv/rv_sensor.cpp rename to src/plugins/rotation_vector/rv/rv_sensor.cpp diff --git a/src/rotation_vector/rv/rv_sensor.h b/src/plugins/rotation_vector/rv/rv_sensor.h similarity index 100% rename from src/rotation_vector/rv/rv_sensor.h rename to src/plugins/rotation_vector/rv/rv_sensor.h diff --git a/src/rotation_vector/rv_raw/CMakeLists.txt b/src/plugins/rotation_vector/rv_raw/CMakeLists.txt similarity index 100% rename from src/rotation_vector/rv_raw/CMakeLists.txt rename to src/plugins/rotation_vector/rv_raw/CMakeLists.txt diff --git a/src/rotation_vector/rv_raw/rv_raw_sensor.cpp b/src/plugins/rotation_vector/rv_raw/rv_raw_sensor.cpp similarity index 100% rename from src/rotation_vector/rv_raw/rv_raw_sensor.cpp rename to src/plugins/rotation_vector/rv_raw/rv_raw_sensor.cpp diff --git a/src/rotation_vector/rv_raw/rv_raw_sensor.h b/src/plugins/rotation_vector/rv_raw/rv_raw_sensor.h similarity index 100% rename from src/rotation_vector/rv_raw/rv_raw_sensor.h rename to src/plugins/rotation_vector/rv_raw/rv_raw_sensor.h diff --git a/src/rotation_vector/rv_raw/rv_raw_sensor_hal.cpp b/src/plugins/rotation_vector/rv_raw/rv_raw_sensor_hal.cpp similarity index 100% rename from src/rotation_vector/rv_raw/rv_raw_sensor_hal.cpp rename to src/plugins/rotation_vector/rv_raw/rv_raw_sensor_hal.cpp diff --git a/src/rotation_vector/rv_raw/rv_raw_sensor_hal.h b/src/plugins/rotation_vector/rv_raw/rv_raw_sensor_hal.h similarity index 100% rename from src/rotation_vector/rv_raw/rv_raw_sensor_hal.h rename to src/plugins/rotation_vector/rv_raw/rv_raw_sensor_hal.h diff --git a/src/sensor_fusion/CMakeLists.txt b/src/plugins/sensor_fusion/CMakeLists.txt similarity index 100% rename from src/sensor_fusion/CMakeLists.txt rename to src/plugins/sensor_fusion/CMakeLists.txt diff --git a/src/sensor_fusion/design/data/100ms/gravity/single_roll_throw/accel.txt b/src/plugins/sensor_fusion/design/data/100ms/gravity/single_roll_throw/accel.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/gravity/single_roll_throw/accel.txt rename to src/plugins/sensor_fusion/design/data/100ms/gravity/single_roll_throw/accel.txt diff --git a/src/sensor_fusion/design/data/100ms/gravity/single_roll_throw/gyro.txt b/src/plugins/sensor_fusion/design/data/100ms/gravity/single_roll_throw/gyro.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/gravity/single_roll_throw/gyro.txt rename to src/plugins/sensor_fusion/design/data/100ms/gravity/single_roll_throw/gyro.txt diff --git a/src/sensor_fusion/design/data/100ms/gravity/single_roll_throw/magnetic.txt b/src/plugins/sensor_fusion/design/data/100ms/gravity/single_roll_throw/magnetic.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/gravity/single_roll_throw/magnetic.txt rename to src/plugins/sensor_fusion/design/data/100ms/gravity/single_roll_throw/magnetic.txt diff --git a/src/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/accel.txt b/src/plugins/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/accel.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/accel.txt rename to src/plugins/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/accel.txt diff --git a/src/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/gyro.txt b/src/plugins/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/gyro.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/gyro.txt rename to src/plugins/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/gyro.txt diff --git a/src/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/magnetic.txt b/src/plugins/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/magnetic.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/magnetic.txt rename to src/plugins/sensor_fusion/design/data/100ms/linear_acceleration/move_x_y_z/magnetic.txt diff --git a/src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/accel.txt b/src/plugins/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/accel.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/accel.txt rename to src/plugins/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/accel.txt diff --git a/src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/gyro.txt b/src/plugins/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/gyro.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/gyro.txt rename to src/plugins/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/gyro.txt diff --git a/src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/magnetic.txt b/src/plugins/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/magnetic.txt similarity index 100% rename from src/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/magnetic.txt rename to src/plugins/sensor_fusion/design/data/100ms/orientation/roll_pitch_yaw/magnetic.txt diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/In_hand/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Pant_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/Shirt_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_down/While_talking/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/In_hand/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Pant_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/Shirt_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Climb_stairs_up/While_talking/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/In_hand/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Pant_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/Shirt_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_fast/While_talking/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/In_hand/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Pant_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/Shirt_pocket/magnetic diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/accel b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/accel similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/accel rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/accel diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/gyro b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/gyro similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/gyro rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/gyro diff --git a/src/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/magnetic b/src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/magnetic similarity index 100% rename from src/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/magnetic rename to src/plugins/sensor_fusion/design/data/25ms/pedo/Walk_slow/While_talking/magnetic diff --git a/src/sensor_fusion/design/documentation/diagram/block_diagram_gravity_and_linear_acceleration.png b/src/plugins/sensor_fusion/design/documentation/diagram/block_diagram_gravity_and_linear_acceleration.png similarity index 100% rename from src/sensor_fusion/design/documentation/diagram/block_diagram_gravity_and_linear_acceleration.png rename to src/plugins/sensor_fusion/design/documentation/diagram/block_diagram_gravity_and_linear_acceleration.png diff --git a/src/sensor_fusion/design/documentation/diagram/block_diagram_orientation_estimation.png b/src/plugins/sensor_fusion/design/documentation/diagram/block_diagram_orientation_estimation.png similarity index 100% rename from src/sensor_fusion/design/documentation/diagram/block_diagram_orientation_estimation.png rename to src/plugins/sensor_fusion/design/documentation/diagram/block_diagram_orientation_estimation.png diff --git a/src/sensor_fusion/design/documentation/diagram/device_orientation.png b/src/plugins/sensor_fusion/design/documentation/diagram/device_orientation.png similarity index 100% rename from src/sensor_fusion/design/documentation/diagram/device_orientation.png rename to src/plugins/sensor_fusion/design/documentation/diagram/device_orientation.png diff --git a/src/sensor_fusion/design/documentation/diagram/kalman_filter_stages.png b/src/plugins/sensor_fusion/design/documentation/diagram/kalman_filter_stages.png similarity index 100% rename from src/sensor_fusion/design/documentation/diagram/kalman_filter_stages.png rename to src/plugins/sensor_fusion/design/documentation/diagram/kalman_filter_stages.png diff --git a/src/sensor_fusion/design/documentation/diagram/orientation_effect_on_gravity.png b/src/plugins/sensor_fusion/design/documentation/diagram/orientation_effect_on_gravity.png similarity index 100% rename from src/sensor_fusion/design/documentation/diagram/orientation_effect_on_gravity.png rename to src/plugins/sensor_fusion/design/documentation/diagram/orientation_effect_on_gravity.png diff --git a/src/sensor_fusion/design/documentation/diagram/projection_diagram_gravity_computation.png b/src/plugins/sensor_fusion/design/documentation/diagram/projection_diagram_gravity_computation.png similarity index 100% rename from src/sensor_fusion/design/documentation/diagram/projection_diagram_gravity_computation.png rename to src/plugins/sensor_fusion/design/documentation/diagram/projection_diagram_gravity_computation.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_1.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_1.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_1.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_1.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_10.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_10.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_10.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_10.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_11.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_11.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_11.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_11.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_12.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_12.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_12.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_12.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_13.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_13.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_13.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_13.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_13_updated.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_13_updated.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_13_updated.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_13_updated.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_14.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_14.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_14.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_14.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_15.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_15.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_15.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_15.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_16.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_16.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_16.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_16.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_17.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_17.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_17.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_17.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_18.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_18.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_18.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_18.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_19.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_19.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_19.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_19.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_2.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_2.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_2.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_2.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_20.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_20.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_20.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_20.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_21.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_21.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_21.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_21.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_22.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_22.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_22.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_22.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_23.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_23.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_23.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_23.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_24.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_24.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_24.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_24.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_25.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_25.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_25.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_25.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_26.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_26.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_26.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_26.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_27.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_27.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_27.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_27.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_28.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_28.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_28.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_28.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_29.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_29.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_29.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_29.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_3.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_3.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_3.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_3.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_30.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_30.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_30.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_30.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_31.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_31.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_31.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_31.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_32.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_32.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_32.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_32.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_33.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_33.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_33.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_33.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_34.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_34.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_34.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_34.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_35.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_35.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_35.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_35.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_36.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_36.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_36.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_36.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_37.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_37.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_37.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_37.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_38.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_38.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_38.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_38.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_39.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_39.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_39.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_39.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_4.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_4.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_4.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_4.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_40.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_40.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_40.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_40.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_5.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_5.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_5.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_5.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_6.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_6.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_6.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_6.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_7.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_7.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_7.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_7.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_8.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_8.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_8.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_8.png diff --git a/src/sensor_fusion/design/documentation/equation/equation_9.png b/src/plugins/sensor_fusion/design/documentation/equation/equation_9.png similarity index 100% rename from src/sensor_fusion/design/documentation/equation/equation_9.png rename to src/plugins/sensor_fusion/design/documentation/equation/equation_9.png diff --git a/src/sensor_fusion/design/documentation/sensor_fusion.htm b/src/plugins/sensor_fusion/design/documentation/sensor_fusion.htm similarity index 100% rename from src/sensor_fusion/design/documentation/sensor_fusion.htm rename to src/plugins/sensor_fusion/design/documentation/sensor_fusion.htm diff --git a/src/sensor_fusion/design/lib/axis_rot2quat.m b/src/plugins/sensor_fusion/design/lib/axis_rot2quat.m similarity index 100% rename from src/sensor_fusion/design/lib/axis_rot2quat.m rename to src/plugins/sensor_fusion/design/lib/axis_rot2quat.m diff --git a/src/sensor_fusion/design/lib/estimate_gaming_rv.m b/src/plugins/sensor_fusion/design/lib/estimate_gaming_rv.m similarity index 100% rename from src/sensor_fusion/design/lib/estimate_gaming_rv.m rename to src/plugins/sensor_fusion/design/lib/estimate_gaming_rv.m diff --git a/src/sensor_fusion/design/lib/estimate_geomagnetic_rv.m b/src/plugins/sensor_fusion/design/lib/estimate_geomagnetic_rv.m similarity index 100% rename from src/sensor_fusion/design/lib/estimate_geomagnetic_rv.m rename to src/plugins/sensor_fusion/design/lib/estimate_geomagnetic_rv.m diff --git a/src/sensor_fusion/design/lib/estimate_gravity.m b/src/plugins/sensor_fusion/design/lib/estimate_gravity.m similarity index 100% rename from src/sensor_fusion/design/lib/estimate_gravity.m rename to src/plugins/sensor_fusion/design/lib/estimate_gravity.m diff --git a/src/sensor_fusion/design/lib/estimate_linear_acceleration.m b/src/plugins/sensor_fusion/design/lib/estimate_linear_acceleration.m similarity index 100% rename from src/sensor_fusion/design/lib/estimate_linear_acceleration.m rename to src/plugins/sensor_fusion/design/lib/estimate_linear_acceleration.m diff --git a/src/sensor_fusion/design/lib/estimate_orientation.m b/src/plugins/sensor_fusion/design/lib/estimate_orientation.m similarity index 100% rename from src/sensor_fusion/design/lib/estimate_orientation.m rename to src/plugins/sensor_fusion/design/lib/estimate_orientation.m diff --git a/src/sensor_fusion/design/lib/euler2quat.m b/src/plugins/sensor_fusion/design/lib/euler2quat.m similarity index 100% rename from src/sensor_fusion/design/lib/euler2quat.m rename to src/plugins/sensor_fusion/design/lib/euler2quat.m diff --git a/src/sensor_fusion/design/lib/quat2euler.m b/src/plugins/sensor_fusion/design/lib/quat2euler.m similarity index 100% rename from src/sensor_fusion/design/lib/quat2euler.m rename to src/plugins/sensor_fusion/design/lib/quat2euler.m diff --git a/src/sensor_fusion/design/lib/quat2rot_mat.m b/src/plugins/sensor_fusion/design/lib/quat2rot_mat.m similarity index 100% rename from src/sensor_fusion/design/lib/quat2rot_mat.m rename to src/plugins/sensor_fusion/design/lib/quat2rot_mat.m diff --git a/src/sensor_fusion/design/lib/quat_prod.m b/src/plugins/sensor_fusion/design/lib/quat_prod.m similarity index 100% rename from src/sensor_fusion/design/lib/quat_prod.m rename to src/plugins/sensor_fusion/design/lib/quat_prod.m diff --git a/src/sensor_fusion/design/lib/rot_mat2quat.m b/src/plugins/sensor_fusion/design/lib/rot_mat2quat.m similarity index 100% rename from src/sensor_fusion/design/lib/rot_mat2quat.m rename to src/plugins/sensor_fusion/design/lib/rot_mat2quat.m diff --git a/src/sensor_fusion/design/lib/sf_pedometer.m b/src/plugins/sensor_fusion/design/lib/sf_pedometer.m similarity index 100% rename from src/sensor_fusion/design/lib/sf_pedometer.m rename to src/plugins/sensor_fusion/design/lib/sf_pedometer.m diff --git a/src/sensor_fusion/design/readme b/src/plugins/sensor_fusion/design/readme similarity index 100% rename from src/sensor_fusion/design/readme rename to src/plugins/sensor_fusion/design/readme diff --git a/src/sensor_fusion/design/sf_gaming_rv.m b/src/plugins/sensor_fusion/design/sf_gaming_rv.m similarity index 100% rename from src/sensor_fusion/design/sf_gaming_rv.m rename to src/plugins/sensor_fusion/design/sf_gaming_rv.m diff --git a/src/sensor_fusion/design/sf_geomagnetic_rv.m b/src/plugins/sensor_fusion/design/sf_geomagnetic_rv.m similarity index 100% rename from src/sensor_fusion/design/sf_geomagnetic_rv.m rename to src/plugins/sensor_fusion/design/sf_geomagnetic_rv.m diff --git a/src/sensor_fusion/design/sf_gravity.m b/src/plugins/sensor_fusion/design/sf_gravity.m similarity index 100% rename from src/sensor_fusion/design/sf_gravity.m rename to src/plugins/sensor_fusion/design/sf_gravity.m diff --git a/src/sensor_fusion/design/sf_linear_acceleration.m b/src/plugins/sensor_fusion/design/sf_linear_acceleration.m similarity index 100% rename from src/sensor_fusion/design/sf_linear_acceleration.m rename to src/plugins/sensor_fusion/design/sf_linear_acceleration.m diff --git a/src/sensor_fusion/design/sf_orientation.m b/src/plugins/sensor_fusion/design/sf_orientation.m similarity index 100% rename from src/sensor_fusion/design/sf_orientation.m rename to src/plugins/sensor_fusion/design/sf_orientation.m diff --git a/src/sensor_fusion/euler_angles.cpp b/src/plugins/sensor_fusion/euler_angles.cpp similarity index 100% rename from src/sensor_fusion/euler_angles.cpp rename to src/plugins/sensor_fusion/euler_angles.cpp diff --git a/src/sensor_fusion/euler_angles.h b/src/plugins/sensor_fusion/euler_angles.h similarity index 100% rename from src/sensor_fusion/euler_angles.h rename to src/plugins/sensor_fusion/euler_angles.h diff --git a/src/sensor_fusion/matrix.cpp b/src/plugins/sensor_fusion/matrix.cpp similarity index 100% rename from src/sensor_fusion/matrix.cpp rename to src/plugins/sensor_fusion/matrix.cpp diff --git a/src/sensor_fusion/matrix.h b/src/plugins/sensor_fusion/matrix.h similarity index 100% rename from src/sensor_fusion/matrix.h rename to src/plugins/sensor_fusion/matrix.h diff --git a/src/sensor_fusion/orientation_filter.cpp b/src/plugins/sensor_fusion/orientation_filter.cpp similarity index 100% rename from src/sensor_fusion/orientation_filter.cpp rename to src/plugins/sensor_fusion/orientation_filter.cpp diff --git a/src/sensor_fusion/orientation_filter.h b/src/plugins/sensor_fusion/orientation_filter.h similarity index 100% rename from src/sensor_fusion/orientation_filter.h rename to src/plugins/sensor_fusion/orientation_filter.h diff --git a/src/sensor_fusion/quaternion.cpp b/src/plugins/sensor_fusion/quaternion.cpp similarity index 100% rename from src/sensor_fusion/quaternion.cpp rename to src/plugins/sensor_fusion/quaternion.cpp diff --git a/src/sensor_fusion/quaternion.h b/src/plugins/sensor_fusion/quaternion.h similarity index 100% rename from src/sensor_fusion/quaternion.h rename to src/plugins/sensor_fusion/quaternion.h diff --git a/src/sensor_fusion/rotation_matrix.cpp b/src/plugins/sensor_fusion/rotation_matrix.cpp similarity index 100% rename from src/sensor_fusion/rotation_matrix.cpp rename to src/plugins/sensor_fusion/rotation_matrix.cpp diff --git a/src/sensor_fusion/rotation_matrix.h b/src/plugins/sensor_fusion/rotation_matrix.h similarity index 100% rename from src/sensor_fusion/rotation_matrix.h rename to src/plugins/sensor_fusion/rotation_matrix.h diff --git a/src/sensor_fusion/sensor_data.cpp b/src/plugins/sensor_fusion/sensor_data.cpp similarity index 100% rename from src/sensor_fusion/sensor_data.cpp rename to src/plugins/sensor_fusion/sensor_data.cpp diff --git a/src/sensor_fusion/sensor_data.h b/src/plugins/sensor_fusion/sensor_data.h similarity index 100% rename from src/sensor_fusion/sensor_data.h rename to src/plugins/sensor_fusion/sensor_data.h diff --git a/src/sensor_fusion/test/gravity_sensor.cpp b/src/plugins/sensor_fusion/test/gravity_sensor.cpp similarity index 100% rename from src/sensor_fusion/test/gravity_sensor.cpp rename to src/plugins/sensor_fusion/test/gravity_sensor.cpp diff --git a/src/sensor_fusion/test/gravity_sensor.h b/src/plugins/sensor_fusion/test/gravity_sensor.h similarity index 100% rename from src/sensor_fusion/test/gravity_sensor.h rename to src/plugins/sensor_fusion/test/gravity_sensor.h diff --git a/src/sensor_fusion/test/linear_acceleration_sensor.cpp b/src/plugins/sensor_fusion/test/linear_acceleration_sensor.cpp similarity index 100% rename from src/sensor_fusion/test/linear_acceleration_sensor.cpp rename to src/plugins/sensor_fusion/test/linear_acceleration_sensor.cpp diff --git a/src/sensor_fusion/test/linear_acceleration_sensor.h b/src/plugins/sensor_fusion/test/linear_acceleration_sensor.h similarity index 100% rename from src/sensor_fusion/test/linear_acceleration_sensor.h rename to src/plugins/sensor_fusion/test/linear_acceleration_sensor.h diff --git a/src/sensor_fusion/test/orientation_sensor.cpp b/src/plugins/sensor_fusion/test/orientation_sensor.cpp similarity index 100% rename from src/sensor_fusion/test/orientation_sensor.cpp rename to src/plugins/sensor_fusion/test/orientation_sensor.cpp diff --git a/src/sensor_fusion/test/orientation_sensor.h b/src/plugins/sensor_fusion/test/orientation_sensor.h similarity index 100% rename from src/sensor_fusion/test/orientation_sensor.h rename to src/plugins/sensor_fusion/test/orientation_sensor.h diff --git a/src/sensor_fusion/test/test_projects/euler_angles_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/euler_angles_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/euler_angles_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/euler_angles_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/euler_angles_test/.project b/src/plugins/sensor_fusion/test/test_projects/euler_angles_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/euler_angles_test/.project rename to src/plugins/sensor_fusion/test/test_projects/euler_angles_test/.project diff --git a/src/sensor_fusion/test/test_projects/euler_angles_test/euler_angles_main.cpp b/src/plugins/sensor_fusion/test/test_projects/euler_angles_test/euler_angles_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/euler_angles_test/euler_angles_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/euler_angles_test/euler_angles_main.cpp diff --git a/src/sensor_fusion/test/test_projects/gravity_sensor_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/gravity_sensor_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/gravity_sensor_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/gravity_sensor_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/gravity_sensor_test/.project b/src/plugins/sensor_fusion/test/test_projects/gravity_sensor_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/gravity_sensor_test/.project rename to src/plugins/sensor_fusion/test/test_projects/gravity_sensor_test/.project diff --git a/src/sensor_fusion/test/test_projects/gravity_sensor_test/gravity_sensor_main.cpp b/src/plugins/sensor_fusion/test/test_projects/gravity_sensor_test/gravity_sensor_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/gravity_sensor_test/gravity_sensor_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/gravity_sensor_test/gravity_sensor_main.cpp diff --git a/src/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.project b/src/plugins/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.project rename to src/plugins/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/.project diff --git a/src/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/linear_acceleration_sensor_main.cpp b/src/plugins/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/linear_acceleration_sensor_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/linear_acceleration_sensor_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/linear_acceleration_sensor_test/linear_acceleration_sensor_main.cpp diff --git a/src/sensor_fusion/test/test_projects/matrix_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/matrix_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/matrix_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/matrix_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/matrix_test/.project b/src/plugins/sensor_fusion/test/test_projects/matrix_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/matrix_test/.project rename to src/plugins/sensor_fusion/test/test_projects/matrix_test/.project diff --git a/src/sensor_fusion/test/test_projects/matrix_test/matrix_main.cpp b/src/plugins/sensor_fusion/test/test_projects/matrix_test/matrix_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/matrix_test/matrix_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/matrix_test/matrix_main.cpp diff --git a/src/sensor_fusion/test/test_projects/orientation_sensor_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/orientation_sensor_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/orientation_sensor_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/orientation_sensor_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/orientation_sensor_test/.project b/src/plugins/sensor_fusion/test/test_projects/orientation_sensor_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/orientation_sensor_test/.project rename to src/plugins/sensor_fusion/test/test_projects/orientation_sensor_test/.project diff --git a/src/sensor_fusion/test/test_projects/orientation_sensor_test/orientation_sensor_main.cpp b/src/plugins/sensor_fusion/test/test_projects/orientation_sensor_test/orientation_sensor_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/orientation_sensor_test/orientation_sensor_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/orientation_sensor_test/orientation_sensor_main.cpp diff --git a/src/sensor_fusion/test/test_projects/quaternion_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/quaternion_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/quaternion_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/quaternion_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/quaternion_test/.project b/src/plugins/sensor_fusion/test/test_projects/quaternion_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/quaternion_test/.project rename to src/plugins/sensor_fusion/test/test_projects/quaternion_test/.project diff --git a/src/sensor_fusion/test/test_projects/quaternion_test/quaternion_main.cpp b/src/plugins/sensor_fusion/test/test_projects/quaternion_test/quaternion_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/quaternion_test/quaternion_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/quaternion_test/quaternion_main.cpp diff --git a/src/sensor_fusion/test/test_projects/rotation_matrix_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/rotation_matrix_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/rotation_matrix_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/rotation_matrix_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/rotation_matrix_test/.project b/src/plugins/sensor_fusion/test/test_projects/rotation_matrix_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/rotation_matrix_test/.project rename to src/plugins/sensor_fusion/test/test_projects/rotation_matrix_test/.project diff --git a/src/sensor_fusion/test/test_projects/rotation_matrix_test/rotation_matrix_main.cpp b/src/plugins/sensor_fusion/test/test_projects/rotation_matrix_test/rotation_matrix_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/rotation_matrix_test/rotation_matrix_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/rotation_matrix_test/rotation_matrix_main.cpp diff --git a/src/sensor_fusion/test/test_projects/sensor_data_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/sensor_data_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/sensor_data_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/sensor_data_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/sensor_data_test/.project b/src/plugins/sensor_fusion/test/test_projects/sensor_data_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/sensor_data_test/.project rename to src/plugins/sensor_fusion/test/test_projects/sensor_data_test/.project diff --git a/src/sensor_fusion/test/test_projects/sensor_data_test/sensor_data_main.cpp b/src/plugins/sensor_fusion/test/test_projects/sensor_data_test/sensor_data_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/sensor_data_test/sensor_data_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/sensor_data_test/sensor_data_main.cpp diff --git a/src/sensor_fusion/test/test_projects/vector_test/.cproject b/src/plugins/sensor_fusion/test/test_projects/vector_test/.cproject similarity index 100% rename from src/sensor_fusion/test/test_projects/vector_test/.cproject rename to src/plugins/sensor_fusion/test/test_projects/vector_test/.cproject diff --git a/src/sensor_fusion/test/test_projects/vector_test/.project b/src/plugins/sensor_fusion/test/test_projects/vector_test/.project similarity index 100% rename from src/sensor_fusion/test/test_projects/vector_test/.project rename to src/plugins/sensor_fusion/test/test_projects/vector_test/.project diff --git a/src/sensor_fusion/test/test_projects/vector_test/vector_main.cpp b/src/plugins/sensor_fusion/test/test_projects/vector_test/vector_main.cpp similarity index 100% rename from src/sensor_fusion/test/test_projects/vector_test/vector_main.cpp rename to src/plugins/sensor_fusion/test/test_projects/vector_test/vector_main.cpp diff --git a/src/sensor_fusion/vector.cpp b/src/plugins/sensor_fusion/vector.cpp similarity index 100% rename from src/sensor_fusion/vector.cpp rename to src/plugins/sensor_fusion/vector.cpp diff --git a/src/sensor_fusion/vector.h b/src/plugins/sensor_fusion/vector.h similarity index 100% rename from src/sensor_fusion/vector.h rename to src/plugins/sensor_fusion/vector.h diff --git a/src/temperature/CMakeLists.txt b/src/plugins/temperature/CMakeLists.txt similarity index 100% rename from src/temperature/CMakeLists.txt rename to src/plugins/temperature/CMakeLists.txt diff --git a/src/temperature/temperature_sensor.cpp b/src/plugins/temperature/temperature_sensor.cpp similarity index 100% rename from src/temperature/temperature_sensor.cpp rename to src/plugins/temperature/temperature_sensor.cpp diff --git a/src/temperature/temperature_sensor.h b/src/plugins/temperature/temperature_sensor.h similarity index 100% rename from src/temperature/temperature_sensor.h rename to src/plugins/temperature/temperature_sensor.h diff --git a/src/temperature/temperature_sensor_hal.cpp b/src/plugins/temperature/temperature_sensor_hal.cpp similarity index 100% rename from src/temperature/temperature_sensor_hal.cpp rename to src/plugins/temperature/temperature_sensor_hal.cpp diff --git a/src/temperature/temperature_sensor_hal.h b/src/plugins/temperature/temperature_sensor_hal.h similarity index 100% rename from src/temperature/temperature_sensor_hal.h rename to src/plugins/temperature/temperature_sensor_hal.h diff --git a/src/tilt/CMakeLists.txt b/src/plugins/tilt/CMakeLists.txt similarity index 89% rename from src/tilt/CMakeLists.txt rename to src/plugins/tilt/CMakeLists.txt index 44e6a1a..6bd9b97 100755 --- a/src/tilt/CMakeLists.txt +++ b/src/plugins/tilt/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME tilt_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${tilt_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/tilt/tilt_sensor.cpp b/src/plugins/tilt/tilt_sensor.cpp similarity index 100% rename from src/tilt/tilt_sensor.cpp rename to src/plugins/tilt/tilt_sensor.cpp diff --git a/src/tilt/tilt_sensor.h b/src/plugins/tilt/tilt_sensor.h similarity index 100% rename from src/tilt/tilt_sensor.h rename to src/plugins/tilt/tilt_sensor.h diff --git a/src/ultraviolet/CMakeLists.txt b/src/plugins/ultraviolet/CMakeLists.txt similarity index 100% rename from src/ultraviolet/CMakeLists.txt rename to src/plugins/ultraviolet/CMakeLists.txt diff --git a/src/ultraviolet/ultraviolet_sensor.cpp b/src/plugins/ultraviolet/ultraviolet_sensor.cpp similarity index 100% rename from src/ultraviolet/ultraviolet_sensor.cpp rename to src/plugins/ultraviolet/ultraviolet_sensor.cpp diff --git a/src/ultraviolet/ultraviolet_sensor.h b/src/plugins/ultraviolet/ultraviolet_sensor.h similarity index 100% rename from src/ultraviolet/ultraviolet_sensor.h rename to src/plugins/ultraviolet/ultraviolet_sensor.h diff --git a/src/ultraviolet/ultraviolet_sensor_hal.cpp b/src/plugins/ultraviolet/ultraviolet_sensor_hal.cpp similarity index 100% rename from src/ultraviolet/ultraviolet_sensor_hal.cpp rename to src/plugins/ultraviolet/ultraviolet_sensor_hal.cpp diff --git a/src/ultraviolet/ultraviolet_sensor_hal.h b/src/plugins/ultraviolet/ultraviolet_sensor_hal.h similarity index 100% rename from src/ultraviolet/ultraviolet_sensor_hal.h rename to src/plugins/ultraviolet/ultraviolet_sensor_hal.h diff --git a/src/uncal_gyro/CMakeLists.txt b/src/plugins/uncal_gyro/CMakeLists.txt similarity index 90% rename from src/uncal_gyro/CMakeLists.txt rename to src/plugins/uncal_gyro/CMakeLists.txt index 12d5b3d..056962a 100644 --- a/src/uncal_gyro/CMakeLists.txt +++ b/src/plugins/uncal_gyro/CMakeLists.txt @@ -5,7 +5,7 @@ SET(SENSOR_NAME uncal_gyro_sensor) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/libsensord) -include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion) +include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion) FOREACH(flag ${gravity_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") diff --git a/src/uncal_gyro/uncal_gyro_sensor.cpp b/src/plugins/uncal_gyro/uncal_gyro_sensor.cpp similarity index 100% rename from src/uncal_gyro/uncal_gyro_sensor.cpp rename to src/plugins/uncal_gyro/uncal_gyro_sensor.cpp diff --git a/src/uncal_gyro/uncal_gyro_sensor.h b/src/plugins/uncal_gyro/uncal_gyro_sensor.h similarity index 100% rename from src/uncal_gyro/uncal_gyro_sensor.h rename to src/plugins/uncal_gyro/uncal_gyro_sensor.h diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 45b6af6..91c6b32 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -83,4 +83,28 @@ install(FILES sensor_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor ) +install(FILES sensor_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_geomag.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_light.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_proxi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_pressure.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_context.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_auto_rotation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_gravity.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_linear_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_orientation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_tilt.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_geomagnetic_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_gaming_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_fusion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_ultraviolet.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_bio_led_red.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_uncal_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) diff --git a/src/libsensord/sensor_accel.h b/src/shared/sensor_accel.h similarity index 100% rename from src/libsensord/sensor_accel.h rename to src/shared/sensor_accel.h diff --git a/src/libsensord/sensor_auto_rotation.h b/src/shared/sensor_auto_rotation.h similarity index 100% rename from src/libsensord/sensor_auto_rotation.h rename to src/shared/sensor_auto_rotation.h diff --git a/src/libsensord/sensor_bio_led_red.h b/src/shared/sensor_bio_led_red.h similarity index 100% rename from src/libsensord/sensor_bio_led_red.h rename to src/shared/sensor_bio_led_red.h diff --git a/src/libsensord/sensor_context.h b/src/shared/sensor_context.h similarity index 100% rename from src/libsensord/sensor_context.h rename to src/shared/sensor_context.h diff --git a/src/libsensord/sensor_deprecated.h b/src/shared/sensor_deprecated.h similarity index 100% rename from src/libsensord/sensor_deprecated.h rename to src/shared/sensor_deprecated.h diff --git a/src/libsensord/sensor_fusion.h b/src/shared/sensor_fusion.h similarity index 100% rename from src/libsensord/sensor_fusion.h rename to src/shared/sensor_fusion.h diff --git a/src/libsensord/sensor_gaming_rv.h b/src/shared/sensor_gaming_rv.h similarity index 100% rename from src/libsensord/sensor_gaming_rv.h rename to src/shared/sensor_gaming_rv.h diff --git a/src/libsensord/sensor_geomag.h b/src/shared/sensor_geomag.h similarity index 100% rename from src/libsensord/sensor_geomag.h rename to src/shared/sensor_geomag.h diff --git a/src/libsensord/sensor_geomagnetic_rv.h b/src/shared/sensor_geomagnetic_rv.h similarity index 100% rename from src/libsensord/sensor_geomagnetic_rv.h rename to src/shared/sensor_geomagnetic_rv.h diff --git a/src/libsensord/sensor_gravity.h b/src/shared/sensor_gravity.h similarity index 100% rename from src/libsensord/sensor_gravity.h rename to src/shared/sensor_gravity.h diff --git a/src/libsensord/sensor_gyro.h b/src/shared/sensor_gyro.h similarity index 100% rename from src/libsensord/sensor_gyro.h rename to src/shared/sensor_gyro.h diff --git a/src/libsensord/sensor_internal.h b/src/shared/sensor_internal.h similarity index 100% rename from src/libsensord/sensor_internal.h rename to src/shared/sensor_internal.h diff --git a/src/libsensord/sensor_internal_deprecated.h b/src/shared/sensor_internal_deprecated.h similarity index 100% rename from src/libsensord/sensor_internal_deprecated.h rename to src/shared/sensor_internal_deprecated.h diff --git a/src/libsensord/sensor_light.h b/src/shared/sensor_light.h similarity index 100% rename from src/libsensord/sensor_light.h rename to src/shared/sensor_light.h diff --git a/src/libsensord/sensor_linear_accel.h b/src/shared/sensor_linear_accel.h similarity index 100% rename from src/libsensord/sensor_linear_accel.h rename to src/shared/sensor_linear_accel.h diff --git a/src/libsensord/sensor_motion.h b/src/shared/sensor_motion.h similarity index 100% rename from src/libsensord/sensor_motion.h rename to src/shared/sensor_motion.h diff --git a/src/libsensord/sensor_orientation.h b/src/shared/sensor_orientation.h similarity index 100% rename from src/libsensord/sensor_orientation.h rename to src/shared/sensor_orientation.h diff --git a/src/libsensord/sensor_pressure.h b/src/shared/sensor_pressure.h similarity index 100% rename from src/libsensord/sensor_pressure.h rename to src/shared/sensor_pressure.h diff --git a/src/libsensord/sensor_proxi.h b/src/shared/sensor_proxi.h similarity index 100% rename from src/libsensord/sensor_proxi.h rename to src/shared/sensor_proxi.h diff --git a/src/libsensord/sensor_rv.h b/src/shared/sensor_rv.h similarity index 100% rename from src/libsensord/sensor_rv.h rename to src/shared/sensor_rv.h diff --git a/src/libsensord/sensor_temperature.h b/src/shared/sensor_temperature.h similarity index 100% rename from src/libsensord/sensor_temperature.h rename to src/shared/sensor_temperature.h diff --git a/src/libsensord/sensor_tilt.h b/src/shared/sensor_tilt.h similarity index 100% rename from src/libsensord/sensor_tilt.h rename to src/shared/sensor_tilt.h diff --git a/src/libsensord/sensor_ultraviolet.h b/src/shared/sensor_ultraviolet.h similarity index 100% rename from src/libsensord/sensor_ultraviolet.h rename to src/shared/sensor_ultraviolet.h diff --git a/src/libsensord/sensor_uncal_gyro.h b/src/shared/sensor_uncal_gyro.h similarity index 100% rename from src/libsensord/sensor_uncal_gyro.h rename to src/shared/sensor_uncal_gyro.h -- 2.7.4