Fix type of recently introduced semi arbitrated sampling rate

[android-x86/hardware-intel-libsensors.git] / calibration.h

diff --git a/calibration.h b/calibration.h
index 6cae977..d6c8616 100644 (file)
--- a/calibration.h
+++ b/calibration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
  */
 
 #ifndef __CALIBRATION_H__
@@ -7,25 +7,10 @@
 
 #include "common.h"
 
-/* compass defines */
-#define COMPASS_CALIBRATION_PATH "/data/compass.conf"
-#define DS_SIZE 32
-#define EPSILON 0.000000001
+#define MAGN_DS_SIZE 32
 
-#define MAGNETIC_LOW 960 /* 31 micro tesla squared */
-#define MAGNETIC_HIGH 3600 /* 60 micro tesla squared */
 
-#ifdef DBG_RAW_DATA
-#define RAW_DATA_FULL_PATH "/data/raw_compass_data_full_%d.txt"
-#define RAW_DATA_SELECTED_PATH "/data/raw_compass_data_selected_%d.txt"
-#endif
-
-/* gyro defines */
-#define GYRO_MAX_ERR 0.05f
-#define GYRO_DS_SIZE 100
-#define GYRO_CALIBRATION_PATH "/data/gyro.conf"
-
-struct compass_cal {
+typedef struct {
     /* hard iron offsets */
     double offset[3][1];
 
@@ -36,24 +21,31 @@ struct compass_cal {
     double bfield;
 
     /* selection data */
-    float sample[DS_SIZE][3];
+    float sample[MAGN_DS_SIZE][3];
     unsigned int sample_count;
-};
+    float average[3];
+}
+compass_cal_t;
+
 
-struct gyro_cal {
+typedef struct {
     float bias_x, bias_y, bias_z;
     int count;
     float min_x, min_y, min_z;
     float max_x, max_y, max_z;
-};
+}
+gyro_cal_t;
+
+
+typedef double mat_input_t[MAGN_DS_SIZE][3];
+
 
-typedef double mat_input_t[DS_SIZE][3];
+void calibrate_compass  (sensors_event_t* event, sensor_info_t* info);
+void compass_read_data  (sensor_info_t* info);
+void compass_store_data (sensor_info_t* info);
 
-void calibrate_compass (struct sensors_event_t* event, struct sensor_info_t* info, int64_t time);
-void compass_read_data (struct sensor_info_t* info);
-void compass_store_data (struct sensor_info_t* info);
+void calibrate_gyro     (sensors_event_t* event, sensor_info_t* info);
+void gyro_cal_init      (sensor_info_t* info);
+void gyro_store_data    (sensor_info_t* info);
 
-void calibrate_gyro(struct sensors_event_t* event, struct sensor_info_t* info);
-void gyro_cal_init(struct sensor_info_t* info);
-void gyro_store_data (struct sensor_info_t* info);
 #endif