Cleanup of unsupported sensors related code

- Removing code related to motion sensor
- cleanup of code for unused sensors

Change-Id: I8e10ad057ac007cf7576560875cb5072a9efb7df

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index f5aefe8..1cab59a 100755 (executable)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -79,7 +79,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DACCEL=%{accel_state} \
        -DGYRO=%{gyro_state} -DPROXI=%{proxi_state} -DLIGHT=%{light_state} \
        -DGEO=%{geo_state} -DPRESSURE=%{pressure_state} -DTEMPERATURE=%{temperature_state} \
        -DORIENTATION=%{orientation_state} -DGRAVITY=%{gravity_state} \
-       -DLINEAR_ACCEL=%{linear_accel_state} -DMOTION=%{motion_state} \
+       -DLINEAR_ACCEL=%{linear_accel_state} \
        -DTEST_SUITE=%{build_test_suite}
 
 make %{?jobs:-j%jobs}

diff --git a/sensor_plugins.xml.in b/sensor_plugins.xml.in
index 40faa12..f40f79a 100755 (executable)
--- a/sensor_plugins.xml.in
+++ b/sensor_plugins.xml.in
@@ -16,7 +16,6 @@
                <MODULE path = "/usr/lib/sensord/libproxi_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/liblight_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/libpressure_sensor.so"/>
-               <MODULE path = "/usr/lib/sensord/libmotion_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/liborientation_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/libgravity_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/liblinear_accel_sensor.so"/>

diff --git a/sensors.xml.in b/sensors.xml.in
index 37c1c34..3c4240b 100755 (executable)
--- a/sensors.xml.in
+++ b/sensors.xml.in
@@ -167,64 +167,6 @@
                </MODEL>
        </MAGNETIC>
 
-       <PEDO>
-               <MODEL id="MPU6051">
-                       <NAME value="MPU6051"/>
-                       <VENDOR value="Invensense"/>
-               </MODEL>
-
-               <MODEL id="MPU6500">
-                       <NAME value="MPU6500"/>
-                       <VENDOR value="Invensense"/>
-               </MODEL>
-
-               <MODEL id="MPU6515">
-                       <NAME value="MPU6515"/>
-                       <VENDOR value="Invensense"/>
-               </MODEL>
-       </PEDO>
-
-       <FLAT>
-               <MODEL id="MPU6051">
-                       <NAME value="MPU6051"/>
-                       <VENDOR value="Invensense"/>
-               </MODEL>
-
-               <MODEL id="MPU6500">
-                       <NAME value="MPU6500"/>
-                       <VENDOR value="Invensense"/>
-               </MODEL>
-
-               <MODEL id="MPU6515">
-                       <NAME value="MPU6515"/>
-                       <VENDOR value="Invensense"/>
-               </MODEL>
-       </FLAT>
-
-       <BIO>
-               <MODEL id="ADPD142">
-                       <NAME value="ADPD142"/>
-                       <VENDOR value="ANALOG DEVICES"/>
-               </MODEL>
-
-               <MODEL id="MAX86900">
-                       <NAME value="MAX86900"/>
-                       <VENDOR value="MAXIM"/>
-               </MODEL>
-       </BIO>
-
-       <BIO_HRM>
-               <MODEL id="ADPD142">
-                       <NAME value="ADPD142"/>
-                       <VENDOR value="ANALOG DEVICES"/>
-               </MODEL>
-
-               <MODEL id="MAX86900">
-                       <NAME value="MAX86900"/>
-                       <VENDOR value="MAXIM"/>
-               </MODEL>
-       </BIO_HRM>
-
        <PRESSURE>
                <MODEL id="LPS25H">
                        <NAME value="LPS25H"/>

diff --git a/src/libsensord/CMakeLists.txt b/src/libsensord/CMakeLists.txt
index bb2b159..6686be2 100755 (executable)
--- a/src/libsensord/CMakeLists.txt
+++ b/src/libsensord/CMakeLists.txt
@@ -64,7 +64,6 @@ install(FILES sensor_accel.h DESTINATION include/sensor/)
 install(FILES sensor_geomag.h DESTINATION include/sensor/)
 install(FILES sensor_light.h DESTINATION include/sensor/)
 install(FILES sensor_proxi.h DESTINATION include/sensor/)
-install(FILES sensor_motion.h DESTINATION include/sensor/)
 install(FILES sensor_gyro.h DESTINATION include/sensor/)
 install(FILES sensor_pressure.h DESTINATION include/sensor/)
 install(FILES sensor_context.h DESTINATION include/sensor/)

