#define IIO_SENSOR_HAL_VERSION 1
+#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)*/
+
/*
* 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];
switch (sensor[s].type) {
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- strcpy(buf, sensor[sensor[s].base_idx[0]].friendly_name);
+ strcpy(buf, sensor[sensor[s].base[0]].friendly_name);
snprintf(sensor[s].friendly_name,
MAX_NAME_SIZE,
"%s %s", "Uncalibrated", buf);
switch (sensor[s].type) {
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- return sensor[sensor[s].base_idx[0]].vendor_name;
+ return sensor[sensor[s].base[0]].vendor_name;
break;
default:
float sensor_get_max_range (int s)
{
-
- if (sensor[s].is_virtual) {
+ if (sensor[s].is_virtual) {
switch (sensor[s].type) {
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- return sensor[sensor[s].base_idx[0]].max_range;
+ return sensor[sensor[s].base[0]].max_range;
default:
return 0.0;
return 100;
default:
- return 0.0;
+ return 0;
}
}
switch (sensor[s].type) {
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- return sensor[sensor[s].base_idx[0]].resolution;
+ return sensor[sensor[s].base[0]].resolution;
default:
return 0;
switch (sensor[s].type) {
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- return sensor[sensor[s].base_idx[0]].power;
+ return sensor[sensor[s].base[0]].power;
default:
return 0;
int i;
int count = sensor_catalog[sensor[s].catalog_index].num_channels;
- if (sensor_get_st_prop(s, "order", buf))
+ if (sensor_get_st_prop(s, "order", buf))
return 0; /* No order property */
/* Assume ASCII characters, in the '0'..'9' range */
return 1; /* OK to use modified ordering map */
}
+
char* sensor_get_string_type (int s)
{
switch (sensor[s].type) {
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;
+ flag_t flags = 0;
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;
-
case SENSOR_TYPE_LIGHT:
case SENSOR_TYPE_AMBIENT_TEMPERATURE:
case SENSOR_TYPE_TEMPERATURE:
break;
default:
- ALOGI("Unknown sensor");
+ break;
}
return flags;
}
-int get_cdd_freq (int s, int must)
+
+static int get_cdd_freq (int s, int must)
{
switch (sensor[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:
return (must ? 10 : 50); /* must 10 Hz, should 50 Hz, CDD compliant */
+
case SENSOR_TYPE_LIGHT:
case SENSOR_TYPE_AMBIENT_TEMPERATURE:
case SENSOR_TYPE_TEMPERATURE:
return (must ? 1 : 2); /* must 1 Hz, should 2Hz, not mentioned in CDD */
+
default:
- return 0;
+ return 1; /* Use 1 Hz by default, e.g. for proximity */
}
}
-/* This value is defined only for continuous mode and on-change sensors. It is the delay between
- * two sensor events corresponding to the lowest frequency that this sensor supports. When lower
- * frequencies are requested through batch()/setDelay() the events will be generated at this
- * frequency instead. It can be used by the framework or applications to estimate when the batch
- * FIFO may be full.
- *
- * NOTE: 1) period_ns is in nanoseconds where as maxDelay/minDelay are in microseconds.
- * continuous, on-change: maximum sampling period allowed in microseconds.
- * one-shot, special : 0
- * 2) maxDelay should always fit within a 32 bit signed integer. It is declared as 64 bit
- * on 64 bit architectures only for binary compatibility reasons.
- * Availability: SENSORS_DEVICE_API_VERSION_1_3
+/*
+ * This value is defined only for continuous mode and on-change sensors. It is the delay between two sensor events corresponding to the lowest frequency that
+ * this sensor supports. When lower frequencies are requested through batch()/setDelay() the events will be generated at this frequency instead. It can be used
+ * by the framework or applications to estimate when the batch FIFO may be full. maxDelay should always fit within a 32 bit signed integer. It is declared as
+ * 64 bit on 64 bit architectures only for binary compatibility reasons. Availability: SENSORS_DEVICE_API_VERSION_1_3
*/
max_delay_t sensor_get_max_delay (int s)
{
float rate_cap;
float sr;
- /* continuous, on-change: maximum sampling period allowed in microseconds.
+ /*
+ * continuous, on-change: maximum sampling period allowed in microseconds.
* one-shot, special : 0
*/
- if (REPORTING_MODE(sensor_desc[s].flags) == SENSOR_FLAG_ONE_SHOT_MODE ||
- REPORTING_MODE(sensor_desc[s].flags) == SENSOR_FLAG_SPECIAL_REPORTING_MODE)
- return 0;
+ switch (REPORTING_MODE(sensor_desc[s].flags)) {
+ case SENSOR_FLAG_ONE_SHOT_MODE:
+ case SENSOR_FLAG_SPECIAL_REPORTING_MODE:
+ return 0;
+
+ case SENSOR_FLAG_ON_CHANGE_MODE:
+ return MAX_ON_CHANGE_SAMPLING_PERIOD_US;
+
+ default:
+ break;
+ }
if (sensor[s].is_virtual) {
switch (sensor[s].type) {
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- return sensor_desc[sensor[s].base_idx[0]].maxDelay;
+ return sensor_desc[sensor[s].base[0]].maxDelay;
default:
return 0;
}
sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);
if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
- /* If poll mode sensor */
- if (!sensor[s].num_channels) {
+ if (sensor[s].is_polling) {
/* The must rate */
min_supported_rate = get_cdd_freq(s, 1);
}
return 0;
/* Return microseconds */
- return (max_delay_t)(1000000.0 / min_supported_rate);
+ return (max_delay_t) (1000000.0 / min_supported_rate);
}
-/* this value depends on the reporting mode:
- *
- * continuous: minimum sample period allowed in microseconds
- * on-change : 0
- * one-shot :-1
- * special : 0, unless otherwise noted
- */
-int32_t sensor_get_min_delay(int s)
+
+int32_t sensor_get_min_delay (int s)
{
char avail_sysfs_path[PATH_MAX];
int dev_num = sensor[s].dev_num;
float max_supported_rate = 0;
float sr;
- /* continuous: minimum sampling period allowed in microseconds.
- * on-change, special : 0
- * one-shot :-1
+ /* continuous, on change: minimum sampling period allowed in microseconds.
+ * special : 0, unless otherwise noted
+ * one-shot:-1
*/
- if (REPORTING_MODE(sensor_desc[s].flags) == SENSOR_FLAG_ON_CHANGE_MODE ||
- REPORTING_MODE(sensor_desc[s].flags) == SENSOR_FLAG_SPECIAL_REPORTING_MODE)
- return 0;
+ switch (REPORTING_MODE(sensor_desc[s].flags)) {
+ case SENSOR_FLAG_ON_CHANGE_MODE:
+ return MIN_ON_CHANGE_SAMPLING_PERIOD_US;
- if (REPORTING_MODE(sensor_desc[s].flags) == SENSOR_FLAG_ONE_SHOT_MODE)
- return -1;
+ case SENSOR_FLAG_SPECIAL_REPORTING_MODE:
+ return 0;
+
+ case SENSOR_FLAG_ONE_SHOT_MODE:
+ return -1;
+
+ default:
+ break;
+ }
if (sensor[s].is_virtual) {
switch (sensor[s].type) {
case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
- return sensor_desc[sensor[s].base_idx[0]].minDelay;
+ return sensor_desc[sensor[s].base[0]].minDelay;
default:
return 0;
}
sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);
if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
- /* If poll mode sensor */
- if (!sensor[s].num_channels) {
+ if (sensor[s].is_polling) {
/* The should rate */
max_supported_rate = get_cdd_freq(s, 0);
}
return 0;
/* Return microseconds */
- return (int32_t)(1000000.0 / max_supported_rate);
+ return (int32_t) (1000000.0 / max_supported_rate);
}