[compilation] Provide fallback SENSOR_TYPE_STEP_COUNTER value. MER#1749

If android sensors.h available at build time does not define step counter sensor type, compilation will fail. Make sure SENSOR_TYPE_STEP_COUNTER is defined where needed. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
sailfishos · Feb 8, 2017 · fcd8fa5 · fcd8fa5
1 parent b61c496
commit fcd8fa5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
@@ -26,6 +26,10 @@
 #include "datatypes/utils.h"
 #include <hardware/sensors.h>
 
+#ifndef SENSOR_TYPE_STEP_COUNTER
+#define SENSOR_TYPE_STEP_COUNTER (19)
+#endif
+
 HybrisStepCounterAdaptor::HybrisStepCounterAdaptor(const QString& id) :
     HybrisAdaptor(id, SENSOR_TYPE_STEP_COUNTER)
 {

diff --git a/core/hybrisadaptor.cpp b/core/hybrisadaptor.cpp
@@ -72,7 +72,9 @@
 //#define SENSOR_TYPE_GYROSCOPE_UNCALIBRATED (16)
 //#define SENSOR_TYPE_SIGNIFICANT_MOTION (17)
 //#define SENSOR_TYPE_STEP_DETECTOR (18)
-//#define SENSOR_TYPE_STEP_COUNTER (19)
+#ifndef SENSOR_TYPE_STEP_COUNTER
+#define SENSOR_TYPE_STEP_COUNTER (19)
+#endif
 //#define SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR (20)
 
 Q_GLOBAL_STATIC(HybrisManager, hybrisManager)