diff --git a/src/libsensord/client_common.cpp b/src/libsensord/client_common.cpp
index 8acb613..24932bb 100755 (executable)
--- a/src/libsensord/client_common.cpp
+++ b/src/libsensord/client_common.cpp
@@ -32,10 +32,8 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GEOMAGNETIC_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, LIGHT_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, PROXIMITY_SENSOR, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, THERMOMETER_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GYROSCOPE_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, PRESSURE_SENSOR, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, MOTION_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, CONTEXT_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GRAVITY_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, LINEAR_ACCEL_SENSOR, 0, 1),
@@ -45,25 +43,11 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_EVENT_CALIBRATION_NEEDED, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_EVENT_CHANGE_STATE, 0,1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_EVENT_CHANGE_LEVEL, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_SNAP, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_SHAKE, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_DOUBLETAP, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_PANNING, 0, 25),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_TOP_TO_BOTTOM, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_DIRECT_CALL, 0,1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_SMART_RELAY, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_TILT_TO_UNLOCK, 0,1 ),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_SMART_ALERT, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_TILT, 0, 25),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_PANNING_BROWSE, 0, 25),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_NO_MOVE, 0, 1),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, MOTION_ENGINE_EVENT_SHAKE_ALWAYS_ON, 0, 1),
 
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_EVENT_STATE_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, CONTEXT_EVENT_REPORT, 0, 1),
 
-#ifdef _RAWDATA_DEBUG
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ACCELEROMETER_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GYROSCOPE_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
@@ -75,7 +59,6 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
-#endif
 
        FILL_LOG_ELEMENT(LOG_ID_DATA, ACCELEROMETER_BASE_DATA_SET, 0, 25),
        FILL_LOG_ELEMENT(LOG_ID_DATA, GYRO_BASE_DATA_SET, 0, 25),
@@ -159,13 +142,6 @@ const char* get_data_name(unsigned int data_id)
 
 bool is_one_shot_event(unsigned int event_type)
 {
-       switch (event_type) {
-       case MOTION_ENGINE_EVENT_SMART_ALERT:
-       case MOTION_ENGINE_EVENT_SMART_RELAY:
-               return true;
-               break;
-       }
-
        return false;
 }
 
@@ -192,14 +168,6 @@ bool is_ontime_event(unsigned int event_type)
 
 bool is_panning_event(unsigned int event_type)
 {
-       switch (event_type) {
-       case MOTION_ENGINE_EVENT_PANNING:
-       case MOTION_ENGINE_EVENT_TILT:
-       case MOTION_ENGINE_EVENT_PANNING_BROWSE:
-               return true;
-               break;
-       }
-
        return false;
 }
 
@@ -209,15 +177,6 @@ bool is_single_state_event(unsigned int event_type)
        case GEOMAGNETIC_EVENT_CALIBRATION_NEEDED:
        case LIGHT_EVENT_CHANGE_LEVEL:
        case PROXIMITY_EVENT_CHANGE_STATE:
-       case MOTION_ENGINE_EVENT_SNAP:
-       case MOTION_ENGINE_EVENT_SHAKE:
-       case MOTION_ENGINE_EVENT_SHAKE_ALWAYS_ON:
-       case MOTION_ENGINE_EVENT_DOUBLETAP:
-       case MOTION_ENGINE_EVENT_TOP_TO_BOTTOM:
-       case MOTION_ENGINE_EVENT_DIRECT_CALL:
-       case MOTION_ENGINE_EVENT_SMART_RELAY:
-       case MOTION_ENGINE_EVENT_TILT_TO_UNLOCK:
-       case MOTION_ENGINE_EVENT_NO_MOVE:
                return true;
                break;
        }

diff --git a/src/libsensord/sensor_internal.h b/src/libsensord/sensor_internal.h
index 8f2efd2..bec1487 100755 (executable)
--- a/src/libsensord/sensor_internal.h
+++ b/src/libsensord/sensor_internal.h
@@ -43,7 +43,6 @@ extern "C"
 #include <sensor_geomag.h>
 #include <sensor_light.h>
 #include <sensor_proxi.h>
-#include <sensor_motion.h>
 #include <sensor_gyro.h>
 #include <sensor_pressure.h>
 #include <sensor_context.h>

diff --git a/src/libsensord/sensor_internal_deprecated.h b/src/libsensord/sensor_internal_deprecated.h
index 79388be..f0a1a74 100755 (executable)
--- a/src/libsensord/sensor_internal_deprecated.h
+++ b/src/libsensord/sensor_internal_deprecated.h
@@ -41,7 +41,6 @@ extern "C"
 #include <sensor_geomag.h>
 #include <sensor_light.h>
 #include <sensor_proxi.h>
