From: Ramasamy Date: Thu, 26 Feb 2015 06:38:56 +0000 (+0530) Subject: Fixing Geomagnetic RV test files and event representation X-Git-Tag: accepted/tizen/3.0.2015.q2/common/20150625.135020~23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c89a8100df2b209b8fac0f3613fc370b19ec43c9;p=platform%2Fcore%2Fsystem%2Fsensord.git Fixing Geomagnetic RV test files and event representation - Fixing geomagnetic rv test file - Changing geomagnetic rv event name in package Change-Id: I4f8f7ca7da9b2f7745efadbffa076955f9bbd5df --- diff --git a/src/libsensord/client_common.cpp b/src/libsensord/client_common.cpp index 2a67b15..2f2876b 100755 --- a/src/libsensord/client_common.cpp +++ b/src/libsensord/client_common.cpp @@ -62,7 +62,7 @@ log_element g_log_elements[] = { FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, TEMPERATURE_RAW_DATA_EVENT, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), - FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), + FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RV_RAW_DATA_EVENT, 0, 10), FILL_LOG_ELEMENT(LOG_ID_DATA, LIGHT_BASE_DATA_SET, 0, 25), FILL_LOG_ELEMENT(LOG_ID_DATA, LIGHT_LUX_DATA_SET, 0, 25), diff --git a/src/libsensord/sensor_geomagnetic_rv.h b/src/libsensord/sensor_geomagnetic_rv.h index 3deaaa2..8343a42 100755 --- a/src/libsensord/sensor_geomagnetic_rv.h +++ b/src/libsensord/sensor_geomagnetic_rv.h @@ -37,7 +37,7 @@ extern "C" */ enum geomagnetic_rv_event_type { - GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME = (GEOMAGNETIC_RV_SENSOR << 16) | 0x0001, + GEOMAGNETIC_RV_RAW_DATA_EVENT = (GEOMAGNETIC_RV_SENSOR << 16) | 0x0001, }; /** diff --git a/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp b/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp index 1fb050b..ab60019 100755 --- a/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp +++ b/src/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp @@ -71,7 +71,7 @@ geomagnetic_rv_sensor::geomagnetic_rv_sensor() cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); m_name = string(SENSOR_NAME); - register_supported_event(GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME); + register_supported_event(GEOMAGNETIC_RV_RAW_DATA_EVENT); m_enable_geomagnetic_rv = 0; if (!config.get(SENSOR_TYPE_GEOMAGNETIC_RV, ELEMENT_VENDOR, m_vendor)) { @@ -263,7 +263,7 @@ void geomagnetic_rv_sensor::synthesize(const sensor_event_t& event, vector quaternion_geo_rv; - if (event_type != GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME) + if (event_type != GEOMAGNETIC_RV_RAW_DATA_EVENT) return -1; m_accel_sensor->get_sensor_data(ACCELEROMETER_RAW_DATA_EVENT, accel_data); diff --git a/src/server/command_worker.cpp b/src/server/command_worker.cpp index 8b43d98..13e4d3b 100755 --- a/src/server/command_worker.cpp +++ b/src/server/command_worker.cpp @@ -858,7 +858,7 @@ void insert_priority_list(unsigned int event_type) priority_list.insert(GEOMAGNETIC_RAW_DATA_EVENT); } - if (event_type == GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME) { + if (event_type == GEOMAGNETIC_RV_RAW_DATA_EVENT) { priority_list.insert(ACCELEROMETER_RAW_DATA_EVENT); priority_list.insert(GEOMAGNETIC_RAW_DATA_EVENT); } diff --git a/test/src/auto_test.c b/test/src/auto_test.c index 99a63c0..dfe322f 100644 --- a/test/src/auto_test.c +++ b/test/src/auto_test.c @@ -226,6 +226,9 @@ int main(int argc, char **argv) result = check_sensor_api(ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, interval); fprintf(fp, "Rotation Vector - RAW_DATA_REPORT_ON_TIME - %d\n", result); + result = check_sensor_api(GEOMAGNETIC_RV_RAW_DATA_EVENT, interval); + fprintf(fp, "Geomagnetic Rotation Vector - RAW_DATA_REPORT_ON_TIME - %d\n", result); + result = check_sensor_api(TEMPERATURE_RAW_DATA_EVENT, interval); fprintf(fp, "Temperature - RAW_DATA_REPORT_ON_TIME - %d\n", result); diff --git a/test/src/tc-common.c b/test/src/tc-common.c index 3aa57b6..edee1ba 100644 --- a/test/src/tc-common.c +++ b/test/src/tc-common.c @@ -44,7 +44,7 @@ void usage() printf("[gravity] "); printf("[linear_accel] "); printf("[rotation_vector] "); - printf("[gaming_rotation_vector] "); + printf("[geomagnetic_rv] "); printf("[light]\n"); printf("event:"); printf("[RAW_DATA_REPORT_ON_TIME]\n"); @@ -107,7 +107,7 @@ unsigned int get_event_driven(sensor_type_t sensor_type, char str[]) break; case GEOMAGNETIC_RV_SENSOR: if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0) - return GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME; + return GEOMAGNETIC_RV_RAW_DATA_EVENT; break; default: return -1; @@ -153,7 +153,7 @@ void callback(sensor_t sensor, unsigned int event_type, sensor_data_t *data, voi printf("Rotation vector [%lld] [%6.6f] [%6.6f] [%6.6f] [%6.6f]\n\n", data->timestamp, data->values[0], data->values[1], data->values[2], data->values[3]); break; case GEOMAGNETIC_RV_SENSOR: - printf("Geomagnetic rotation vector [%lld] [%6.6f] [%6.6f] [%6.6f] [%6.6f]\n\n", data->timestamp, data->values[0], data->values[1], data->values[2], data->values[3]); + printf("Geomagnetic RV [%lld] [%6.6f] [%6.6f] [%6.6f] [%6.6f]\n\n", data->timestamp, data->values[0], data->values[1], data->values[2], data->values[3]); break; default: return; @@ -211,9 +211,9 @@ int main(int argc, char **argv) sensor_type = ROTATION_VECTOR_SENSOR; event = ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME; } - else if (strcmp(argv[1], "gaming_rotation_vector") == 0) { + else if (strcmp(argv[1], "geomagnetic_rv") == 0) { sensor_type = GEOMAGNETIC_RV_SENSOR; - event = GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME; + event = GEOMAGNETIC_RV_RAW_DATA_EVENT; } else if (strcmp(argv[1], "light") == 0) { sensor_type = LIGHT_SENSOR;