/*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
*/
#include <stdlib.h>
case SENSOR_TYPE_ACCELEROMETER:
/* Always consider the accelerometer accurate */
data->acceleration.status = SENSOR_STATUS_ACCURACY_HIGH;
- if (sensor[s].quirks & QUIRK_NOISY)
- denoise(s, data);
+ if (sensor[s].quirks & QUIRK_BIASED)
+ calibrate_accel(s, data);
+ denoise(s, data);
break;
case SENSOR_TYPE_MAGNETIC_FIELD:
- calibrate_compass (data, &sensor[s]);
- if (sensor[s].quirks & QUIRK_NOISY)
- denoise(s, data);
+ calibrate_compass (s, data);
+ denoise(s, data);
break;
case SENSOR_TYPE_GYROSCOPE:
*/
if (sensor[s].selected_trigger !=
sensor[s].motion_trigger_name)
- calibrate_gyro(data, &sensor[s]);
+ calibrate_gyro(s, data);
/*
* For noisy sensors drop a few samples to make sure we have at least GYRO_MIN_SAMPLES events in the
* filtering queue. This improves mean and std dev.
*/
- if (sensor[s].quirks & QUIRK_NOISY) {
+ if (sensor[s].filter_type) {
if (sensor[s].selected_trigger !=
sensor[s].motion_trigger_name &&
sensor[s].event_count < GYRO_MIN_SAMPLES)
case SENSOR_TYPE_PROXIMITY:
/* These are on change sensors ; drop the sample if it has the same value as the previously reported one. */
- if (data->data[0] == sensor[s].prev_val)
+ if (data->data[0] == sensor[s].prev_val.data)
return 0;
- sensor[s].prev_val = data->data[0];
+ sensor[s].prev_val.data = data->data[0];
+ break;
+ case SENSOR_TYPE_STEP_COUNTER:
+ if (data->u64.step_counter == sensor[s].prev_val.data64)
+ return 0;
+ sensor[s].prev_val.data64 = data->u64.data[0];
break;
}
}
-float acquire_immediate_value (int s, int c)
+float acquire_immediate_float_value (int s, int c)
{
char sysfs_path[PATH_MAX];
float val;
/* Acquire a sample value for sensor s / channel c through sysfs */
- if (input_path[0]) {
+ if (sensor[s].channel[c].input_path_present) {
sprintf(sysfs_path, BASE_PATH "%s", dev_num, input_path);
ret = sysfs_read_float(sysfs_path, &val);
if (!ret)
return val * correction;
- };
+ }
- if (!raw_path[0])
+ if (!sensor[s].channel[c].raw_path_present)
return 0;
sprintf(sysfs_path, BASE_PATH "%s", dev_num, raw_path);
return (val + offset) * scale * correction;
}
+
+uint64_t acquire_immediate_uint64_value (int s, int c)
+{
+ char sysfs_path[PATH_MAX];
+ uint64_t val;
+ int ret;
+ int dev_num = sensor[s].dev_num;
+ int i = sensor[s].catalog_index;
+ const char* raw_path = sensor_catalog[i].channel[c].raw_path;
+ const char* input_path = sensor_catalog[i].channel[c].input_path;
+ float scale = sensor[s].scale ? sensor[s].scale : sensor[s].channel[c].scale;
+ float offset = sensor[s].offset;
+ int sensor_type = sensor_catalog[i].type;
+ float correction;
+
+ /* In case correction has been requested using properties, apply it */
+ correction = sensor[s].channel[c].opt_scale;
+
+ /* Acquire a sample value for sensor s / channel c through sysfs */
+
+ if (sensor[s].channel[c].input_path_present) {
+ sprintf(sysfs_path, BASE_PATH "%s", dev_num, input_path);
+ ret = sysfs_read_uint64(sysfs_path, &val);
+
+ if (!ret)
+ return val * correction;
+ };
+
+ if (!sensor[s].channel[c].raw_path_present)
+ return 0;
+
+ sprintf(sysfs_path, BASE_PATH "%s", dev_num, raw_path);
+ ret = sysfs_read_uint64(sysfs_path, &val);
+
+ if (ret == -1)
+ return 0;
+
+ return (val + offset) * scale * correction;
+}