-#include <sensor_motion.h>
 #include <sensor_gyro.h>
 #include <sensor_pressure.h>
 #include <sensor_context.h>

diff --git a/src/libsensord/sensor_motion.h b/src/libsensord/sensor_motion.h
deleted file mode 100755 (executable)
index 1fe2db5..0000000
--- a/src/libsensord/sensor_motion.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * libsensord
- *
- * Copyright (c) 2014 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_MOTION_H__
-#define __SENSOR_MOTION_H__
-
-//! Pre-defined events for the motion sensor
-//! Sensor Plugin developer can add more event to their own headers
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-enum motion_event_type {
-       MOTION_ENGINE_EVENT_SNAP                                = (MOTION_SENSOR << 16) | 0x0001,
-       MOTION_ENGINE_EVENT_SHAKE                               = (MOTION_SENSOR << 16) | 0x0002,
-       MOTION_ENGINE_EVENT_DOUBLETAP                   = (MOTION_SENSOR << 16) | 0x0004,
-       MOTION_ENGINE_EVENT_PANNING                             = (MOTION_SENSOR << 16) | 0x0008,
-       MOTION_ENGINE_EVENT_TOP_TO_BOTTOM               = (MOTION_SENSOR << 16) | 0x0010,
-       MOTION_ENGINE_EVENT_DIRECT_CALL                 = (MOTION_SENSOR << 16) | 0x0020,
-       MOTION_ENGINE_EVENT_TILT_TO_UNLOCK              = (MOTION_SENSOR << 16) | 0x0040,
-       MOTION_ENGINE_EVENT_LOCK_EXECUTE_CAMERA = (MOTION_SENSOR << 16) | 0x0080,
-       MOTION_ENGINE_EVENT_SMART_ALERT                 = (MOTION_SENSOR << 16) | 0x0100,
-       MOTION_ENGINE_EVENT_TILT                                = (MOTION_SENSOR << 16) | 0x0200,
-       MOTION_ENGINE_EVENT_PANNING_BROWSE              = (MOTION_SENSOR << 16) | 0x0400,
-       MOTION_ENGINE_EVENT_NO_MOVE                             = (MOTION_SENSOR << 16) | 0x0800,
-       MOTION_ENGINE_EVENT_SHAKE_ALWAYS_ON     = (MOTION_SENSOR << 16) | 0x1000,
-       MOTION_ENGINE_EVENT_SMART_RELAY         = (MOTION_SENSOR << 16) | 0x2000,
-};
-
-enum motion_snap_event {
-       MOTION_ENGIEN_SNAP_NONE                 = 0,
-       MOTION_ENGIEN_NEGATIVE_SNAP_X   = 1,
-       MOTION_ENGIEN_POSITIVE_SNAP_X   = 2,
-       MOTION_ENGIEN_NEGATIVE_SNAP_Y   = 3,
-       MOTION_ENGIEN_POSITIVE_SNAP_Y   = 4,
-       MOTION_ENGIEN_NEGATIVE_SNAP_Z   = 5,
-       MOTION_ENGIEN_POSITIVE_SNAP_Z   = 6,
-       MOTION_ENGIEN_SNAP_LEFT                 = MOTION_ENGIEN_NEGATIVE_SNAP_X,
-       MOTION_ENGIEN_SNAP_RIGHT                = MOTION_ENGIEN_POSITIVE_SNAP_X,
-       MOTION_ENGINE_SNAP_NONE                 = 0,
-       MOTION_ENGINE_NEGATIVE_SNAP_X   = 1,
-       MOTION_ENGINE_POSITIVE_SNAP_X   = 2,
-       MOTION_ENGINE_NEGATIVE_SNAP_Y   = 3,
-       MOTION_ENGINE_POSITIVE_SNAP_Y   = 4,
-       MOTION_ENGINE_NEGATIVE_SNAP_Z   = 5,
-       MOTION_ENGINE_POSITIVE_SNAP_Z   = 6,
-       MOTION_ENGINE_SNAP_LEFT                 = MOTION_ENGINE_NEGATIVE_SNAP_X,
-       MOTION_ENGINE_SNAP_RIGHT                = MOTION_ENGINE_POSITIVE_SNAP_X,
-};
-
-enum motion_shake_event {
-       MOTION_ENGIEN_SHAKE_NONE                = 0,
-       MOTION_ENGIEN_SHAKE_DETECTION   = 1,
-       MOTION_ENGIEN_SHAKE_CONTINUING  = 2,
-       MOTION_ENGIEN_SHAKE_FINISH              = 3,
-       MOTION_ENGINE_SHAKE_BREAK               = 4,
-       MOTION_ENGINE_SHAKE_NONE                = 0,
-       MOTION_ENGINE_SHAKE_DETECTION   = 1,
-       MOTION_ENGINE_SHAKE_CONTINUING  = 2,
-       MOTION_ENGINE_SHAKE_FINISH              = 3,
-};
-
-enum motion_doubletap_event {
-       MOTION_ENGIEN_DOUBLTAP_NONE                     = 0,
-       MOTION_ENGIEN_DOUBLTAP_DETECTION        = 1,
-       MOTION_ENGINE_DOUBLTAP_NONE                     = 0,
-       MOTION_ENGINE_DOUBLTAP_DETECTION        = 1,
-};
-
-enum motion_top_to_bottom_event {
-       MOTION_ENGIEN_TOP_TO_BOTTOM_NONE                = 0,
-       MOTION_ENGIEN_TOP_TO_BOTTOM_WAIT                = 1,
-       MOTION_ENGIEN_TOP_TO_BOTTOM_DETECTION   = 2,
-       MOTION_ENGINE_TOP_TO_BOTTOM_NONE                = 0,
-       MOTION_ENGINE_TOP_TO_BOTTOM_WAIT                = 1,
-       MOTION_ENGINE_TOP_TO_BOTTOM_DETECTION   = 2,
-};
-
-enum motion_direct_call_event_t {
-       MOTION_ENGINE_DIRECT_CALL_NONE,
-       MOTION_ENGINE_DIRECT_CALL_DETECTION,
-};
-
-enum motion_smart_relay_event_t {
-       MOTION_ENGINE_SMART_RELAY_NONE,
-       MOTION_ENGINE_SMART_RELAY_DETECTION,
-};
-
-enum motion_tilt_to_unlock_event_t {
-       MOTION_ENGINE_TILT_TO_UNLOCK_NONE,
-       MOTION_ENGINE_TILT_TO_UNLOCK_DETECTION,
-};
-
-enum motion_lock_execute_camera_event_t {
-       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_NONE,
-       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_L_DETECTION,
-       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_R_DETECTION,
-};
-
-enum motion_smart_alert_t {
-       MOTION_ENGINE_SMART_ALERT_NONE,
-       MOTION_ENGINE_SMART_ALERT_DETECTION,
-};
-
-enum motion_no_move_t {
-       MOTION_ENGINE_NO_MOVE_NONE,
-    MOTION_ENGINE_NO_MOVE_DETECTION,
-};
-
-enum motion_property_id {
-       MOTION_PROPERTY_UNKNOWN = 0,
-       MOTION_PROPERTY_CHECK_ACCEL_SENSOR,
-       MOTION_PROPERTY_CHECK_GYRO_SENSOR,
-       MOTION_PROPERTY_CHECK_GEO_SENSOR,
-       MOTION_PROPERTY_CHECK_PRIXI_SENSOR,
-       MOTION_PROPERTY_CHECK_LIGHT_SENSOR,
-       MOTION_PROPERTY_CHECK_BARO_SENSOR,
-       MOTION_PROPERTY_LCD_TOUCH_ON,
-       MOTION_PROPERTY_LCD_TOUCH_OFF,
-       MOTION_PROPERTY_CHECK_GYRO_CAL_STATUS,
-};
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-//! End of a file

diff --git a/src/libsensord/sensor_orientation.h b/src/libsensord/sensor_orientation.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/shared/sensor_common.h b/src/shared/sensor_common.h
index 10c5918..c819197 100755 (executable)
--- a/src/shared/sensor_common.h
+++ b/src/shared/sensor_common.h
@@ -49,14 +49,9 @@ typedef enum {
        GEOMAGNETIC_SENSOR,
        LIGHT_SENSOR,
        PROXIMITY_SENSOR,
-       THERMOMETER_SENSOR,
        GYROSCOPE_SENSOR,
        PRESSURE_SENSOR,
-       MOTION_SENSOR,
-       FUSION_SENSOR,
        CONTEXT_SENSOR,
-       FLAT_SENSOR,
-       AUTO_ROTATION_SENSOR,
        GRAVITY_SENSOR,
        LINEAR_ACCEL_SENSOR,
        ORIENTATION_SENSOR,