Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb43020_sensor_alias' into 'master'
Deal with android sensor type aliasing changes

See merge request mer-core/sensorfw!30
  • Loading branch information
spiiroin committed Oct 1, 2018
2 parents 49247f3 + 2d0ed57 commit 8a77417
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/hybrisadaptor.cpp
Expand Up @@ -47,10 +47,10 @@
#define SENSOR_TYPE_ACCELEROMETER (1)
#endif
#ifndef SENSOR_TYPE_GEOMAGNETIC_FIELD
#define SENSOR_TYPE_GEOMAGNETIC_FIELD (2)
#define SENSOR_TYPE_GEOMAGNETIC_FIELD (2) // alias for SENSOR_TYPE_MAGNETIC_FIELD
#endif
#ifndef SENSOR_TYPE_MAGNETIC_FIELD
#define SENSOR_TYPE_MAGNETIC_FIELD SENSOR_TYPE_GEOMAGNETIC_FIELD
#define SENSOR_TYPE_MAGNETIC_FIELD (2) // alias for SENSOR_TYPE_GEOMAGNETIC_FIELD
#endif
#ifndef SENSOR_TYPE_ORIENTATION
#define SENSOR_TYPE_ORIENTATION (3)
Expand Down

0 comments on commit 8a77417

Please sign in to comment.