started to add ble functions

added ble as sensor to java and c++ added sensorlistener for ble added ble to observation and onDataSensor in filter started to work on ble fingerprints for optimization
2019-06-05 18:04:31 +02:00
parent b9b9d8f9ac
commit 20ae2f5c2a
23 changed files with 1341 additions and 1152 deletions
--- a/yasmin.pro
+++ b/yasmin.pro
@@ -7,27 +7,27 @@ QT += qml opengl svg

 CONFIG+=ANDROID DEFINES+=ANDROID
 ANDROID {
-    QT += androidextras
-    QT += sensors
-    QT += positioning
+QT += androidextras
+QT += sensors
+QT += positioning

-    #http://stackoverflow.com/questions/28391685/opencv-with-hard-float-support-for-android#28393545
-    # wasn't faster... and seems dangerous :P
-    #QMAKE_CXXFLAGS -= -mfpu=vfp
-    #QMAKE_CFLAGS -= -mfpu=vfp
-    #QMAKE_CXXFLAGS += -mfpu=neon -funsafe-math-optimizations
-    #QMAKE_CFLAGS += -mfpu=neon -funsafe-math-optimizations
+#http://stackoverflow.com/questions/28391685/opencv-with-hard-float-support-for-android#28393545
+# wasn't faster... and seems dangerous :P
+#QMAKE_CXXFLAGS -= -mfpu=vfp
+#QMAKE_CFLAGS -= -mfpu=vfp
+#QMAKE_CXXFLAGS += -mfpu=neon -funsafe-math-optimizations
+#QMAKE_CFLAGS += -mfpu=neon -funsafe-math-optimizations

-    # wasn't faster..
-    #QMAKE_CXXFLAGS += -mtune=cortex-a57
-    #QMAKE_CFLAGS += -mtune=cortex-a57
+# wasn't faster..
+#QMAKE_CXXFLAGS += -mtune=cortex-a57
+#QMAKE_CFLAGS += -mtune=cortex-a57

-    QMAKE_CXXFLAGS += -O2
-    #QMAKE_CFLAGS += -O3
+QMAKE_CXXFLAGS += -O2
+#QMAKE_CFLAGS += -O3

-    #QMAKE_CXXFLAGS_DEBUG -= -O2
-    #QMAKE_CXXFLAGS_DEBUG -= -O3
-    #QMAKE_CXXFLAGS_DEBUG += -O0
+#QMAKE_CXXFLAGS_DEBUG -= -O2
+#QMAKE_CXXFLAGS_DEBUG -= -O3
+#QMAKE_CXXFLAGS_DEBUG += -O0

 }

@@ -49,8 +49,8 @@ CONFIG += c++11
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/_android

 INCLUDEPATH += \
-    ../ \
-    ./lib/
+../ \
+./lib/


 # linux desktop wifi
@@ -58,33 +58,35 @@ INCLUDEPATH += \
 #LIBS += -lnl-genl-3 -lnl-3

 OTHER_FILES += \
-	_android/src/WiFi.java \
-        _android/src/MyActivity.java \
-	_android/AndroidManifest.xml
+_android/src/WiFi.java \
+_android/src/MyActivity.java \
+_android/AndroidManifest.xml \
+_android/src/BLE.java

 SOURCES += \
