Adding Uncal Gyro Sensor and related files 70/41570/2
authorAnkur <ankur29.garg@samsung.com>
Tue, 16 Jun 2015 12:48:42 +0000 (18:18 +0530)
committerAnkur <ankur29.garg@samsung.com>
Thu, 18 Jun 2015 04:26:39 +0000 (09:56 +0530)
Adding uncal_gyro sensor files.

Change-Id: I5d76a4a40ba774c50fcf0130c78e32011bd106a9

12 files changed:
packaging/sensord.spec
sensor_plugins.xml.in
src/CMakeLists.txt
src/libsensord/CMakeLists.txt
src/libsensord/client_common.cpp
src/libsensord/sensor_internal.h
src/libsensord/sensor_internal_deprecated.h
src/libsensord/sensor_uncal_gyro.h [new file with mode: 0644]
src/uncal_gyro/CMakeLists.txt [new file with mode: 0644]
src/uncal_gyro/uncal_gyro_sensor.cpp [new file with mode: 0644]
src/uncal_gyro/uncal_gyro_sensor.h [new file with mode: 0644]
virtual_sensors.xml

index 499c99e..5ca2327 100755 (executable)
@@ -31,6 +31,7 @@ BuildRequires:  pkgconfig(capi-system-info)
 %define geomagnetic_rv_state ON
 %define gaming_rv_state ON
 %define tilt_state ON
+%define uncal_gyro_state ON
 %define build_test_suite OFF
 
 %description
@@ -82,6 +83,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DACCEL=%{accel_state} \
        -DORIENTATION=%{orientation_state} -DGRAVITY=%{gravity_state} \
        -DLINEAR_ACCEL=%{linear_accel_state} -DRV=%{rv_state} \
        -DGEOMAGNETIC_RV=%{geomagnetic_rv_state} -DGAMING_RV=%{gaming_rv_state} \
+       -DUNCAL_GYRO=%{uncal_gyro_state} \
        -DTILT=%{tilt_state} -DTEST_SUITE=%{build_test_suite} \
        -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir}
 
index c1822ce..66d7d26 100755 (executable)
@@ -25,5 +25,6 @@
                <MODULE path = "/usr/lib/sensord/libgeomagnetic_rv_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/libgaming_rv_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/libtilt_sensor.so"/>
+               <MODULE path = "/usr/lib/sensord/libuncal_gyro_sensor.so"/>
        </SENSOR>
 </PLUGIN>
index 65f0ec7..39dc767 100755 (executable)
@@ -48,6 +48,10 @@ IF("${TILT}" STREQUAL "ON")
 set(SENSOR_FUSION_ENABLE "1")
 set(TILT_ENABLE "1")
 ENDIF()
+IF("${UNCAL_GYRO}" STREQUAL "ON")
+set(SENSOR_FUSION_ENABLE "1")
+set(UNCAL_GYRO_ENABLE "1")
+ENDIF()
 IF("${GRAVITY}" STREQUAL "ON")
 set(SENSOR_FUSION_ENABLE "1")
 set(ORIENTATION_ENABLE "1")
@@ -75,6 +79,9 @@ ENDIF()
 IF("${TILT_ENABLE}" STREQUAL "1")
 add_subdirectory(tilt)
 ENDIF()
+IF("${UNCAL_GYRO_ENABLE}" STREQUAL "1")
+add_subdirectory(uncal_gyro)
+ENDIF()
 
 add_subdirectory(rotation_vector)
 add_subdirectory(server)
index a8b8aab..bd56d4b 100755 (executable)
@@ -62,4 +62,5 @@ install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/senso
 install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 install(FILES sensor_fusion.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)
index 082c31d..29d056f 100755 (executable)
@@ -45,6 +45,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GAMING_RV_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, FUSION_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, TILT_SENSOR, 0, 1),
+       FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, UNCAL_GYROSCOPE_SENSOR, 0, 1),
 
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_CALIBRATION_NEEDED_EVENT, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_CHANGE_STATE_EVENT, 0,1),
@@ -69,6 +70,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GAMING_RV_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, FUSION_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, TILT_RAW_DATA_EVENT, 0, 10),
+       FILL_LOG_ELEMENT(LOG_ID_EVENT, UNCAL_GYRO_RAW_DATA_EVENT, 0, 10),
 };
 
 typedef unordered_map<unsigned int, log_attr* > log_map;
index 7842cda..477e6f0 100755 (executable)
@@ -56,6 +56,7 @@ extern "C"
 #include <sensor_temperature.h>
 #include <sensor_fusion.h>
 #include <sensor_tilt.h>
