/*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
*/
#include <stdlib.h>
#define MIN_ON_CHANGE_SAMPLING_PERIOD_US 200000 /* For on change sensors (temperature, proximity, ALS, etc.) report we support 5 Hz max (0.2 s min period) */
#define MAX_ON_CHANGE_SAMPLING_PERIOD_US 10000000 /* 0.1 Hz min (10 s max period)*/
+#define ANDROID_MAX_FREQ 1000 /* 1000 Hz - This is how much Android requests for the fastest frequency */
/*
* About properties
* properties values happen to have its iio device name set to bmg160.
*/
-static int sensor_get_st_prop (int s, const char* sel, char val[MAX_NAME_SIZE])
+int sensor_get_st_prop (int s, const char* sel, char val[MAX_NAME_SIZE])
{
char prop_name[PROP_NAME_MAX];
char prop_val[PROP_VALUE_MAX];
int i = sensor[s].catalog_index;
const char *prefix = sensor_catalog[i].tag;
+ const char *shorthand = sensor_catalog[i].shorthand;
/* First try most specialized form, like ro.iio.anglvel.bmg160.name */
return 0;
}
+ if (shorthand[0] != '\0') {
+ /* Try with shorthand instead of prefix */
+ snprintf(prop_name, PROP_NAME_MAX, PROP_BASE, shorthand, extended_sel);
+
+ if (property_get(prop_name, prop_val, "")) {
+ strncpy(val, prop_val, MAX_NAME_SIZE-1);
+ val[MAX_NAME_SIZE-1] = '\0';
+ return 0;
+ }
+ }
/* Fall back to simple form, like ro.iio.anglvel.name */
- sprintf(prop_name, PROP_BASE, prefix, sel);
+ snprintf(prop_name, PROP_NAME_MAX, PROP_BASE, prefix, sel);
if (property_get(prop_name, prop_val, "")) {
strncpy(val, prop_val, MAX_NAME_SIZE-1);
/* We should cap returned samples accordingly... */
- switch (sensor[s].type) {
+ switch (sensor_desc[s].type) {
case SENSOR_TYPE_ACCELEROMETER: /* m/s^2 */
return 50;
if (!sensor_get_fl_prop(s, "max_freq", &max_freq))
return max_freq;
- return 1000;
+ return ANDROID_MAX_FREQ;
}
int sensor_get_cal_steps (int s)
if (strstr(quirks_buf, "noisy"))
sensor[s].quirks |= QUIRK_NOISY;
+ if (strstr(quirks_buf, "biased"))
+ sensor[s].quirks |= QUIRK_BIASED;
+
+ if (strstr(quirks_buf, "spotty"))
+ sensor[s].quirks |= QUIRK_SPOTTY;
+
+ if (strstr(quirks_buf, "no-event"))
+ sensor[s].quirks |= QUIRK_NO_EVENT_MODE;
+
+ if (strstr(quirks_buf, "no-trig"))
+ sensor[s].quirks |= QUIRK_NO_TRIG_MODE;
+
+ if (strstr(quirks_buf, "no-poll"))
+ sensor[s].quirks |= QUIRK_NO_POLL_MODE;
+
+ if (strstr(quirks_buf, "hrtimer"))
+ sensor[s].quirks |= QUIRK_HRTIMER;
+
sensor[s].quirks |= QUIRK_ALREADY_DECODED;
}
return 1; /* OK to use modified ordering map */
}
+int sensor_get_mounting_matrix (int s, float mm[9])
+{
+ int dev_num = sensor[s].dev_num, err, i;
+ char mm_path[PATH_MAX], mm_buf[100];
+ char *tmp1 = mm_buf, *tmp2;
+
+ switch (sensor[s].type) {
+ case SENSOR_TYPE_ACCELEROMETER:
+ case SENSOR_TYPE_MAGNETIC_FIELD:
+ case SENSOR_TYPE_GYROSCOPE:
+ break;
+ default:
+ return 0;
+ }
+
+ sprintf(mm_path, MOUNTING_MATRIX_PATH, dev_num);
+
+ err = sysfs_read_str(mm_path, mm_buf, sizeof(mm_buf));
+ if (err < 0)
+ return 0;
+
+ for(i = 0; i < 9; i++) {
+ float f;
+
+ f = strtof(tmp1, &tmp2);
+ if (!f && tmp1 == tmp2)
+ return 0;
+ mm[i] = f;
+ tmp1 = tmp2 + 1;
+ }
+
+ ALOGI("%s: %f %f %f %f %f %f %f %f %f\n", __func__, mm[0], mm[1], mm[2], mm[3], mm[4], mm[5], mm[6], mm[7], mm[8]);
+ return 1;
+}
+
char* sensor_get_string_type (int s)
{
- switch (sensor[s].type) {
+ switch (sensor_desc[s].type) {
case SENSOR_TYPE_ACCELEROMETER:
return SENSOR_STRING_TYPE_ACCELEROMETER;
case SENSOR_TYPE_MAGNETIC_FIELD:
return SENSOR_STRING_TYPE_MAGNETIC_FIELD;
+ case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
+ return SENSOR_STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED;
+
case SENSOR_TYPE_ORIENTATION:
return SENSOR_STRING_TYPE_ORIENTATION;
flag_t sensor_get_flags (int s)
{
- flag_t flags = 0x0;
-
- switch (sensor[s].type) {
- case SENSOR_TYPE_ACCELEROMETER:
- case SENSOR_TYPE_MAGNETIC_FIELD:
- case SENSOR_TYPE_ORIENTATION:
- case SENSOR_TYPE_GYROSCOPE:
- case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
- case SENSOR_TYPE_PRESSURE:
- flags |= SENSOR_FLAG_CONTINUOUS_MODE;
- break;
+ flag_t flags = 0;
+ switch (sensor_desc[s].type) {
case SENSOR_TYPE_LIGHT:
case SENSOR_TYPE_AMBIENT_TEMPERATURE:
case SENSOR_TYPE_TEMPERATURE:
case SENSOR_TYPE_RELATIVE_HUMIDITY:
+ case SENSOR_TYPE_STEP_COUNTER:
flags |= SENSOR_FLAG_ON_CHANGE_MODE;
break;
flags |= SENSOR_FLAG_WAKE_UP;
flags |= SENSOR_FLAG_ON_CHANGE_MODE;
break;
-
+ case SENSOR_TYPE_STEP_DETECTOR:
+ flags |= SENSOR_FLAG_SPECIAL_REPORTING_MODE;
+ break;
default:
- ALOGI("Unknown sensor");
+ break;
}
return flags;
}
static int get_cdd_freq (int s, int must)
{
- switch (sensor[s].type) {
+ switch (sensor_desc[s].type) {
case SENSOR_TYPE_ACCELEROMETER:
return (must ? 100 : 200); /* must 100 Hz, should 200 Hz, CDD compliant */
case SENSOR_TYPE_GYROSCOPE:
- case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
return (must ? 200 : 200); /* must 200 Hz, should 200 Hz, CDD compliant */
case SENSOR_TYPE_MAGNETIC_FIELD:
sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);
if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
- if (sensor[s].is_polling) {
+ if (sensor[s].mode == MODE_POLL) {
/* The must rate */
min_supported_rate = get_cdd_freq(s, 1);
}
char freqs_buf[100];
char* cursor;
float max_supported_rate = 0;
+ float max_from_prop = sensor_get_max_freq(s);
float sr;
/* continuous, on change: minimum sampling period allowed in microseconds.
sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);
if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
- if (sensor[s].is_polling) {
- /* The should rate */
- max_supported_rate = get_cdd_freq(s, 0);
+ if (sensor[s].mode == MODE_POLL) {
+ /* If we have max specified via a property use it */
+ if (max_from_prop != ANDROID_MAX_FREQ)
+ max_supported_rate = max_from_prop;
+ else
+ /* The should rate */
+ max_supported_rate = get_cdd_freq(s, 0);
}
} else {
cursor = freqs_buf;
/* Decode a single value */
sr = strtod(cursor, NULL);
- if (sr > max_supported_rate && sr <= sensor_get_max_freq(s))
+ if (sr > max_supported_rate && sr <= max_from_prop)
max_supported_rate = sr;
/* Skip digits */
OSDN Git Service