-	main.cpp \
-    lib/gpc/gpc.cpp \
-	../Indoor/lib/tinyxml/tinyxml2.cpp \
-	../Indoor/lib/Recast/*.cpp\
-    ui/menu/MainMenu.cpp \
-    ui/MainWindow.cpp \
-    Controller.cpp \
-    ui/dialog/LoadSetupDialog.cpp \
-    ui/debug/SensorDataWidget.cpp \
-    ui/debug/plot/PlottWidget.cpp \
-    ui/debug/PlotTurns.cpp \
-    ui/debug/PlotWiFiScan.cpp \
-    sensors/android/WiFiSensorAndroid.cpp \
-    sensors/linux/WiFiSensorLinuxC.c \
-    ui/debug/InfoWidget.cpp \
-    ui/map/3D/MapView3D.cpp \
-    ui/map/2D/MapView2D.cpp \
-    tools/calibration/WiFiCalibrationScanDialog.cpp \
-    ui/debug/PlotGPS.cpp \
-    nav/NavController.cpp \
-    nav/mesh/NavControllerMesh.cpp \
-    nav/grid/NavControllerGrid.cpp
+main.cpp \
+lib/gpc/gpc.cpp \
+../Indoor/lib/tinyxml/tinyxml2.cpp \
+../Indoor/lib/Recast/*.cpp\
+ui/menu/MainMenu.cpp \
+ui/MainWindow.cpp \
+Controller.cpp \
+ui/dialog/LoadSetupDialog.cpp \
+ui/debug/SensorDataWidget.cpp \
+ui/debug/plot/PlottWidget.cpp \
+ui/debug/PlotTurns.cpp \
+ui/debug/PlotWiFiScan.cpp \
+sensors/android/WiFiSensorAndroid.cpp \
+sensors/linux/WiFiSensorLinuxC.c \
+ui/debug/InfoWidget.cpp \
+ui/map/3D/MapView3D.cpp \
+ui/map/2D/MapView2D.cpp \
+tools/calibration/WiFiCalibrationScanDialog.cpp \
+ui/debug/PlotGPS.cpp \
+nav/NavController.cpp \
+nav/mesh/NavControllerMesh.cpp \
+nav/grid/NavControllerGrid.cpp \
+    sensors/android/BLESensorAndroid.cpp

 RESOURCES += qml.qrc

@@ -102,113 +104,116 @@ INSTALLS += target
 #    android-sources/src/WiFi.java

 HEADERS += \
-	lib/gpc/gpc.h \
-    sensors/linux/WiFiSensorLinux.h \
-    sensors/android/WiFiSensorAndroid.h \
-    sensors/StepSensor.h \
-    sensors/TurnSensor.h \
-    sensors/AccelerometerSensor.h \
-    sensors/GyroscopeSensor.h \
-    sensors/BarometerSensor.h \
-    sensors/android/AccelerometerSensorAndroid.h \
-    sensors/android/GyroscopeSensorAndroid.h \
-    sensors/android/BarometerSensorAndroid.h \
-    sensors/dummy/AccelerometerSensorDummy.h \
-    sensors/dummy/GyroscopeSensorDummy.h \
-    sensors/dummy/BarometerSensorDummy.h \
-    sensors/Sensor.h \
-    sensors/SensorFactory.h \
-    sensors/WiFiSensor.h \
-	misc/Debug.h \
-	misc/fixc11.h \
-    sensors/dummy/WiFiSensorDummy.h \
-    lib/gpc/Polygon.h \
-    ui/map/3D/FloorRenderer.h \
-    ui/map/3D/gl/GL.h \
-    ui/map/3D/gl/GLHelper.h \
-    ui/map/3D/gl/GLLines.h \
-    ui/map/3D/gl/GLTriangles.h \
-    ui/map/3D/elements/Doors.h \
-    ui/map/3D/elements/Ground.h \
-    ui/map/3D/elements/Handrails.h \
-    ui/map/3D/elements/Path.h \
-    ui/map/3D/elements/Stairs.h \
-    ui/map/3D/elements/Walls.h \
-    ui/map/3D/gl/GLPoints.h \
-    ui/map/3D/elements/ColorPoints.h \
-    ui/map/3D/RenderParams.h \
-    ui/map/3D/Renderable.h \
-    ui/map/3D/gl/Shader.h \
-    ui/map/3D/elements/Object.h \
-    ui/Icons.h \
-    ui/MainWindow.h \
-    Controller.h \
-    ui/menu/MainMenu.h \
-    ui/dialog/LoadSetupDialog.h \
-    ui/debug/plot/Axes.h \
-    ui/debug/plot/Plot.h \
-    ui/debug/plot/Data.h \
-    ui/debug/plot/Range.h \
-    nav/NavController.h \
-    sensors/dummy/RandomSensor.h \
-    ui/debug/SensorDataWidget.h \
-    ui/debug/plot/PlottWidget.h \
-    ui/debug/PlotTurns.h \
-    ui/debug/PlotWiFiScan.h \
-    sensors/linux/WiFiSensorLinuxC.h \
-    sensors/offline/SensorFactoryOffline.h \
-    sensors/dummy/SensorFactoryDummy.h \
-    sensors/android/SensorFactoryAndroid.h \
-    Settings.h \
-    sensors/offline/AllInOneSensor.h \
-    sensors/ActivitySensor.h \
-    ui/LoggerUI.h \
-    ui/debug/InfoWidget.h \
-    ui/UIHelper.h \
-    ui/map/3D/MapView3D.h \
-    ui/map/2D/MapView2D.h \
-    ui/map/2D/Floor2D.h \
-    ui/map/2D/Scaler2D.h \
-    ui/map/2D/Renderable2D.h \
-    ui/map/2D/RenderParams2D.h \
-    ui/map/2D/ColorPoints2D.h \
-    ui/map/2D/Path2D.h \
-    ui/map/2D/WiFiCalibTool.h \
-    ui/map/2D/HasSelectableNodes.h \
-    tools/calibration/WiFiCalibrationDataModel.h \
-    tools/calibration/WiFiCalibrationScanDialog.h \
-    tests/RuntimeTests.h \
-    ipin/StepLogger.h \
-    ipin/Scaler.h \
-    ipin/Config.h \
-    ipin/IPINHelper.h \
-    nav/NavControllerListener.h \
-    ipin/StepLoggerWrapper.h \
-    ipin/StepLoggerWrapperAndroid.h \
-    sensors/GPSSensor.h \
-    sensors/android/GPSSensorAndroid.h \
-    sensors/CompassSensor.h \
-    sensors/android/CompassSensorAndroid.h \
-    sensors/dummy/CompassSensorDummy.h \
-    sensors/dummy/GPSSensorDummy.h \
-    ui/debug/PlotGPS.h \
-    sensors/SensorWriter.h \
-    nav/mesh/State.h \
-    nav/mesh/NavControllerMesh.h \
-    nav/mesh/FilterMesh.h \
-    nav/grid/Filter.h \
-    nav/grid/NavControllerGrid.h \
-    nav/grid/Node.h \
-    nav/grid/NodeResampling.h \
-    nav/grid/RegionalResampling.h \
-    nav/Observation.h \
-    nav/grid/State.h \
-    nav/CurEst.h
+lib/gpc/gpc.h \
+sensors/linux/WiFiSensorLinux.h \
+sensors/android/WiFiSensorAndroid.h \
+sensors/StepSensor.h \
+sensors/TurnSensor.h \
+sensors/AccelerometerSensor.h \
+sensors/GyroscopeSensor.h \
+sensors/BarometerSensor.h \
+sensors/android/AccelerometerSensorAndroid.h \
+sensors/android/GyroscopeSensorAndroid.h \
+sensors/android/BarometerSensorAndroid.h \
+sensors/android/BLESensorAndroid.h \
+sensors/dummy/AccelerometerSensorDummy.h \
+sensors/dummy/GyroscopeSensorDummy.h \
+sensors/dummy/BarometerSensorDummy.h \
+sensors/Sensor.h \
+sensors/SensorFactory.h \
+sensors/WiFiSensor.h \
+misc/Debug.h \
+misc/fixc11.h \
+sensors/dummy/WiFiSensorDummy.h \
+lib/gpc/Polygon.h \
+ui/map/3D/FloorRenderer.h \
+ui/map/3D/gl/GL.h \
+ui/map/3D/gl/GLHelper.h \
+ui/map/3D/gl/GLLines.h \
+ui/map/3D/gl/GLTriangles.h \
+ui/map/3D/elements/Doors.h \
+ui/map/3D/elements/Ground.h \
+ui/map/3D/elements/Handrails.h \
+ui/map/3D/elements/Path.h \
+ui/map/3D/elements/Stairs.h \
+ui/map/3D/elements/Walls.h \
+ui/map/3D/gl/GLPoints.h \
+ui/map/3D/elements/ColorPoints.h \
+ui/map/3D/RenderParams.h \
+ui/map/3D/Renderable.h \
+ui/map/3D/gl/Shader.h \
+ui/map/3D/elements/Object.h \
+ui/Icons.h \
+ui/MainWindow.h \
+Controller.h \
+ui/menu/MainMenu.h \
+ui/dialog/LoadSetupDialog.h \
+ui/debug/plot/Axes.h \
+ui/debug/plot/Plot.h \
+ui/debug/plot/Data.h \
+ui/debug/plot/Range.h \
+nav/NavController.h \
+sensors/dummy/RandomSensor.h \
+ui/debug/SensorDataWidget.h \
+ui/debug/plot/PlottWidget.h \
+ui/debug/PlotTurns.h \
+ui/debug/PlotWiFiScan.h \
+sensors/linux/WiFiSensorLinuxC.h \
+sensors/offline/SensorFactoryOffline.h \
+sensors/dummy/SensorFactoryDummy.h \
+sensors/android/SensorFactoryAndroid.h \
+Settings.h \
+sensors/offline/AllInOneSensor.h \
+sensors/ActivitySensor.h \
+ui/LoggerUI.h \
+ui/debug/InfoWidget.h \
+ui/UIHelper.h \
+ui/map/3D/MapView3D.h \
+ui/map/2D/MapView2D.h \
+ui/map/2D/Floor2D.h \
+ui/map/2D/Scaler2D.h \
+ui/map/2D/Renderable2D.h \
+ui/map/2D/RenderParams2D.h \
+ui/map/2D/ColorPoints2D.h \
+ui/map/2D/Path2D.h \
+ui/map/2D/WiFiCalibTool.h \
+ui/map/2D/HasSelectableNodes.h \
+tools/calibration/WiFiCalibrationDataModel.h \
+tools/calibration/WiFiCalibrationScanDialog.h \
+tests/RuntimeTests.h \
+ipin/StepLogger.h \
+ipin/Scaler.h \
+ipin/Config.h \
+ipin/IPINHelper.h \
+nav/NavControllerListener.h \
+ipin/StepLoggerWrapper.h \
+ipin/StepLoggerWrapperAndroid.h \
+sensors/GPSSensor.h \
+sensors/android/GPSSensorAndroid.h \
+sensors/CompassSensor.h \
+sensors/android/CompassSensorAndroid.h \
+sensors/dummy/CompassSensorDummy.h \
+sensors/dummy/GPSSensorDummy.h \
+ui/debug/PlotGPS.h \
+sensors/SensorWriter.h \
+nav/mesh/State.h \
+nav/mesh/NavControllerMesh.h \
+nav/mesh/FilterMesh.h \
+nav/grid/Filter.h \
+nav/grid/NavControllerGrid.h \
+nav/grid/Node.h \
+nav/grid/NodeResampling.h \
+nav/grid/RegionalResampling.h \
+nav/Observation.h \
+nav/grid/State.h \
+nav/CurEst.h \
+sensors/BLESensor.h \
+    tools/calibration/BLECalibrationDataModel.h

 DISTFILES += \
-    android-sources/src/MyActivity.java \
-	res/gl/vertex1.glsl \
-	res/gl/fragment1.glsl \
-    res/gl/tex/empty_normals.jpg \
-    _android/src/aidl/it/cnr/isti/steplogger/IStepLoggerService.aidl \
-    _android/src/StepLoggerClient.java
+android-sources/src/MyActivity.java \
+res/gl/vertex1.glsl \
+res/gl/fragment1.glsl \
+res/gl/tex/empty_normals.jpg \
+_android/src/aidl/it/cnr/isti/steplogger/IStepLoggerService.aidl \
+_android/src/StepLoggerClient.java