+#include <sensor_uncal_gyro.h>
 
 
 typedef void (*sensor_cb_t)(sensor_t sensor, unsigned int event_type, sensor_data_t *data, void *user_data);
index fdcbab1..3f6aede 100755 (executable)
@@ -55,6 +55,7 @@ extern "C"
 #include <sensor_deprecated.h>
 #include <sensor_fusion.h>
 #include <sensor_tilt.h>
+#include <sensor_uncal_gyro.h>
 
 #define MAX_KEY_LEN 30
 
diff --git a/src/libsensord/sensor_uncal_gyro.h b/src/libsensord/sensor_uncal_gyro.h
new file mode 100644 (file)
index 0000000..92494a7
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * libsensord
+ *
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef __SENSOR_UNCAL_GYRO_H__
+#define __SENSOR_UNCAL_GYRO_H__
+
+//! Pre-defined events for the uncal gyroscope sensor
+//! Sensor Plugin developer can add more event to their own headers
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/**
+ * @defgroup UNCAL_SENSOR_GYRO Gyro Sensor
+ * @ingroup SENSOR_FRAMEWORK
+ *
+ * These APIs are used to control the gyro sensor.
+ * @{
+ */
+
+enum uncal_gyro_event_type {
+       UNCAL_GYRO_RAW_DATA_EVENT       = (UNCAL_GYROSCOPE_SENSOR << 16) | 0x0001,
+};
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+//! End of a file
diff --git a/src/uncal_gyro/CMakeLists.txt b/src/uncal_gyro/CMakeLists.txt
new file mode 100644 (file)
index 0000000..12d5b3d
--- /dev/null
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.6)
+project(uncal_gyro CXX)
+
+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)
+
+FOREACH(flag ${gravity_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+FOREACH(flag ${uncal_gyro_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+add_library(${SENSOR_NAME} SHARED
+               uncal_gyro_sensor.cpp
+               )
+
+target_link_libraries(${SENSOR_NAME} ${uncal_gyro_pkgs_LDFLAGS} "-lm")
+
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
diff --git a/src/uncal_gyro/uncal_gyro_sensor.cpp b/src/uncal_gyro/uncal_gyro_sensor.cpp
new file mode 100644 (file)
index 0000000..f173f3f
--- /dev/null
@@ -0,0 +1,319 @@
+/*
+ * sensord
+ *
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <math.h>
+#include <time.h>
+#include <sys/types.h>
+#include <dlfcn.h>
+#include <common.h>
+#include <sf_common.h>
+#include <uncal_gyro_sensor.h>
+#include <sensor_plugin_loader.h>
+#include <orientation_filter.h>
+#include <cvirtual_sensor_config.h>
+
+#define SENSOR_NAME "UNCAL_GYROSCOPE_SENSOR"
+#define SENSOR_TYPE_UNCAL_GYRO         "UNCAL_GYROSCOPE"
+
+#define GYROSCOPE_ENABLED 0x01
+#define GYRO_BIAS_ENABLED 0x02
+#define UNCAL_GYRO_BIAS_ENABLED 3
+
+#define INITIAL_VALUE -1
+
+#define MS_TO_US 1000
+#define MIN_DELIVERY_DIFF_FACTOR 0.75f
+
+#define PI 3.141593
+#define AZIMUTH_OFFSET_DEGREES 360
+#define AZIMUTH_OFFSET_RADIANS (2 * PI)
+
+#define ELEMENT_NAME                                                                                   "NAME"
+#define ELEMENT_VENDOR                                                                                 "VENDOR"
+#define ELEMENT_RAW_DATA_UNIT                                                                  "RAW_DATA_UNIT"
+#define ELEMENT_DEFAULT_SAMPLING_TIME                                                  "DEFAULT_SAMPLING_TIME"
+
+uncal_gyro_sensor::uncal_gyro_sensor()
+: m_accel_sensor(NULL)
+, m_gyro_sensor(NULL)
+, m_magnetic_sensor(NULL)
+, m_fusion_sensor(NULL)
+, m_time(0)
+{
+       cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance();
+
+       sensor_hal *fusion_sensor_hal = sensor_plugin_loader::get_instance().get_sensor_hal(FUSION_SENSOR);
+       if (!fusion_sensor_hal)
+               m_hardware_fusion = false;
+       else
+               m_hardware_fusion = true;
+
+       m_name = string(SENSOR_NAME);
+       register_supported_event(UNCAL_GYRO_RAW_DATA_EVENT);
+
+       if (!config.get(SENSOR_TYPE_UNCAL_GYRO, ELEMENT_VENDOR, m_vendor)) {
+               ERR("[VENDOR] is empty\n");
+               throw ENXIO;
+       }
+
+       INFO("m_vendor = %s", m_vendor.c_str());
+
+       if (!config.get(SENSOR_TYPE_UNCAL_GYRO, ELEMENT_RAW_DATA_UNIT, m_raw_data_unit)) {
+               ERR("[RAW_DATA_UNIT] is empty\n");
+               throw ENXIO;
+       }
+
+       INFO("m_raw_data_unit = %s", m_raw_data_unit.c_str());
+
+       if (!config.get(SENSOR_TYPE_UNCAL_GYRO, ELEMENT_DEFAULT_SAMPLING_TIME, &m_default_sampling_time)) {
+               ERR("[DEFAULT_SAMPLING_TIME] is empty\n");
+               throw ENXIO;
+       }
+
+       INFO("m_default_sampling_time = %d", m_default_sampling_time);
+
+       m_interval = m_default_sampling_time * MS_TO_US;
+}
+
+uncal_gyro_sensor::~uncal_gyro_sensor()
+{
+       INFO("uncal_gyro_sensor is destroyed!\n");
+}
+
+bool uncal_gyro_sensor::init(void)
+{
+       m_accel_sensor = sensor_plugin_loader::get_instance().get_sensor(ACCELEROMETER_SENSOR);
+       m_gyro_sensor = sensor_plugin_loader::get_instance().get_sensor(GYROSCOPE_SENSOR);
+       m_magnetic_sensor = sensor_plugin_loader::get_instance().get_sensor(GEOMAGNETIC_SENSOR);
+
+       m_fusion_sensor = sensor_plugin_loader::get_instance().get_sensor(FUSION_SENSOR);
+
+       if (!m_accel_sensor || !m_gyro_sensor || !m_magnetic_sensor || !m_fusion_sensor) {
+               ERR("Failed to load sensors,  accel: 0x%x, gyro: 0x%x, mag: 0x%x, fusion: 0x%x",
+                       m_accel_sensor, m_gyro_sensor, m_magnetic_sensor, m_fusion_sensor);
+               return false;
+       }
+
+       INFO("%s is created!\n", sensor_base::get_name());
+
+       return true;
+}
+
+sensor_type_t uncal_gyro_sensor::get_type(void)
+{
+       return UNCAL_GYROSCOPE_SENSOR;
+}
+
+bool uncal_gyro_sensor::on_start(void)
+{
+       AUTOLOCK(m_mutex);
+
+       if (!m_hardware_fusion) {
+               m_accel_sensor->add_client(ACCELEROMETER_RAW_DATA_EVENT);
+               m_accel_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
+               m_accel_sensor->start();
+               m_gyro_sensor->add_client(GYROSCOPE_RAW_DATA_EVENT);
+               m_gyro_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
+               m_gyro_sensor->start();
+               m_magnetic_sensor->add_client(GEOMAGNETIC_RAW_DATA_EVENT);
+               m_magnetic_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
+               m_magnetic_sensor->start();
+       }
+
+       m_fusion_sensor->register_supported_event(FUSION_UNCAL_GYRO_EVENT);
+       m_fusion_sensor->register_supported_event(FUSION_UNCAL_GYRO_ENABLED);
+       m_fusion_sensor->add_client(FUSION_UNCAL_GYRO_EVENT);
+       m_fusion_sensor->add_interval((intptr_t)this, (m_interval/MS_TO_US), false);
+       m_fusion_sensor->start();
+
+       activate();
+       return true;
+}
+
+bool uncal_gyro_sensor::on_stop(void)
+{
+       AUTOLOCK(m_mutex);
+
+       if (!m_hardware_fusion) {
+               m_accel_sensor->delete_client(ACCELEROMETER_RAW_DATA_EVENT);
+               m_accel_sensor->delete_interval((intptr_t)this, false);
+               m_accel_sensor->stop();
+               m_gyro_sensor->delete_client(GYROSCOPE_RAW_DATA_EVENT);
+               m_gyro_sensor->delete_interval((intptr_t)this, false);
+               m_gyro_sensor->stop();
+               m_magnetic_sensor->delete_client(GEOMAGNETIC_RAW_DATA_EVENT);
+               m_magnetic_sensor->delete_interval((intptr_t)this, false);
+               m_magnetic_sensor->stop();
+       }
+
+       m_fusion_sensor->delete_client(FUSION_UNCAL_GYRO_EVENT);
+       m_fusion_sensor->delete_interval((intptr_t)this, false);
+       m_fusion_sensor->unregister_supported_event(FUSION_UNCAL_GYRO_EVENT);
+       m_fusion_sensor->unregister_supported_event(FUSION_UNCAL_GYRO_ENABLED);
+       m_fusion_sensor->stop();
+
+       deactivate();
+       return true;
+}
+
+bool uncal_gyro_sensor::add_interval(int client_id, unsigned int interval)
+{
+       AUTOLOCK(m_mutex);
+
+       if (!m_hardware_fusion) {
+               m_accel_sensor->add_interval(client_id, interval, false);
+               m_gyro_sensor->add_interval(client_id, interval, false);
+               m_magnetic_sensor->add_interval(client_id, interval, false);
+       }
+
+       m_fusion_sensor->add_interval(client_id, interval, false);
+
+       return sensor_base::add_interval(client_id, interval, false);
+}
+
+bool uncal_gyro_sensor::delete_interval(int client_id)
+{
+       AUTOLOCK(m_mutex);
+
+       if (!m_hardware_fusion) {
+               m_accel_sensor->delete_interval(client_id, false);
+               m_gyro_sensor->delete_interval(client_id, false);
+               m_magnetic_sensor->delete_interval(client_id, false);
+       }
+
+       m_fusion_sensor->delete_interval(client_id, false);
+
+       return sensor_base::delete_interval(client_id, false);
+}
+
+void uncal_gyro_sensor::synthesize(const sensor_event_t &event, vector<sensor_event_t> &outs)
+{
+       sensor_event_t uncal_gyro_event;
+       unsigned long long diff_time;
+       float azimuth_offset;
+
+       if (event.event_type == GYROSCOPE_RAW_DATA_EVENT) {
+               diff_time = event.data.timestamp - m_time;
+
+               if (m_time && (diff_time < m_interval * MIN_DELIVERY_DIFF_FACTOR))
+                       return;
+
+               m_gyro.m_data.m_vec[0] = event.data.values[0];
+               m_gyro.m_data.m_vec[1] = event.data.values[1];
+               m_gyro.m_data.m_vec[2] = event.data.values[2];
+
+               m_gyro.m_time_stamp = event.data.timestamp;
+
+               m_enable_uncal_gyro |= GYROSCOPE_ENABLED;
+       }
+
+       if (event.event_type == FUSION_UNCAL_GYRO_EVENT) {
+               diff_time = event.data.timestamp - m_time;
+
+               if (m_time && (diff_time < m_interval * MIN_DELIVERY_DIFF_FACTOR))
+                       return;
+
+               m_fusion.m_data.m_vec[0] = event.data.values[0];
+               m_fusion.m_data.m_vec[1] = event.data.values[1];
+               m_fusion.m_data.m_vec[2] = event.data.values[2];
+
+               m_fusion.m_time_stamp = event.data.timestamp;
+
+               m_enable_uncal_gyro |= GYRO_BIAS_ENABLED;
+       }
+
+       if (m_enable_uncal_gyro == UNCAL_GYRO_BIAS_ENABLED) {
+               m_enable_uncal_gyro = 0;
+
+               m_time = get_timestamp();
+               uncal_gyro_event.sensor_id = get_id();
+               uncal_gyro_event.event_type = UNCAL_GYRO_RAW_DATA_EVENT;
+               uncal_gyro_event.data.value_count = 6;
+               uncal_gyro_event.data.timestamp = m_time;
+               uncal_gyro_event.data.accuracy = SENSOR_ACCURACY_GOOD;
+               uncal_gyro_event.data.values[0] = m_gyro.m_data.m_vec[0];
+               uncal_gyro_event.data.values[1] = m_gyro.m_data.m_vec[1];
+               uncal_gyro_event.data.values[2] = m_gyro.m_data.m_vec[2];
+
+               uncal_gyro_event.data.values[3] = m_fusion.m_data.m_vec[0];
+               uncal_gyro_event.data.values[4] = m_fusion.m_data.m_vec[1];
+               uncal_gyro_event.data.values[5] = m_fusion.m_data.m_vec[2];
+
+               push(uncal_gyro_event);
+       }
+
+       return;
+}
+
+int uncal_gyro_sensor::get_sensor_data(const unsigned int event_type, sensor_data_t &data)
+{
+       sensor_data_t fusion_data, gyro_data;
+
+       if (event_type != UNCAL_GYRO_RAW_DATA_EVENT)
+               return -1;
+
+       m_fusion_sensor->get_sensor_data(FUSION_UNCAL_GYRO_ENABLED, fusion_data);
+       m_gyro_sensor->get_sensor_data(GYROSCOPE_RAW_DATA_EVENT, gyro_data);
+
+       data.accuracy = fusion_data.accuracy;
+       data.timestamp = get_timestamp();
+       data.value_count = 6;
+       data.values[0] = gyro_data.values[0];
+       data.values[1] = gyro_data.values[1];
+       data.values[2] = gyro_data.values[2];
+       data.values[3] = fusion_data.values[0];
+       data.values[4] = fusion_data.values[1];
+       data.values[5] = fusion_data.values[2];
+
+       return 0;
+}
+
+bool uncal_gyro_sensor::get_properties(sensor_properties_s &properties)
+{
+       properties.resolution = 0.000001;
+       properties.vendor = m_vendor;
+       properties.name = SENSOR_NAME;
+       properties.min_interval = 1;
+       properties.fifo_count = 0;
+       properties.max_batch_count = 0;
+
+       return true;
+}
+
+extern "C" sensor_module* create(void)
+{
+       uncal_gyro_sensor *sensor;
+
+       try {
+               sensor = new(std::nothrow) uncal_gyro_sensor;
+       } catch (int err) {
+               ERR("Failed to create module, err: %d, cause: %s", err, strerror(err));
+               return NULL;
+       }
+
+       sensor_module *module = new(std::nothrow) sensor_module;
+       retvm_if(!module || !sensor, NULL, "Failed to allocate memory");
+
+       module->sensors.push_back(sensor);
+       return module;
+}
diff --git a/src/uncal_gyro/uncal_gyro_sensor.h b/src/uncal_gyro/uncal_gyro_sensor.h
new file mode 100644 (file)
index 0000000..dccb6f0
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * sensord
+ *
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef _UNCAL_GYRO_SENSOR_H_
+#define _UNCAL_GYRO_SENSOR_H_
+
+#include <sensor_internal.h>
+#include <virtual_sensor.h>
+#include <orientation_filter.h>
+
+class uncal_gyro_sensor : public virtual_sensor {
+public:
+       uncal_gyro_sensor();
+       virtual ~uncal_gyro_sensor();
+
+       bool init(void);
+
+       void synthesize(const sensor_event_t &event, vector<sensor_event_t> &outs);
+
+       bool add_interval(int client_id, unsigned int interval);
+       bool delete_interval(int client_id);
+       bool get_properties(sensor_properties_s &properties);
+       sensor_type_t get_type(void);
+
+       int get_sensor_data(const unsigned int event_type, sensor_data_t &data);
+
+private:
+       sensor_base *m_accel_sensor;
+       sensor_base *m_magnetic_sensor;
+       sensor_base *m_gyro_sensor;
+       sensor_base *m_fusion_sensor;
+
+       sensor_data<float> m_fusion;
+       sensor_data<float> m_gyro;
+
+       cmutex m_value_mutex;
+
+       unsigned int m_enable_uncal_gyro;
+
+       unsigned long long m_time;
+       unsigned int m_interval;
+
+       string m_vendor;
+       string m_raw_data_unit;
+       int m_default_sampling_time;
+       float m_gyro_static_bias[3];
+       int m_gyro_rotation_direction_compensation[3];
+       float m_gyro_scale;
+
+       bool on_start(void);
+       bool on_stop(void);
+};
+
+#endif /*_UNCAL_GYRO_SENSOR_H_*/
index 3005df6..06263c0 100755 (executable)
                        <PITCH_ROTATION_COMPENSATION value="-1" />
                        <ROLL_ROTATION_COMPENSATION value="-1" />
                </TILT>
+
+               <UNCAL_GYROSCOPE>
+                       <NAME value="UNCAL_GYROSCOPE_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+               </UNCAL_GYROSCOPE>
        </DEVICE>
 
        <DEVICE type="Mobile-RD-PQ">
                        <PITCH_ROTATION_COMPENSATION value="-1" />
                        <ROLL_ROTATION_COMPENSATION value="-1" />
                </TILT>
+
+               <UNCAL_GYROSCOPE>
+                       <NAME value="UNCAL_GYROSCOPE_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+               </UNCAL_GYROSCOPE>
        </DEVICE>
 
        <DEVICE type="Mobile-RD-PQ_V2">
                        <PITCH_ROTATION_COMPENSATION value="1" />
                        <ROLL_ROTATION_COMPENSATION value="-1" />
                </TILT>
+
+               <UNCAL_GYROSCOPE>
+                       <NAME value="UNCAL_GYROSCOPE_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+               </UNCAL_GYROSCOPE>
        </DEVICE>
 </VIRTUAL_SENSOR>