current revision

sensors/android/AccelerometerSensorAndroid.h

@@ -43,6 +43,10 @@ public:
 
 	}
 
+	bool isRunning() const override {
+		return acc.isActive();
+	}
+
 	void stop() override {
 		throw "TODO";
 	}

sensors/android/BarometerSensorAndroid.h

@@ -33,7 +33,7 @@ public:
 	void start() override {
 
 		auto onSensorData = [&] () {
-			BarometerData data(baro.reading()->pressure());
+			BarometerData data(baro.reading()->pressure() / 100.0f);		// convert Pa to hPa
 			informListeners(data);
 		};
 
@@ -42,6 +42,10 @@ public:
 
 	}
 
+	bool isRunning() const override {
+		return baro.isActive();
+	}
+
 	void stop() override {
 		throw "TODO";
 	}

sensors/android/GyroscopeSensorAndroid.h

@@ -46,6 +46,10 @@ public:
 
 	}
 
+	bool isRunning() const override {
+		return gyro.isActive();
+	}
+
 	void stop() override {
 		throw "TODO";
 	}

sensors/android/WiFiSensorAndroid.cpp

@@ -8,8 +8,7 @@ extern "C" {
 	JNIEXPORT void JNICALL Java_indoor_java_WiFi_onScanComplete(JNIEnv* env, jobject jobj, jbyteArray arrayID) {
 		(void) env; (void) jobj;
 		jsize length = env->GetArrayLength(arrayID);
-		jboolean isCopy;
-		jbyte* data = env->GetByteArrayElements(arrayID, &isCopy);
+		jbyte* data = env->GetByteArrayElements(arrayID, 0);
 		std::string str((char*)data, length);
 		env->ReleaseByteArrayElements(arrayID, data, JNI_ABORT);
 		WiFiSensorAndroid::get().handle(str);

sensors/android/WiFiSensorAndroid.h

@@ -16,6 +16,8 @@ private:
 	/** hidden ctor. use singleton! */
 	WiFiSensorAndroid() {;}
 
+	bool started = false;
+
 public:
 
 	/** singleton access */
@@ -28,7 +30,8 @@ public:
 
 		// start scanning
 		int res = QAndroidJniObject::callStaticMethod<int>("indoor/java/WiFi", "start", "()I");
-		(void) res;
+		if (res != 0) {throw Exception("error while starting WiFi");}
+		started = true;
 
 	}
 
@@ -36,8 +39,12 @@ public:
 		throw "todo";
 	}
 
+	bool isRunning() const override {
+		return started;
+	}
+
 	/** called from java. handle the given incoming scan result */
-	void handle(const std::string& data) {
+	void handle(const std::string data) {
 
 		// to-be-constructed sensor data
 		WiFiMeasurements sensorData;