[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.json.prv
^
|
@@ -1,14 +0,0 @@
-{
- "role": {
- "exeName":"/usr/sbin/sensorfwd",
- "type": "privileged",
- "allowedNames": ["com.nokia.SensorService"]
- },
- "permissions": [
- {
- "service":"com.nokia.SensorService",
- "inbound":["*"],
- "outbound":["*"]
- }
- ]
-}
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.service.prv
^
|
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.SensorService
-Exec=/usr/sbin/sensrofwd
-Type=static
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.pro.user
^
|
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.4.1, 2016-10-26T11:47:56. -->
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{272d5cea-eec6-4d5f-9f49-7f2059a976c7}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">true</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap"/>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.4.2 GCC 64bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.4.2 GCC 64bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.54.gcc_64_kit</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lpotter/builds/build-lidsensoradaptor-evdev-Desktop_Qt_5_4_2_GCC_64bit-Debug</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lpotter/builds/build-lidsensoradaptor-evdev-Desktop_Qt_5_4_2_GCC_64bit-Release</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/sensord-qt5.pc
^
|
@@ -1,10 +0,0 @@
-prefix=/usr
-includedir=${prefix}/include/sensord-qt5
-libdir=${prefix}/lib/
-
-Name: Sensorfw-qt5
-Description: Sensord for Qt 5
-Version: 0.7.2.1
-Requires:
-Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
-Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/sensord.pc
^
|
@@ -1,10 +0,0 @@
-prefix=/usr
-includedir=${prefix}/include/sensord
-libdir=${prefix}/lib/
-
-Name: Sensorfw
-Description: Sensorfw
-Version: 0.7.2.1
-Requires:
-Libs: -L${libdir} -lsensorclient -lsensordatatypes
-Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/tests/tests.xml
^
|
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<testdefinition version="0.1">
- <!-- Test suite, sensorfw-tests for automated testing of sensord -->
- <suite name="Sensorfw-tests" domain="System Software">
- <!-- At least one set per suite, name and description mandatory -->
- <set name="Sensord-automated-tests" description="Unit test cases for sensord" feature="Sensor Framework" requirement="88917">
- <case name="Sensord_Filters" level="Component" type="Functional" description="Unit test cases for sensor filters" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorfilters-test</step>
- </case>
- <case name="Sensord_Dataflow" level="Component" type="Functional" description="Sensord dataflow test" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensordataflow-test</step>
- </case>
- <case name="Sensord_Adaptors" level="Component" type="Functional" description="Unit test cases for sensor adaptors" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensoradaptors-test</step>
- </case>
- <case name="Sensord_Chains" level="Component" type="Functional" description="Unit test cases for sensor chains" timeout="15" subfeature="Sensor Framework">
- <step>stop sensord</step>
- <step expected_result="0">/usr/bin/sensorchains-test</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- </case>
- <case name="Sensor_Client_API" level="Component" type="Functional" description="Client API tests for sensord" timeout="90" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorapi-test</step>
- </case>
- <case name="Sensor_MetaData" level="Component" type="Functional" description="Sensor metadata tests for sensord" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensormetadata-test</step>
- </case>
- <case name="Dead_Client" type="Functional" level="Component" description="Unit test for properly detecting dead clients." timeout="60" subfeature="Sensor Framework">
- <step expected_result="0">/usr/share/sensorfw-tests/sensord-deadclienttest.py</step>
- </case>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- <set name="Sensord-memory-tests" description="Memory leak tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
- <case name="Sensord_Memory_OpenClose" level="Component" type="Benchmark" description="Memory leak check for session open/close" timeout="200" subfeature="Sensor Framework">
- <step>/usr/bin/sensorbenchmark-test testSessionLeaks</step>
- </case>
- <case name="Sensord_Memory_OpenKill" level="Component" type="Benchmark" description="Memory leak check for session open/kill" timeout="200" subfeature="Sensor Framework">
- <step>/usr/bin/sensorbenchmark-test testLostSessionLeaks</step>
- </case>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- <set name="Sensord-pm-tests" description="Sensord power management tests" feature="Sensor Framework" requirement="SensorFw Testing and automation">
- <pre_steps>
- <step expected_result="0">/usr/bin/sensordiverter.sh start</step>
- <step>sleep 5</step>
- </pre_steps>
-
- <case name="Sensord_Power_Management" type="Functional" level="Component" description="Sensord power management handling test" timeout="100" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorpowermanagement-test</step>
- </case>
-
- <case name="Sensord_Standby_Override" type="Functional" level="Component" description="Sensord standby override test" timeout="100" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorstandbyoverride-test</step>
- </case>
-
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
-
- <post_steps>
- <step expected_result="0">/usr/bin/sensordiverter.sh stop</step>
- </post_steps>
- </set>
-
-
- <set name="Sensord-benchmark-tests" description="Benchmark test cases for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
-
- <pre_steps>
- <!-- Stop sensord, kill to make sure -->
- <step>stop sensord</step>
- <step>killall sensord</step>
- <step>rm -f /tmp/sensorTestSampleRate</step>
- <step>mv /usr/lib/sensord/libalsadaptor.so /usr/lib/sensord/libalsadaptor.so.orig</step>
- <step>ln -s /usr/lib/sensord/testing/libalsadaptor.so /usr/lib/sensord/libalsadaptor.so</step>
- </pre_steps>
-
- <case name="Sensord_Benchmark_50hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 50hz" timeout="45" subfeature="Sensor Framework">
- <step>echo 20 > /tmp/sensorTestSampleRate</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- <step>/usr/bin/sensorbenchmark-test testThroughput</step>
- </case>
- <case name="Sensord_Benchmark_200hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 200hz" timeout="45" subfeature="Sensor Framework">
- <step>stop sensord</step>
- <step>echo 5 > /tmp/sensorTestSampleRate</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- <step>/usr/bin/sensorbenchmark-test testThroughput</step>
- </case>
- <case name="Sensord_Benchmark_500hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 500hz" timeout="45" subfeature="Sensor Framework">
- <step>stop sensord</step>
- <step>echo 2 > /tmp/sensorTestSampleRate</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- <step>/usr/bin/sensorbenchmark-test testThroughput</step>
- </case>
-
- <post_steps>
- <!-- Clean up and restore normal behavior-->
- <step>stop sensord</step>
- <step>rm -f /tmp/sensorTestSampleRate</step>
- <step>rm -f /usr/lib/sensord/libalsadaptor.so</step>
- <step>mv /usr/lib/sensord/libalsadaptor.so.orig /usr/lib/sensord/libalsadaptor.so</step>
- <step>start sensord</step>
- </post_steps>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- <set name="Sensord-external-tests" description="External issue tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
- <case name="Sensord_External" level="Component" type="Functional" description="Check external required API, values etc." timeout="15" subfeature="Sensor Framework" insignificant="true">
- <step>/usr/bin/sensorexternal-test</step>
- </case>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- </suite>
- </testdefinition>
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.role.json
^
|
@@ -0,0 +1,12 @@
+{
+ "exeName":"/usr/sbin/sensorfwd",
+ "type": "privileged",
+ "allowedNames": ["com.nokia.SensorService"],
+ "permissions": [
+ {
+ "service":"com.nokia.SensorService",
+ "inbound":["*"],
+ "outbound":["*"]
+ }
+ ]
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.service
^
|
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.nokia.SensorService
+Exec=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf
+Type=static
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/LuneOS/systemd/sensorfwd.service
^
|
@@ -1,7 +1,7 @@
[Unit]
Description=Sensor daemon for sensor framework
-After=dbus.socket ls-hubd_private.service
-Requires=dbus.service ls-hubd_private.service
+After=dbus.socket ls-hubd.service
+Requires=dbus.service ls-hubd.service
Conflicts=actdead.target
[Service]
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<AccelerometerAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometeradaptor, AccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class AccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/adaptor-config.pri
^
|
@@ -16,7 +16,3 @@
target.path = $$PLUGINPATH
INSTALLS += target
-
-config_hybris {
- CONFIG += link_pkgconfig
-}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/adaptors.pro
^
|
@@ -10,9 +10,11 @@
SUBDIRS += hybrispressureadaptor
SUBDIRS += hybrisproximityadaptor
SUBDIRS += hybrisorientationadaptor
+ SUBDIRS += hybrisrotationadaptor
+ SUBDIRS += hybrisgeorotationadaptor
SUBDIRS += hybrisstepcounteradaptor
- } else {
+} else {
SUBDIRS = alsadaptor \
alsadaptor-evdev \
@@ -23,16 +25,24 @@
magnetometeradaptor \
magnetometeradaptor-ascii \
magnetometeradaptor-evdev \
- magnetometeradaptor-ncdk \
touchadaptor \
kbslideradaptor \
proximityadaptor \
proximityadaptor-evdev \
proximityadaptor-ascii \
- mrstaccelerometer \
gyroscopeadaptor \
gyroscopeadaptor-evdev
+SUBDIRS += lidsensoradaptor-evdev
+SUBDIRS += iioadaptor
+SUBDIRS += humidityadaptor
+SUBDIRS += pressureadaptor
+SUBDIRS += temperatureadaptor
+
+contains(CONFIG,legacy) {
+
+SUBDIRS += mrstaccelerometer
+SUBDIRS += magnetometeradaptor-ncdk
SUDBIRS += oemtabletmagnetometeradaptor
SUBDIRS += pegatronaccelerometeradaptor
SUBDIRS += oemtabletalsadaptor-ascii
@@ -41,22 +51,9 @@
SUDBIRS += oemtabletgyroscopeadaptor
SUBDIRS += steaccelerometeradaptor
SUBDIRS += mpu6050accelerometer
-SUBDIRS += lidsensoradaptor-evdev
-SUBDIRS += iioadaptor
-SUBDIRS += humidityadaptor
-SUBDIRS += pressureadaptor
-SUBDIRS += temperatureadaptor
-config_hybris {
- SUBDIRS += hybrisaccelerometer
- SUBDIRS += hybrisalsadaptor
- SUBDIRS += hybrisgyroscopeadaptor
- SUBDIRS += hybrismagnetometeradaptor
- SUBDIRS += hybrispressureadaptor
- SUBDIRS += hybrisproximityadaptor
- SUBDIRS += hybrisorientationadaptor
- SUBDIRS += hybrisstepcounteradaptor
- }
+}
+
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp
^
|
@@ -39,7 +39,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorAscii>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
^
|
@@ -37,9 +37,7 @@
class ALSAdaptorAsciiPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorEvdev>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor-evdev, ALSAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.h
^
|
@@ -34,9 +34,7 @@
class ALSAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorSysfs>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor-sysfs, ALSAdaptorSysfsPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
^
|
@@ -32,9 +32,7 @@
class ALSAdaptorSysfsPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor/alsadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptor>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/alsadaptor/alsadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class ALSAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroAdaptorEvdev>("gyroscopeadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroadaptor-evdev, GyroAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.h
^
|
@@ -34,9 +34,7 @@
class GyroAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroscopeAdaptor>("gyroscopeadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroscopeadaptor, GyroscopeAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
^
|
@@ -32,9 +32,7 @@
class GyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/humidityadaptor/humidityadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HumidityAdaptor>("humidityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(humidityadaptor, HumidityAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/humidityadaptor/humidityadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class HumidityAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -29,7 +28,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAccelerometerAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisaccelerometeradaptor, HybrisAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -26,9 +25,7 @@
class HybrisAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptor.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -29,7 +28,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAlsAdaptor>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisalsadaptor, HybrisAlsAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -26,9 +25,7 @@
class HybrisAlsAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptor.cpp
^
|
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+** Copyright (C) 2020 Rinigus
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "hybrisgeorotationadaptor.h"
+#include "logging.h"
+#include "datatypes/utils.h"
+#include "config.h"
+
+#include <QtCore/qmath.h>
+#include <QtGlobal>
+
+#define RADIANS_TO_DEGREES 57.2957795
+
+/*
+ * azimuth: angle between the magnetic north direction and the Y axis, around
+ * the Z axis (0<=azimuth<360).
+ * 0=North, 90=East, 180=South, 270=West
+ *
+ **/
+
+HybrisGeoRotationAdaptor::HybrisGeoRotationAdaptor(const QString& id) :
+ HybrisAdaptor(id,SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR)
+{
+ m_buffer = new DeviceAdaptorRingBuffer<CompassData>(1);
+ setAdaptedSensor("hybrisgeorotation", "Internal rotation coordinates using geo rotation vector", m_buffer);
+
+ setDescription("Hybris georotation");
+ m_powerStatePath = SensorFrameworkConfig::configuration()->value("georotation/powerstate_path").toByteArray();
+ if (!m_powerStatePath.isEmpty() && !QFile::exists(m_powerStatePath)) {
+ sensordLogW() << "Path does not exists: " << m_powerStatePath;
+ m_powerStatePath.clear();
+ }
+}
+
+HybrisGeoRotationAdaptor::~HybrisGeoRotationAdaptor()
+{
+ delete m_buffer;
+}
+
+bool HybrisGeoRotationAdaptor::startSensor()
+{
+ if (!(HybrisAdaptor::startSensor()))
+ return false;
+ if (isRunning() && !m_powerStatePath.isEmpty())
+ writeToFile(m_powerStatePath, "1");
+ sensordLogD() << "Hybris GeoRotationAdaptor start";
+ return true;
+}
+
+void HybrisGeoRotationAdaptor::stopSensor()
+{
+ HybrisAdaptor::stopSensor();
+ if (!isRunning() && !m_powerStatePath.isEmpty())
+ writeToFile(m_powerStatePath, "0");
+ sensordLogD() << "Hybris GeoRotationAdaptor stop";
+}
+
+void HybrisGeoRotationAdaptor::processSample(const sensors_event_t& data)
+{
+ CompassData *d = m_buffer->nextSlot();
+ d->timestamp_ = quint64(data.timestamp * .001);
+#ifdef USE_BINDER
+ const float *rotationVector = data.u.data;
+#else
+ const float *rotationVector = data.data;
+#endif
+ // Calculations are based on Android methods
+ // getRotationMatrixFromVector and getOrientation
+ // of SensorManager.java
+ float q0 = rotationVector[3];
+ float q1 = rotationVector[0];
+ float q2 = rotationVector[1];
+ float q3 = rotationVector[2];
+ float accuracy = rotationVector[4];
+
+ float sq_q1 = 2 * q1 * q1;
+ float sq_q3 = 2 * q3 * q3;
+ float q1_q2 = 2 * q1 * q2;
+ float q3_q0 = 2 * q3 * q0;
+
+ float R1 = q1_q2 - q3_q0;
+ float R4 = 1 - sq_q1 - sq_q3;
+ float azimuth = qAtan2(R1, R4) * RADIANS_TO_DEGREES;
+ d->degrees_ = (int)(azimuth + 360) % 360;
+ d->rawDegrees_ = d->degrees_;
+
+ // level_ is set to 3 (pass csd) when accuracy is higher than 10 degrees
+ const int maxLevel = 3;
+ if (accuracy < 0) d->level_ = 0;
+ else d->level_ = (accuracy > 1e-5) ?
+ (int)(qMin(qFloor(maxLevel * 0.174533/accuracy), maxLevel)) :
+ maxLevel;
+
+ m_buffer->commit();
+ m_buffer->wakeUpReaders();
+}
+
+void HybrisGeoRotationAdaptor::init()
+{
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptor.h
^
|
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HYBRISGEOROTATIONADAPTOR_H
+#define HYBRISGEOROTATIONADAPTOR_H
+#include "hybrisadaptor.h"
+
+#include <QString>
+#include <QStringList>
+#include "deviceadaptorringbuffer.h"
+#include "datatypes/orientationdata.h"
+
+/**
+ * @brief Adaptor for hybris compass.
+ *
+ * Adaptor for internal compass
+ * Uses hybris sensor daemon driver interface in interval
+ * polling mode, i.e. values are read with given constant interval.
+ */
+class HybrisGeoRotationAdaptor : public HybrisAdaptor
+{
+ Q_OBJECT
+
+public:
+ static DeviceAdaptor* factoryMethod(const QString& id) {
+ return new HybrisGeoRotationAdaptor(id);
+ }
+ HybrisGeoRotationAdaptor(const QString& id);
+ ~HybrisGeoRotationAdaptor();
+
+ bool startSensor();
+ void stopSensor();
+
+protected:
+ void processSample(const sensors_event_t& data);
+ void init();
+
+private:
+ DeviceAdaptorRingBuffer<CompassData>* m_buffer;
+ QByteArray m_powerStatePath;
+
+};
+#endif
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptor.pro
^
|
@@ -0,0 +1,14 @@
+TARGET = hybrisgeorotationadaptor
+
+HEADERS += hybrisgeorotationadaptor.h \
+ hybrisgeorotationadaptorplugin.h
+
+SOURCES += hybrisgeorotationadaptor.cpp \
+ hybrisgeorotationadaptorplugin.cpp
+
+LIBS+= -L../../core -lhybrissensorfw-qt5
+
+include( ../adaptor-config.pri )
+config_hybris {
+ PKGCONFIG += android-headers
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptorplugin.cpp
^
|
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "hybrisgeorotationadaptorplugin.h"
+#include "hybrisgeorotationadaptor.h"
+#include "sensormanager.h"
+#include "logging.h"
+
+void HybrisGeoRotationAdaptorPlugin::Register(class Loader&)
+{
+ sensordLogD() << "registering hybrisgeorotationadaptor";
+ SensorManager& sm = SensorManager::instance();
+ sm.registerDeviceAdaptor<HybrisGeoRotationAdaptor>("orientationadaptor");
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgeorotationadaptor/hybrisgeorotationadaptorplugin.h
^
|
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HYBRISGEOROTATIONADAPTORPLUGIN_H
+#define HYBRISGEOROTATIONADAPTORPLUGIN_H
+
+#include "plugin.h"
+
+class HybrisGeoRotationAdaptorPlugin : public Plugin
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
+
+private:
+ void Register(class Loader& l);
+};
+
+#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -29,7 +28,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisGyroscopeAdaptor>("gyroscopeadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisgyroscopeadaptor, HybrisGyroscopeAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -26,9 +25,7 @@
class HybrisGyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -29,7 +28,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisMagnetometerAdaptor>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrismagnetometeradaptor, HybrisMagnetometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -26,9 +25,7 @@
class HybrisMagnetometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -29,7 +28,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisOrientationAdaptor>("orientationadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisorientationadaptor, HybrisOrientationAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -26,9 +25,7 @@
class HybrisOrientationAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptor.cpp
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2017 Matti Lehtimäki
-** Contact: matti.lehtimaki@gmail.com
**
** $QT_BEGIN_LICENSE:LGPL$
**
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptor.h
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2017 Matti Lehtimäki
-** Contact: matti.lehtimaki@gmail.com
**
** $QT_BEGIN_LICENSE:LGPL$
**
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.cpp
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2017 Matti Lehtimäki
-** Contact: matti.lehtimaki@gmail.com
**
** $QT_BEGIN_LICENSE:LGPL$
**
@@ -31,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisPressureAdaptor>("pressureadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrispressureadaptor, HybrisPressureAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.h
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2017 Matti Lehtimäki
-** Contact: matti.lehtimaki@gmail.com
**
** $QT_BEGIN_LICENSE:LGPL$
**
@@ -28,9 +26,7 @@
class HybrisPressureAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -29,7 +28,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisProximityAdaptor>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisproximityadaptor, HybrisProximityAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -26,9 +25,7 @@
class HybrisProximityAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptor.cpp
^
|
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+** Copyright (C) 2020 Rinigus
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "hybrisrotationadaptor.h"
+#include "logging.h"
+#include "datatypes/utils.h"
+#include "config.h"
+
+#include <QtCore/qmath.h>
+#include <QtGlobal>
+
+#define RADIANS_TO_DEGREES 57.2957795
+
+/*
+ * azimuth: angle between the magnetic north direction and the Y axis, around
+ * the Z axis (0<=azimuth<360).
+ * 0=North, 90=East, 180=South, 270=West
+ *
+ **/
+
+HybrisRotationAdaptor::HybrisRotationAdaptor(const QString& id) :
+ HybrisAdaptor(id,SENSOR_TYPE_ROTATION_VECTOR)
+{
+ m_buffer = new DeviceAdaptorRingBuffer<CompassData>(1);
+ setAdaptedSensor("hybrisrotation", "Internal rotation coordinates", m_buffer);
+
+ setDescription("Hybris rotation");
+ m_powerStatePath = SensorFrameworkConfig::configuration()->value("rotation/powerstate_path").toByteArray();
+ if (!m_powerStatePath.isEmpty() && !QFile::exists(m_powerStatePath)) {
+ sensordLogW() << "Path does not exists: " << m_powerStatePath;
+ m_powerStatePath.clear();
+ }
+}
+
+HybrisRotationAdaptor::~HybrisRotationAdaptor()
+{
+ delete m_buffer;
+}
+
+bool HybrisRotationAdaptor::startSensor()
+{
+ if (!(HybrisAdaptor::startSensor()))
+ return false;
+ if (isRunning() && !m_powerStatePath.isEmpty())
+ writeToFile(m_powerStatePath, "1");
+ sensordLogD() << "Hybris RotationAdaptor start";
+ return true;
+}
+
+void HybrisRotationAdaptor::stopSensor()
+{
+ HybrisAdaptor::stopSensor();
+ if (!isRunning() && !m_powerStatePath.isEmpty())
+ writeToFile(m_powerStatePath, "0");
+ sensordLogD() << "Hybris RotationAdaptor stop";
+}
+
+void HybrisRotationAdaptor::processSample(const sensors_event_t& data)
+{
+ CompassData *d = m_buffer->nextSlot();
+ d->timestamp_ = quint64(data.timestamp * .001);
+#ifdef USE_BINDER
+ const float *rotationVector = data.u.data;
+#else
+ const float *rotationVector = data.data;
+#endif
+ // Calculations are based on Android methods
+ // getRotationMatrixFromVector and getOrientation
+ // of SensorManager.java
+ float q0 = rotationVector[3];
+ float q1 = rotationVector[0];
+ float q2 = rotationVector[1];
+ float q3 = rotationVector[2];
+ float accuracy = rotationVector[4];
+
+ float sq_q1 = 2 * q1 * q1;
+ float sq_q3 = 2 * q3 * q3;
+ float q1_q2 = 2 * q1 * q2;
+ float q3_q0 = 2 * q3 * q0;
+
+ float R1 = q1_q2 - q3_q0;
+ float R4 = 1 - sq_q1 - sq_q3;
+ float azimuth = qAtan2(R1, R4) * RADIANS_TO_DEGREES;
+ d->degrees_ = (int)(azimuth + 360) % 360;
+ d->rawDegrees_ = d->degrees_;
+
+ // level_ is set to 3 (pass csd) when accuracy is higher than 10 degrees
+ const int maxLevel = 3;
+ if (accuracy < 0) d->level_ = 0;
+ else d->level_ = (accuracy > 1e-5) ? (int)(qMin(qFloor(maxLevel * 0.174533/accuracy), maxLevel)) : maxLevel;
+
+ m_buffer->commit();
+ m_buffer->wakeUpReaders();
+}
+
+void HybrisRotationAdaptor::init()
+{
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptor.h
^
|
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HYBRISROTATIONADAPTOR_H
+#define HYBRISROTATIONADAPTOR_H
+#include "hybrisadaptor.h"
+
+#include <QString>
+#include <QStringList>
+#include "deviceadaptorringbuffer.h"
+#include "datatypes/orientationdata.h"
+
+/**
+ * @brief Adaptor for hybris compass.
+ *
+ * Adaptor for internal compass
+ * Uses hybris sensor daemon driver interface in interval
+ * polling mode, i.e. values are read with given constant interval.
+ */
+class HybrisRotationAdaptor : public HybrisAdaptor
+{
+ Q_OBJECT
+
+public:
+ static DeviceAdaptor* factoryMethod(const QString& id) {
+ return new HybrisRotationAdaptor(id);
+ }
+ HybrisRotationAdaptor(const QString& id);
+ ~HybrisRotationAdaptor();
+
+ bool startSensor();
+ void stopSensor();
+
+protected:
+ void processSample(const sensors_event_t& data);
+ void init();
+
+private:
+ DeviceAdaptorRingBuffer<CompassData>* m_buffer;
+ QByteArray m_powerStatePath;
+
+};
+#endif
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptor.pro
^
|
@@ -0,0 +1,14 @@
+TARGET = hybrisrotationadaptor
+
+HEADERS += hybrisrotationadaptor.h \
+ hybrisrotationadaptorplugin.h
+
+SOURCES += hybrisrotationadaptor.cpp \
+ hybrisrotationadaptorplugin.cpp
+
+LIBS+= -L../../core -lhybrissensorfw-qt5
+
+include( ../adaptor-config.pri )
+config_hybris {
+ PKGCONFIG += android-headers
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptorplugin.cpp
^
|
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "hybrisrotationadaptorplugin.h"
+#include "hybrisrotationadaptor.h"
+#include "sensormanager.h"
+#include "logging.h"
+
+void HybrisRotationAdaptorPlugin::Register(class Loader&)
+{
+ sensordLogD() << "registering hybrisrotationadaptor";
+ SensorManager& sm = SensorManager::instance();
+ sm.registerDeviceAdaptor<HybrisRotationAdaptor>("orientationadaptor");
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisrotationadaptor/hybrisrotationadaptorplugin.h
^
|
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd
+**
+**
+** $QT_BEGIN_LICENSE:LGPL$
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef HYBRISROTATIONADAPTORPLUGIN_H
+#define HYBRISROTATIONADAPTORPLUGIN_H
+
+#include "plugin.h"
+
+class HybrisRotationAdaptorPlugin : public Plugin
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
+
+private:
+ void Register(class Loader& l);
+};
+
+#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2016 kimmoli
-** Contact: kimmo.lindholm@eke.fi
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -26,12 +24,8 @@
#include "datatypes/utils.h"
#include "config.h"
-#ifndef SENSOR_TYPE_STEP_COUNTER
-#define SENSOR_TYPE_STEP_COUNTER (19)
-/* If hardware/sensors.h does not define SENSOR_TYPE_STEP_COUNTER, assume
- * a) the event structure is missing u64 union too, and b) u64.step_counter
- * would be located at the same address as non-u64 data array. */
-#define NO_SENSORS_EVENT_U64
+#ifndef USE_BINDER
+#include <android-version.h>
#endif
HybrisStepCounterAdaptor::HybrisStepCounterAdaptor(const QString& id) :
@@ -83,7 +77,10 @@
#ifdef USE_BINDER
d->value_ = data.u.stepCount;
#else
-#ifdef NO_SENSORS_EVENT_U64
+#if ANDROID_VERSION_MAJOR == 4 && ANDROID_VERSION_MINOR < 4
+/* In Android versions 4.3 and older hardware/sensors.h does not
+ * contain u64 union and values are located at the same
+ * address as non-u64 data array. */
uint64_t value = 0;
memcpy(&value, data.data, sizeof value);
d->value_ = value;
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.h
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2016 kimmoli
-** Contact: kimmo.lindholm@eke.fi
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.cpp
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2016 kimmoli
-** Contact: kimmo.lindholm@eke.fi
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -32,7 +30,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisStepCounterAdaptor>("stepcounteradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisstepcounteradaptor, HybrisStepCounterAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.h
^
|
@@ -1,10 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
** Copyright (C) 2016 kimmoli
-** Contact: kimmo.lindholm@eke.fi
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -29,9 +27,7 @@
class HybrisStepCounterAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/iioadaptor/iioadaptor.cpp
^
|
@@ -45,6 +45,7 @@
#include <QTimer>
#include <QDirIterator>
#include <qmath.h>
+#include <QRegularExpression>
#include <deviceadaptor.h>
#include "datatypes/orientationdata.h"
@@ -52,6 +53,11 @@
#define GRAVITY 9.80665
#define REV_GRAVITY 0.101936799
+// Proximity sensor
+#define PROXIMITY_DEFAULT_THRESHOLD 250
+#define PROXIMITY_NEAR_VALUE 0
+#define PROXIMITY_FAR_VALUE 100
+
/* Conversion of acceleration data to SI units (m/s^2) */
#define CONVERT_A_X(x) ((float(x) / 1000) * (GRAVITY * -1.0))
#define CONVERT_A_Y(x) ((float(x) / 1000) * (GRAVITY * 1.0))
@@ -73,6 +79,8 @@
delete alsBuffer_;
if (magnetometerBuffer_)
delete magnetometerBuffer_;
+ if (proximityBuffer_)
+ delete proximityBuffer_;
}
void IioAdaptor::setup()
@@ -84,6 +92,7 @@
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "accel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O accelerometer (" + iioDevice.name +")";
@@ -93,12 +102,12 @@
iioDevice.sensorType = IioAdaptor::IIO_ACCELEROMETER;
}
- }
- else if (deviceId.startsWith("gyro")) {
+ } else if (deviceId.startsWith("gyro")) {
const QString name = "gyroscope";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "anglvel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O gyroscope (" + iioDevice.name +")";
@@ -107,14 +116,13 @@
iioDevice.sensorType = IioAdaptor::IIO_GYROSCOPE;
}
- }
- else if (deviceId.startsWith("mag")) {
+ } else if (deviceId.startsWith("mag")) {
const QString name = "magnetometer";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "magn";
devNodeNumber = findSensor(inputMatch);
-
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O magnetometer (" + iioDevice.name +")";
magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(1);
@@ -122,11 +130,11 @@
iioDevice.sensorType = IioAdaptor::IIO_MAGNETOMETER;
}
- }
- else if (deviceId.startsWith("als")) {
+ } else if (deviceId.startsWith("als")) {
const QString name = "als";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
+ iioDevice.channelTypeName = "illuminance";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
QString desc = "Industrial I/O light sensor (" + iioDevice.name +")";
@@ -135,6 +143,21 @@
setAdaptedSensor(name, desc, alsBuffer_);
iioDevice.sensorType = IioAdaptor::IIO_ALS;
}
+ } else if (deviceId.startsWith("prox")) {
+ const QString name = "proximity";
+ const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
+ qDebug() << name + ":" << "input_match" << inputMatch;
+
+ iioDevice.channelTypeName = "proximity";
+ devNodeNumber = findSensor(inputMatch);
+ proximityThreshold = SensorFrameworkConfig::configuration()->value<QString>(name + "/threshold", QString(PROXIMITY_DEFAULT_THRESHOLD)).toInt();
+ if (devNodeNumber!= -1) {
+ QString desc = "Industrial I/O proximity sensor (" + iioDevice.name +")";
+ qDebug() << desc;
+ proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
+ setAdaptedSensor(name, desc, proximityBuffer_);
+ iioDevice.sensorType = IioAdaptor::IIO_PROXIMITY;
+ }
}
if (devNodeNumber == -1) {
@@ -142,8 +165,11 @@
// setValid(false);
return;
}
- iioDevice.channels = scanElementsEnable(devNodeNumber,1);
- scanElementsEnable(devNodeNumber,0);
+
+ if (mode() != SysfsAdaptor::IntervalMode) {
+ scanElementsEnable(devNodeNumber,1);
+ scanElementsEnable(devNodeNumber,0);
+ }
/* Override the scaling factor if asked */
bool ok;
@@ -190,7 +216,11 @@
QString eventName = QString::fromLatin1(udev_device_get_sysname(dev));
iioDevice.devicePath = QString::fromLatin1(udev_device_get_syspath(dev)) +"/";
iioDevice.index = eventName.right(1).toInt(&ok2);
- qDebug() << Q_FUNC_INFO << "syspath" << iioDevice.devicePath;
+ // Default values
+ iioDevice.offset = 0.0;
+ iioDevice.scale = 1.0;
+ iioDevice.frequency = 1.0;
+ qDebug() << Q_FUNC_INFO << "Syspath for sensor (" + sensorName + "):" << iioDevice.devicePath;
udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(dev)) {
const char *name;
@@ -203,28 +233,29 @@
qDebug() << "attr" << name << value;
QString attributeName(name);
- if (attributeName.endsWith("scale")) {
+ if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*scale$"))) {
iioDevice.scale = QString(value).toDouble(&ok);
if (ok) {
- // scale = num;
- qDebug() << "scale is" << iioDevice.scale;
+ qDebug() << sensorName + ":" << "Scale is" << iioDevice.scale;
}
- } else if (attributeName.endsWith("offset")) {
+ } else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*offset$"))) {
iioDevice.offset = QString(value).toDouble(&ok);
- if (ok)
- qDebug() << "offset is" << value;
+ if (ok) {
+ qDebug() << sensorName + ":" << "Offset is" << value;
+ }
} else if (attributeName.endsWith("frequency")) {
iioDevice.frequency = QString(value).toDouble(&ok);
- if (ok)
- // frequency = num;
- qDebug() << "frequency is" << iioDevice.frequency;
- } else if (attributeName.endsWith("raw")) {
+ if (ok) {
+ qDebug() << sensorName + ":" << "Frequency is" << iioDevice.frequency;
+ }
+ } else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*raw$"))) {
qDebug() << "adding to paths:" << iioDevice.devicePath
<< attributeName << iioDevice.index;
addPath(iioDevice.devicePath + attributeName, j);
j++;
}
}
+ iioDevice.channels = j;
// in_rot_from_north_magnetic_tilt_comp_raw ?
@@ -271,7 +302,7 @@
if (enable == 1) {
// FIXME: should enable sensors for this device? Assuming enabled already
- iioDevice.channels = scanElementsEnable(device, enable);
+ scanElementsEnable(device, enable);
sysfsWriteInt(pathLength, IIO_BUFFER_LEN);
sysfsWriteInt(pathEnable, enable);
} else {
@@ -347,7 +378,7 @@
// Find all the *_en file and write 0/1 to it
QStringList filters;
- filters << "*_en";
+ filters << ("*" + iioDevice.channelTypeName + "*_en");
dir.setNameFilters(filters);
QFileInfoList list = dir.entryInfoList();
@@ -403,10 +434,15 @@
sensordLogW() << "read():" << strerror(errno);
return;
}
- result = strtol(buf, NULL, 10);
- if (result == 0)
+ errno = 0; // reset errno before call
+ result = strtol(buf, NULL, 10);
+
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/iioadaptor/iioadaptor.h
^
|
@@ -55,7 +55,8 @@
IIO_MAGNETOMETER, // magn_3d
IIO_ROTATION, // dev_rotation, quaternion
IIO_ALS, // als
- IIO_TILT // incli_3d
+ IIO_TILT, // incli_3d
+ IIO_PROXIMITY // proximity als
};
struct iio_device {
@@ -68,6 +69,7 @@
QString devicePath;
int index;
IioSensorType sensorType;
+ QString channelTypeName;
};
public:
@@ -129,9 +131,12 @@
// Device number for the sensor (-1 if not found)
int devNodeNumber;
+ int proximityThreshold;
+
DeviceAdaptorRingBuffer<TimedXyzData>* iioXyzBuffer_;
DeviceAdaptorRingBuffer<TimedUnsigned>* alsBuffer_;
DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* magnetometerBuffer_;
+ DeviceAdaptorRingBuffer<ProximityData>* proximityBuffer_;
iio_device iioDevice;
@@ -140,6 +145,7 @@
TimedXyzData* timedData;
CalibratedMagneticFieldData *calData;
TimedUnsigned *uData;
+ ProximityData *proximityData;
private slots:
void setup();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/iioadaptor/iioadaptor.pro
^
|
@@ -1,5 +1,4 @@
-TARGET = iioaccelerometeradaptor
-#TARGET = iiosensorsadaptor
+TARGET = iiosensorsadaptor
HEADERS += iioadaptor.h \
iioadaptorplugin.h
@@ -9,8 +8,6 @@
CONFIG += qt debug warn_on link_prl link_pkgconfig plugin
-CONFIG += link_pkgconfig
-PKGCONFIG += udev
-LIBS += -ludev
+PKGCONFIG += libudev
include( ../adaptor-config.pri )
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/iioadaptor/iioadaptorplugin.cpp
^
|
@@ -36,8 +36,5 @@
sm.registerDeviceAdaptor<IioAdaptor>("gyroscopeadaptor");
sm.registerDeviceAdaptor<IioAdaptor>("magnetometeradaptor");
sm.registerDeviceAdaptor<IioAdaptor>("alsadaptor");
+ sm.registerDeviceAdaptor<IioAdaptor>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(iioadaptor, IioAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/iioadaptor/iioadaptorplugin.h
^
|
@@ -32,9 +32,7 @@
class IioAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/kbslideradaptor/kbslideradaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<KeyboardSliderAdaptor>("kbslideradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(kbslideradaptor, KeyboardSliderAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/kbslideradaptor/kbslideradaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class KeyboardSliderAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<LidSensorAdaptorEvdev>("lidsensoradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(lidsensoradaptor-evdev, LidsensorAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.h
^
|
@@ -31,9 +31,7 @@
class LidsensorAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-asciiplugin.cpp
^
|
@@ -38,7 +38,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorAscii>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagAdaptorEvdev>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor-evdev, MagnetometerAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.h
^
|
@@ -33,9 +33,7 @@
class MagnetometerAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp
^
|
@@ -33,7 +33,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorNCDK>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPluginNCDK)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptor>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class MagnetometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<Mpu6050AccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(mpu6050accelerometeradaptor, Mpu6050AccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.h
^
|
@@ -26,9 +26,7 @@
class Mpu6050AccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
^
|
@@ -33,7 +33,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MRSTAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometeradaptor-mrst, MRSTAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h
^
|
@@ -30,9 +30,7 @@
class MRSTAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OaktrailAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(oaktrailaccelerometeradaptor, OaktrailAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.h
^
|
@@ -6,9 +6,7 @@
class OaktrailAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(oemtabletaccelerometeradaptor, OemtabletAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.h
^
|
@@ -6,9 +6,7 @@
class OemtabletAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp
^
|
@@ -8,7 +8,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletALSAdaptorAscii>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, OEMTabletALSAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.h
^
|
@@ -6,9 +6,7 @@
class OEMTabletALSAdaptorAsciiPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp
^
|
@@ -8,5 +8,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletGyroscopeAdaptor>("gyroscopeadaptor");
}
-
-Q_EXPORT_PLUGIN2(gyroscopeadaptor, OEMTabletGyroscopeAdaptorPlugin)
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.h
^
|
@@ -6,9 +6,7 @@
class OEMTabletGyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp
^
|
@@ -8,5 +8,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletMagnetometerAdaptor>("magnetometeradaptor");
}
-
-Q_EXPORT_PLUGIN2(magnetometeradaptor, OemtabletMagnetometerAdaptorPlugin)
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.h
^
|
@@ -6,9 +6,7 @@
class OemtabletMagnetometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PegatronAccelerometerAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pegatronaccelerometeradaptor, PegatronAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.h
^
|
@@ -6,9 +6,7 @@
class PegatronAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/pressureadaptor/pressureadaptorplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PressureAdaptor>("pressureadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pressureadaptor, PressureAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/pressureadaptor/pressureadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class PressureAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.cpp
^
|
@@ -38,7 +38,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptorAscii>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.h
^
|
@@ -36,9 +36,7 @@
class ProximityAdaptorAsciiPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptorEvdev>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor-evdev, ProximityAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.h
^
|
@@ -32,9 +32,7 @@
class ProximityAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/proximityadaptor/proximityadaptorplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptor>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/proximityadaptor/proximityadaptorplugin.h
^
|
@@ -32,9 +32,7 @@
class ProximityAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<SteAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(steaccelerometeradaptor,SteAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.h
^
|
@@ -6,9 +6,7 @@
class SteAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/tapadaptor/tapadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<TapAdaptor>("tapadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(tapadaptor, TapAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/tapadaptor/tapadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class TapAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/temperatureadaptor/temperatureadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<TemperatureAdaptor>("temperatureadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(temperatureadaptor, TemperatureAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/temperatureadaptor/temperatureadaptorplugin.h
^
|
@@ -34,9 +34,7 @@
class TemperatureAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/touchadaptor/touchadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<TouchAdaptor>("touchadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(touchadaptor, TouchAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/adaptors/touchadaptor/touchadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class TouchAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/accelerometerchain/accelerometerchainplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList AccelerometerChainPlugin::Dependencies() {
return QString("coordinatealignfilter:accelerometeradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometerchain, AccelerometerChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/accelerometerchain/accelerometerchainplugin.h
^
|
@@ -31,9 +31,7 @@
class AccelerometerChainPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/compasschain.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/compasschain.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/compasschainplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -44,7 +43,3 @@
return QString("accelerometerchain:magcalibrationchain:declinationfilter:downsamplefilter:avgaccfilter:orientationadaptor").split(":", QString::SkipEmptyParts);
}
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(compasschain, CompassChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/compasschainplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -25,10 +24,7 @@
class CompassChainPlugin : public Plugin
{
Q_OBJECT
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/compassfilter.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -27,11 +26,12 @@
#define DEGREES_TO_RADIANS 0.017453292
#define GRAVITY_EARTH 9.80665f
#define FILTER_FACTOR 0.24f
-#define LIST_COUNT 10
CompassFilter::CompassFilter() :
magDataSink(this, &CompassFilter::magDataAvailable),
accelSink(this, &CompassFilter::accelDataAvailable),
+ magX(0), magY(0), magZ(0),
+ oldMagX(0), oldMagY(0), oldMagZ(0),
level(0),
oldHeading(0)
{
@@ -61,7 +61,7 @@
// the x/y are switched as compass expects it in aero coordinates
qreal Gx = data->y_ * .001f; //convert to g
qreal Gy = data->x_ * .001f;
- qreal Gz = -data->z_ * .001f;
+ qreal Gz = data->z_ * .001f;
qreal divisor = qSqrt(Gx * Gx + Gy * Gy + Gz * Gz);
qreal normalizedGx = Gx / divisor;
@@ -105,11 +105,19 @@
/* calculate yaw = ecompass angle psi (-180deg, 180deg) */
Psi = (qAtan2(-fBfy, fBfx) * RADIANS_TO_DEGREES); /* Equation 7 */
- qreal heading = Psi * FILTER_FACTOR + oldHeading * (1.0 - FILTER_FACTOR);
+ qreal heading;
+ if (Psi < -90.0f && oldHeading > 90.0f) {
+ heading = (Psi + 360.0f) * FILTER_FACTOR + oldHeading * (1.0 - FILTER_FACTOR);
+ } else if (Psi > 90.0f && oldHeading < -90.0f) {
+ heading = Psi * FILTER_FACTOR + (oldHeading + 360.0f) * (1.0 - FILTER_FACTOR);
+ } else {
+ heading = Psi * FILTER_FACTOR + oldHeading * (1.0 - FILTER_FACTOR);
+ }
CompassData compassData; //north angle
compassData.timestamp_ = data->timestamp_;
compassData.degrees_ = (int)(heading + 360) % 360;
+ compassData.rawDegrees_ = compassData.degrees_;
compassData.level_ = level;
magSource.propagate(1, &compassData);
oldHeading = heading;
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/compassfilter.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -49,8 +48,6 @@
void magDataAvailable(unsigned, const CalibratedMagneticFieldData*);
void accelDataAvailable(unsigned, const AccelerationData*);
- CalibratedMagneticFieldData magData;
-
qreal magX;
qreal magY;
qreal magZ;
@@ -60,10 +57,6 @@
int level;
qreal oldHeading;
- QList <int> averagingBuffer;
- QList <const CalibratedMagneticFieldData *> magAvgBuffer;
- QList <const AccelerationData *> accelAvgBuffer;
-// MagAvgBuffer magAvgBuffer;
};
#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/orientationfilter.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/compasschain/orientationfilter.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/magcalibrationchain/calibrationfilter.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013-2015 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/magcalibrationchain/calibrationfilter.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/magcalibrationchain/magcalibrationchain.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/magcalibrationchain/magcalibrationchain.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/magcalibrationchain/magcalibrationchainplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -35,7 +34,3 @@
QStringList MagCalibrationChainPlugin::Dependencies() {
return QString("magcoordinatealignfilter:magnetometeradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magcalibrationchain, MagCalibrationChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/magcalibrationchain/magcalibrationchainplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -27,10 +26,7 @@
class MagCalibrationChainPlugin : public Plugin
{
Q_OBJECT
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/orientationchain/orientationchainplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList OrientationChainPlugin::Dependencies() {
return QString("orientationinterpreter:accelerometerchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationchain, OrientationChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/chains/orientationchain/orientationchainplugin.h
^
|
@@ -31,9 +31,7 @@
class OrientationChainPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/common-config.pri
^
|
@@ -29,9 +29,7 @@
QMAKE_LFLAGS += -lc_p
}
-equals(QT_MAJOR_VERSION, 5):{
- TARGET = $$TARGET-qt5
-}
+TARGET = $$TARGET-qt5
OTHER_FILES += \
../../common.pri
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/common-install.pri
^
|
@@ -8,17 +8,10 @@
QT -= gui
# Path for headers - remember to add files if they should be installed
-equals(QT_MAJOR_VERSION, 4): {
- publicheaders.path = /usr/include/sensord
- PLUGINPATH = /usr/lib/sensord
-}
-
-equals(QT_MAJOR_VERSION, 5): {
- publicheaders.path = /usr/include/sensord-qt5
- PLUGINPATH = /usr/lib/sensord-qt5
-}
+publicheaders.path = /usr/include/sensord-qt5
+PLUGINPATH = $$[QT_INSTALL_LIBS]/sensord-qt5
# Path for shared libraries
-SHAREDLIBPATH = /usr/lib
+SHAREDLIBPATH = $$[QT_INSTALL_LIBS]
INSTALLS += publicheaders
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/common.pri
^
|
@@ -1,6 +1 @@
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/core.pro
^
|
@@ -15,14 +15,10 @@
DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
-QMAKE_LIBDIR_FLAGS += -L../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes
-}
+DEFINES += PLUGIN_DIRECTORY=\"\\\"$$[QT_INSTALL_LIBS]/sensord-qt5\\\"\"
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
-}
+QMAKE_LIBDIR_FLAGS += -L../datatypes\
+ -lsensordatatypes-qt5
SOURCES += sensormanager.cpp \
sensormanager_a.cpp \
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/hybris.pro
^
|
@@ -17,7 +17,7 @@
SOURCES += hybrisadaptor.cpp
HEADERS += hybrisadaptor.h
-LIBS += -L/usr/lib -L../datatypes
+LIBS += -L$$[QT_INSTALL_LIBS] -L../datatypes
!contains(CONFIG,binder) {
LIBS += -lhybris-common -lhardware
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/hybrisadaptor.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -35,98 +34,6 @@
#include <time.h>
#include <signal.h>
-
-/* Older devices probably have old android hal and thus do
- * not define sensor all sensor types that have been added
- * later on -> In order to both use symbolic names and
- * compile for all devices we need to fill in holes that
- * android hal for some particular device might have.
- */
-#ifndef SENSOR_TYPE_META_DATA
-#define SENSOR_TYPE_META_DATA (0)
-#endif
-#ifndef SENSOR_TYPE_ACCELEROMETER
-#define SENSOR_TYPE_ACCELEROMETER (1)
-#endif
-#ifndef SENSOR_TYPE_GEOMAGNETIC_FIELD
-#define SENSOR_TYPE_GEOMAGNETIC_FIELD (2) // alias for SENSOR_TYPE_MAGNETIC_FIELD
-#endif
-#ifndef SENSOR_TYPE_MAGNETIC_FIELD
-#define SENSOR_TYPE_MAGNETIC_FIELD (2) // alias for SENSOR_TYPE_GEOMAGNETIC_FIELD
-#endif
-#ifndef SENSOR_TYPE_ORIENTATION
-#define SENSOR_TYPE_ORIENTATION (3)
-#endif
-#ifndef SENSOR_TYPE_GYROSCOPE
-#define SENSOR_TYPE_GYROSCOPE (4)
-#endif
-#ifndef SENSOR_TYPE_LIGHT
-#define SENSOR_TYPE_LIGHT (5)
-#endif
-#ifndef SENSOR_TYPE_PRESSURE
-#define SENSOR_TYPE_PRESSURE (6)
-#endif
-#ifndef SENSOR_TYPE_TEMPERATURE
-#define SENSOR_TYPE_TEMPERATURE (7)
-#endif
-#ifndef SENSOR_TYPE_PROXIMITY
-#define SENSOR_TYPE_PROXIMITY (8)
-#endif
-#ifndef SENSOR_TYPE_GRAVITY
-#define SENSOR_TYPE_GRAVITY (9)
-#endif
-#ifndef SENSOR_TYPE_LINEAR_ACCELERATION
-#define SENSOR_TYPE_LINEAR_ACCELERATION (10)
-#endif
-#ifndef SENSOR_TYPE_ROTATION_VECTOR
-#define SENSOR_TYPE_ROTATION_VECTOR (11)
-#endif
-#ifndef SENSOR_TYPE_RELATIVE_HUMIDITY
-#define SENSOR_TYPE_RELATIVE_HUMIDITY (12)
-#endif
-#ifndef SENSOR_TYPE_AMBIENT_TEMPERATURE
-#define SENSOR_TYPE_AMBIENT_TEMPERATURE (13)
-#endif
-#ifndef SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED
-#define SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED (14)
-#endif
-#ifndef SENSOR_TYPE_GAME_ROTATION_VECTOR
-#define SENSOR_TYPE_GAME_ROTATION_VECTOR (15)
-#endif
-#ifndef SENSOR_TYPE_GYROSCOPE_UNCALIBRATED
-#define SENSOR_TYPE_GYROSCOPE_UNCALIBRATED (16)
-#endif
-#ifndef SENSOR_TYPE_SIGNIFICANT_MOTION
-#define SENSOR_TYPE_SIGNIFICANT_MOTION (17)
-#endif
-#ifndef SENSOR_TYPE_STEP_DETECTOR
-#define SENSOR_TYPE_STEP_DETECTOR (18)
-#endif
-#ifndef SENSOR_TYPE_STEP_COUNTER
-#define SENSOR_TYPE_STEP_COUNTER (19)
-#endif
-#ifndef SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR
-#define SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR (20)
-#endif
-#ifndef SENSOR_TYPE_HEART_RATE
-#define SENSOR_TYPE_HEART_RATE (21)
-#endif
-#ifndef SENSOR_TYPE_TILT_DETECTOR
-#define SENSOR_TYPE_TILT_DETECTOR (22)
-#endif
-#ifndef SENSOR_TYPE_WAKE_GESTURE
-#define SENSOR_TYPE_WAKE_GESTURE (23)
-#endif
-#ifndef SENSOR_TYPE_GLANCE_GESTURE
-#define SENSOR_TYPE_GLANCE_GESTURE (24)
-#endif
-#ifndef SENSOR_TYPE_PICK_UP_GESTURE
-#define SENSOR_TYPE_PICK_UP_GESTURE (25)
-#endif
-#ifndef SENSOR_TYPE_WRIST_TILT_GESTURE
-#define SENSOR_TYPE_WRIST_TILT_GESTURE (26)
-#endif
-
#ifdef USE_BINDER
#define SENSOR_BINDER_SERVICE_DEVICE "/dev/hwbinder"
#define SENSOR_BINDER_SERVICE_IFACE "android.hardware.sensors@1.0::ISensors"
@@ -354,8 +261,6 @@
m_sensorState[i].m_maxDelay = maxDelay;
setDelay(m_sensorArray[i].handle, delay, true);
- setActive(m_sensorArray[i].handle, true);
- setDelay(m_sensorArray[i].handle, delay, false);
sensordLogD("delay = %d [%d, %d]",
m_sensorState[i].m_delay,
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/hybrisadaptor.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
@@ -36,6 +35,97 @@
#include <pthread.h>
#endif
+/* Older devices probably have old android hal and thus do
+ * not define sensor all sensor types that have been added
+ * later on -> In order to both use symbolic names and
+ * compile for all devices we need to fill in holes that
+ * android hal for some particular device might have.
+ */
+#ifndef SENSOR_TYPE_META_DATA
+#define SENSOR_TYPE_META_DATA (0)
+#endif
+#ifndef SENSOR_TYPE_ACCELEROMETER
+#define SENSOR_TYPE_ACCELEROMETER (1)
+#endif
+#ifndef SENSOR_TYPE_GEOMAGNETIC_FIELD
+#define SENSOR_TYPE_GEOMAGNETIC_FIELD (2) // alias for SENSOR_TYPE_MAGNETIC_FIELD
+#endif
+#ifndef SENSOR_TYPE_MAGNETIC_FIELD
+#define SENSOR_TYPE_MAGNETIC_FIELD (2) // alias for SENSOR_TYPE_GEOMAGNETIC_FIELD
+#endif
+#ifndef SENSOR_TYPE_ORIENTATION
+#define SENSOR_TYPE_ORIENTATION (3)
+#endif
+#ifndef SENSOR_TYPE_GYROSCOPE
+#define SENSOR_TYPE_GYROSCOPE (4)
+#endif
+#ifndef SENSOR_TYPE_LIGHT
+#define SENSOR_TYPE_LIGHT (5)
+#endif
+#ifndef SENSOR_TYPE_PRESSURE
+#define SENSOR_TYPE_PRESSURE (6)
+#endif
+#ifndef SENSOR_TYPE_TEMPERATURE
+#define SENSOR_TYPE_TEMPERATURE (7)
+#endif
+#ifndef SENSOR_TYPE_PROXIMITY
+#define SENSOR_TYPE_PROXIMITY (8)
+#endif
+#ifndef SENSOR_TYPE_GRAVITY
+#define SENSOR_TYPE_GRAVITY (9)
+#endif
+#ifndef SENSOR_TYPE_LINEAR_ACCELERATION
+#define SENSOR_TYPE_LINEAR_ACCELERATION (10)
+#endif
+#ifndef SENSOR_TYPE_ROTATION_VECTOR
+#define SENSOR_TYPE_ROTATION_VECTOR (11)
+#endif
+#ifndef SENSOR_TYPE_RELATIVE_HUMIDITY
+#define SENSOR_TYPE_RELATIVE_HUMIDITY (12)
+#endif
+#ifndef SENSOR_TYPE_AMBIENT_TEMPERATURE
+#define SENSOR_TYPE_AMBIENT_TEMPERATURE (13)
+#endif
+#ifndef SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED
+#define SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED (14)
+#endif
+#ifndef SENSOR_TYPE_GAME_ROTATION_VECTOR
+#define SENSOR_TYPE_GAME_ROTATION_VECTOR (15)
+#endif
+#ifndef SENSOR_TYPE_GYROSCOPE_UNCALIBRATED
+#define SENSOR_TYPE_GYROSCOPE_UNCALIBRATED (16)
+#endif
+#ifndef SENSOR_TYPE_SIGNIFICANT_MOTION
+#define SENSOR_TYPE_SIGNIFICANT_MOTION (17)
+#endif
+#ifndef SENSOR_TYPE_STEP_DETECTOR
+#define SENSOR_TYPE_STEP_DETECTOR (18)
+#endif
+#ifndef SENSOR_TYPE_STEP_COUNTER
+#define SENSOR_TYPE_STEP_COUNTER (19)
+#endif
+#ifndef SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR
+#define SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR (20)
+#endif
+#ifndef SENSOR_TYPE_HEART_RATE
+#define SENSOR_TYPE_HEART_RATE (21)
+#endif
+#ifndef SENSOR_TYPE_TILT_DETECTOR
+#define SENSOR_TYPE_TILT_DETECTOR (22)
+#endif
+#ifndef SENSOR_TYPE_WAKE_GESTURE
+#define SENSOR_TYPE_WAKE_GESTURE (23)
+#endif
+#ifndef SENSOR_TYPE_GLANCE_GESTURE
+#define SENSOR_TYPE_GLANCE_GESTURE (24)
+#endif
+#ifndef SENSOR_TYPE_PICK_UP_GESTURE
+#define SENSOR_TYPE_PICK_UP_GESTURE (25)
+#endif
+#ifndef SENSOR_TYPE_WRIST_TILT_GESTURE
+#define SENSOR_TYPE_WRIST_TILT_GESTURE (26)
+#endif
+
#define SENSORFW_MCE_WATCHER
class HybrisAdaptor;
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/hybrisbindertypes.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2019 Jolla Ltd
-** Contact: matti.lehtimaki@jolla.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/loader.cpp
^
|
@@ -54,7 +54,6 @@
}
#define PLUGIN_PREFIX_ENV "SENSORFW_LIBRARY_PATH"
-#define PLUGIN_DIRECTORY "/usr/lib/sensord-qt5"
#define PLUGIN_PREFIX "lib"
#define PLUGIN_SUFFIX "-qt5.so"
#define SENSOR_SUFFIX "sensor"
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/sensormanager.cpp
^
|
@@ -41,11 +41,13 @@
#endif // SENSORFW_LUNA_SERVICE_CLIENT
#include <QSocketNotifier>
#include <errno.h>
+#include <functional>
#include "sockethandler.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
+#include <QTimer>
#include <QSettings>
@@ -55,6 +57,8 @@
void* buffer;
} PipeData;
+const int SensorManager::SOCKET_CONNECTION_TIMEOUT_MS = 10000;
+
SensorManager* SensorManager::instance_ = NULL;
int SensorManager::sessionIdCount_ = 0;
@@ -91,6 +95,59 @@
{
}
+SessionInstanceEntry::SessionInstanceEntry(QObject* parent, int sessionId, const QString& clientName)
+ : QObject(parent)
+ , m_sessionId(sessionId)
+ , m_clientName(clientName)
+ , m_timer(nullptr)
+{
+}
+
+SessionInstanceEntry::~SessionInstanceEntry()
+{
+ if (m_timer) {
+ delete m_timer;
+ m_timer = nullptr;
+ }
+}
+
+void SessionInstanceEntry::expectConnection(int msec)
+{
+ m_timer = new QTimer(this);
+ m_timer->setSingleShot(true);
+ m_timer->setInterval(msec);
+ connect(m_timer, &QTimer::timeout, this, &SessionInstanceEntry::timerTimeout);
+ m_timer->start();
+
+ SocketHandler& socketHandler = SensorManager::instance().socketHandler();
+ connect(&socketHandler, &SocketHandler::connectedSession,
+ this, &SessionInstanceEntry::sessionConnected);
+}
+
+void SessionInstanceEntry::timerTimeout()
+{
+ m_timer->deleteLater();
+ m_timer = nullptr;
+
+ SocketHandler& socketHandler = SensorManager::instance().socketHandler();
+ disconnect(&socketHandler, &SocketHandler::connectedSession, this, nullptr);
+ socketHandler.checkConnectionEstablished(m_sessionId);
+}
+
+void SessionInstanceEntry::sessionConnected(int sessionId)
+{
+ if (sessionId == m_sessionId) {
+ if (m_timer) {
+ m_timer->stop();
+ m_timer->deleteLater();
+ m_timer = nullptr;
+ }
+
+ SocketHandler& socketHandler = SensorManager::instance().socketHandler();
+ disconnect(&socketHandler, &SocketHandler::connectedSession, this, nullptr);
+ }
+}
+
inline QDBusConnection bus()
{
return QDBusConnection::systemBus();
@@ -112,7 +169,7 @@
deviation(0)
{
QString pluginPath;
- const char* SOCKET_NAME = "/var/run/sensord.sock";
+ const char* SOCKET_NAME = "/run/sensord.sock";
QByteArray env = qgetenv("SENSORFW_SOCKET_PATH");
if (!env.isEmpty()) {
env += SOCKET_NAME;
@@ -138,6 +195,11 @@
sensordLogW() << "Error setting socket permissions! " << SOCKET_NAME;
}
+ serviceWatcher_ = new QDBusServiceWatcher(this);
+ serviceWatcher_->setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
+ QObject::connect(serviceWatcher_, &QDBusServiceWatcher::serviceUnregistered,
+ this, &SensorManager::dbusClientUnregistered);
+
#ifdef SENSORFW_MCE_WATCHER
mceWatcher_ = new MceWatcher(this);
connect(mceWatcher_, SIGNAL(displayStateChanged(const bool)),
@@ -211,6 +273,7 @@
delete socketHandler_;
delete pipeNotifier_;
+ delete serviceWatcher_;
if (pipefds_[0]) close(pipefds_[0]);
if (pipefds_[1]) close(pipefds_[1]);
@@ -260,6 +323,7 @@
setError(SmCanNotRegisterService, error.message());
return false;
}
+ serviceWatcher_->setConnection(bus());
return true;
}
@@ -368,8 +432,12 @@
return INVALID_SESSION;
}
+ QString clientName = "";
+ if ( calledFromDBus() )
+ clientName = message().service();
+
int sessionId = createNewSessionId();
- if(!entryIt.value().sensor_)
+ if (!entryIt.value().sensor_)
{
AbstractSensorChannel* sensor = addSensor(id);
if ( sensor == NULL )
@@ -380,12 +448,32 @@
entryIt.value().sensor_ = sensor;
}
entryIt.value().sessions_.insert(sessionId);
+ if ( !clientName.isEmpty() )
+ {
+ QMap<int, SessionInstanceEntry*>::iterator sessionIt = sessionInstanceMap_.insert(
+ sessionId, new SessionInstanceEntry(this, sessionId, clientName));
+ serviceWatcher_->addWatchedService(clientName);
+ sessionIt.value()->expectConnection(SOCKET_CONNECTION_TIMEOUT_MS);
+ }
return sessionId;
}
bool SensorManager::releaseSensor(const QString& id, int sessionId)
{
+ QString clientName = "";
+ QMap<int, SessionInstanceEntry*>::iterator sessionIt = sessionInstanceMap_.find(sessionId);
+ if ( calledFromDBus() )
+ {
+ clientName = message().service();
+ if ( sessionIt == sessionInstanceMap_.end() || sessionIt.value()->m_clientName != clientName )
+ {
+ sensordLogW() << "Ignoring attempt to release session" << sessionId
+ << "that wasn't previously registered for D-Bus client" << clientName;
+ return false;
+ }
+ }
+
sensordLogD() << "Releasing sensor '" << id << "' for session: " << sessionId;
clearError();
@@ -431,6 +519,28 @@
setError( SmNotInstantiated, tr("invalid sessionId, no session to release") );
}
+ if ( sessionIt != sessionInstanceMap_.end() )
+ {
+ delete sessionIt.value();
+ sessionInstanceMap_.erase(sessionIt);
+ }
+
+ if (!clientName.isEmpty())
+ {
+ bool hasMoreSessions = false;
+ for (sessionIt = sessionInstanceMap_.begin(); sessionIt != sessionInstanceMap_.end(); ++sessionIt)
+ {
+ if (sessionIt.value()->m_clientName == clientName)
+ {
+ hasMoreSessions = true;
+ break;
+ }
+ }
+
+ if (!hasMoreSessions)
+ serviceWatcher_->removeWatchedService(clientName);
+ }
+
socketHandler_->removeSession(sessionId);
return returnValue;
@@ -689,6 +799,19 @@
sensordLogW() << "[SensorManager]: Lost session " << sessionId << " detected, but not found from session list";
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/sensormanager.h
^
|
@@ -30,6 +30,9 @@
#ifndef SENSORMANAGER_H
#define SENSORMANAGER_H
+#include <QDBusContext>
+#include <QDBusServiceWatcher>
+
#include "abstractsensor.h"
#include "abstractchain.h"
#include "deviceadaptor.h"
@@ -50,6 +53,7 @@
#endif
class QSocketNotifier;
+class QTimer;
class SocketHandler;
/**
@@ -124,10 +128,56 @@
};
/**
+ * Sensor session instance entry. Contains session ID, D-Bus service name of
+ * connecting side and timer for initial connection timeout.
+ */
+class SessionInstanceEntry : public QObject
+{
+ Q_OBJECT
+ Q_DISABLE_COPY(SessionInstanceEntry)
+public:
+ /**
+ * Constructor.
+ *
+ * @param sessionId Sensor ID
+ * @param clientName D-Bus service name of requesting side
+ */
+ SessionInstanceEntry(QObject* parent, int sessionId, const QString& clientName);
+
+ /**
+ * Destructor.
+ */
+ ~SessionInstanceEntry();
+
+ /**
+ * Start timer to check if socket connection has been established after timeout.
+ *
+ * @param msec time to wait for socket connection.
+ */
+ void expectConnection(int msec);
+
+ int m_sessionId; /**< Session ID */
+ QString m_clientName; /**< D-Bus private client name */
+ QTimer* m_timer; /**< timer for initial connection */
+
+public slots:
+
+ /**
+ * Callback for initial connection timer.
+ */
+ void timerTimeout();
+
+ /**
+ * Callback for session socket connection getting established.
+ */
+ void sessionConnected(int sessionId);
+};
+
+/**
* Sensor manager. Singleton class which manages client sessions and
* track existence and usage of sensors, chains and adaptors.
*/
-class SensorManager : public QObject
+class SensorManager : public QObject, protected QDBusContext
{
Q_OBJECT
Q_DISABLE_COPY(SensorManager)
@@ -368,6 +418,13 @@
void lostClient(int sessionId);
/**
+ * Callback for D-Bus service unregistration.
+ *
+ * @param sessionId Session ID.
+ */
+ void dbusClientUnregistered(const QString &clientName);
+
+ /**
* Callback for MCE or LS display state change event.
*
* @param displayState display state.
@@ -473,6 +530,7 @@
QMap<QString, SensorChannelFactoryMethod> sensorFactoryMap_; /**< factories for sensor types */
QMap<QString, SensorInstanceEntry> sensorInstanceMap_; /**< sensor instances */
+ QMap<int, SessionInstanceEntry*> sessionInstanceMap_; /**< sensor session instances */
QMap<QString, DeviceAdaptorFactoryMethod> deviceAdaptorFactoryMap_; /**< factories for adaptor types. */
QMap<QString, DeviceAdaptorInstanceEntry> deviceAdaptorInstanceMap_; /**< adaptor instances */
@@ -483,6 +541,7 @@
QMap<QString, FilterFactoryMethod> filterFactoryMap_; /**< factories for filter types */
SocketHandler* socketHandler_; /**< socket handler */
+ QDBusServiceWatcher* serviceWatcher_; /**< D-Bus service watcher */
MceWatcher* mceWatcher_; /**< MCE watcher */
#ifdef SENSORFW_LUNA_SERVICE_CLIENT
LSClient* lsClient_; /**< LS client */
@@ -496,6 +555,8 @@
static int sessionIdCount_; /** session ID counter */
double deviation;
+
+ static const int SOCKET_CONNECTION_TIMEOUT_MS;
};
template<class SENSOR_TYPE>
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/sockethandler.cpp
^
|
@@ -276,6 +276,15 @@
return true;
}
+void SocketHandler::checkConnectionEstablished(int sessionId)
+{
+ if (!(m_idMap.keys().contains(sessionId))) {
+ sensordLogW() << "[SocketHandler]: Socket connection for session" << sessionId
+ << "hasn't been estabilished. Considering session lost";
+ emit lostSession(sessionId);
+ }
+}
+
void SocketHandler::newConnection()
{
sensordLogT() << "[SocketHandler]: New connection received.";
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/core/sockethandler.h
^
|
@@ -237,6 +237,15 @@
bool removeSession(int sessionId);
/**
+ * Verify if socket connection for a given session has been established.
+ * If there has been no connection, session is considered lost and
+ * lostSession signal is emitted.
+ *
+ * @param sessionId Session ID.
+ */
+ void checkConnectionEstablished(int sessionId);
+
+ /**
* Get socket file descriptor for given session.
*
* @param sessionId Session ID.
@@ -339,6 +348,14 @@
Q_SIGNALS:
/**
+ * Signal is emitted for new client connection after it sent the
+ session id.
+ *
+ * @param sessionId Session ID.
+ */
+ void connectedSession(int sessionId);
+
+ /**
* Signal is emitted for lost sessions which can happen for example
* if application using sensorfw crashes.
*
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/debian/changelog
^
|
@@ -1,3 +1,30 @@
+sensorfw-qt5 (0.12.2) unstable; urgency=medium
+
+[sensorfw] Move sensord.sock to /run
+[sensorfw] Properly handle angle rollover in built-in compass support
+[sensorfw] Cleanup Qt project files
+[packaging] Refine systemd unit install and test cleanup
+
+ -- Matti Lehtimäki <matti.lehtimaki@jolla.com> Thu, 21 Jan 2021 22:34:31 +0300
+
+sensorfw-qt5 (0.12.1) unstable; urgency=medium
+
+[hybrisadaptor] Fix building rotation vector adaptors with old Android versions
+
+ -- Matti Lehtimäki <matti.lehtimaki@jolla.com> Wed, 09 Sep 2020 16:14:31 +0300
+
+sensorfw-qt5 (0.12.0) unstable; urgency=medium
+
+[hybrisadaptor] Use of hybris rotation vectors for compass
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 02 Sep 2020 15:12:31 +0300
+
+sensorfw-qt5 (0.11.1) unstable; urgency=medium
+
+ * [packaging] Add missing debian build dependencies. Fixes MER#2060
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com> Mon, 07 Oct 2019 15:28:35 +0300
+
sensorfw-qt5 (0.7.4) unstable; urgency=medium
* add lid sensor
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/debian/control
^
|
@@ -3,7 +3,16 @@
Priority: optional
Maintainer: Lorn Potter <lorn.potter@gmail.com>
Uploaders:
-Build-Depends: debhelper (>=5), qt5-default, libudev-dev
+Build-Depends: debhelper (>=5),
+ qt5-default,
+ libudev-dev,
+ libsystemd-dev,
+ doxygen,
+ graphviz,
+ pkg-config,
+ libhardware-dev,
+ android-headers,
+ libhybris-dev
Standards-Version: 3.7.3
Package: sensorfw-qt5
@@ -55,7 +64,7 @@
Section: misc
Priority: extra
Architecture: any
-Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
+Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.
@@ -63,6 +72,6 @@
Section: misc
Priority: extra
Architecture: any
-Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
+Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/debian/libsensorfw-qt5-plugins.install
^
|
@@ -38,5 +38,4 @@
/usr/lib/sensord-qt5/liboaktrailaccelerometeradaptor-qt5.so
/usr/lib/sensord-qt5/libpegatronaccelerometeradaptor-qt5.so
/usr/lib/sensord-qt5/librotationsensor-qt5.so
-
-
+/usr/lib/sensord-qt5/libiiosensorsadaptor-qt5.so
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/debian/rules
^
|
@@ -48,7 +48,7 @@
dh_testdir
# Add here commands to configure the package.
- cd $(BUILD_DIR) && qmake $(QMAKECONFIG) CONFIG+="configs" CONFIG+="autohybris" "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
+ cd $(BUILD_DIR) && qmake $(QMAKECONFIG) CONFIG+="configs" CONFIG+="autohybris" CONFIG+="legacy" CONFIG+="systemdunit" "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
export LD_RUN_PATH=/usr/lib/sensord-qt5/
touch configure-stamp
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/adaptorplugin/sampleadaptorplugin.cpp
^
|
@@ -37,8 +37,3 @@
// "xxxadaptor"
sm.registerDeviceAdaptor<SampleAdaptor>("sampleadaptor");
}
-
-// Plugin must be exported for it to loaded properly
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(sampleadaptor, SampleAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/adaptorplugin/sampleadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class SampleAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/chainplugin/samplechainplugin.cpp
^
|
@@ -43,7 +43,3 @@
QStringList SampleChainPlugin::Dependencies() {
return QString("sampleadaptor:samplefilter").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplechain, SampleChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/chainplugin/samplechainplugin.h
^
|
@@ -31,9 +31,7 @@
class SampleChainPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/filterplugin/samplefilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<SampleFilter>("samplefilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplefilter, SampleFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/filterplugin/samplefilterplugin.h
^
|
@@ -31,9 +31,7 @@
class SampleFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/sensorplugin/sampleplugin.cpp
^
|
@@ -42,7 +42,3 @@
QStringList SamplePlugin::Dependencies() {
return QString("samplechain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplesensor, SamplePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/examples/sensorplugin/sampleplugin.h
^
|
@@ -31,9 +31,7 @@
class SamplePlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/avgaccfilter/avgaccfilter.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/avgaccfilter/avgaccfilter.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/avgaccfilter/avgaccfilterplugin.cpp
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -30,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<AvgAccFilter>("avgaccfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(avgaccfilter, AvgAccFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/avgaccfilter/avgaccfilterplugin.h
^
|
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@jollamobile.com
This file is part of Sensord.
@@ -25,9 +24,7 @@
class AvgAccFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/coordinatealignfilter/coordinatealignfilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<CoordinateAlignFilter>("coordinatealignfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(coordinatealignfilter, CoordinateAlignFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/coordinatealignfilter/coordinatealignfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class CoordinateAlignFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/declinationfilter/declinationfilter.cpp
^
|
@@ -51,13 +51,8 @@
}
newOrientation.correctedDegrees_ = newOrientation.degrees_;
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if (declinationCorrection_) {
- newOrientation.correctedDegrees_ += declinationCorrection_;
-#else
if (declinationCorrection_.loadAcquire() != 0) {
newOrientation.correctedDegrees_ += declinationCorrection_.loadAcquire();
-#endif
newOrientation.correctedDegrees_ %= 360;
// sensordLogT() << "DeclinationFilter corrected degree " << newOrientation.degrees_ << " => " << newOrientation.correctedDegrees_ << ". Level: " << newOrientation.level_;
}
@@ -73,19 +68,11 @@
if (declination != 0) {
declinationCorrection_ = declination;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- sensordLogD() << "Fetched declination correction from GConf: " << declinationCorrection_;
-#else
sensordLogD() << "Fetched declination correction from GConf: " << declinationCorrection_.loadAcquire();
-#endif
}
int DeclinationFilter::declinationCorrection()
{
loadSettings();
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- return declinationCorrection_;
-#else
return declinationCorrection_.loadAcquire();
-#endif
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/declinationfilter/declinationfilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<DeclinationFilter>("declinationfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(declinationfilter, DeclinationFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/declinationfilter/declinationfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class DeclinationFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/downsamplefilter/downsamplefilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<DownsampleFilter>("downsamplefilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(downsamplefilter, DownsampleFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/downsamplefilter/downsamplefilterplugin.h
^
|
@@ -31,9 +31,7 @@
class DownsampleFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<MagCoordinateAlignFilter>("magcoordinatealignfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magcoordinatealignfilter, MagCoordinateAlignFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class MagCoordinateAlignFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/orientationinterpreter/orientationinterpreterplugin.cpp
^
|
@@ -35,7 +35,3 @@
sensordLogD() << "registering orientationinterpreter";
sm.registerFilter<OrientationInterpreter>("orientationinterpreter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationinterpreter, OrientationInterpreterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/orientationinterpreter/orientationinterpreterplugin.h
^
|
@@ -31,9 +31,7 @@
class OrientationInterpreterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/rotationfilter/rotationfilterplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<RotationFilter>("rotationfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(rotationfilter, RotationFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/filters/rotationfilter/rotationfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class RotationFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/abstractsensor_i.cpp
^
|
@@ -39,11 +39,7 @@
{
AbstractSensorChannelInterfaceImpl(QObject* parent, int sessionId, const QString& path, const char* interfaceName);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- void dbusConnectNotify(const char* signal) { QDBusAbstractInterface::connectNotify(signal); }
-#else
void dbusConnectNotify(const QMetaMethod& signal) { QDBusAbstractInterface::connectNotify(signal); }
-#endif
SensorError errorCode_;
QString errorString_;
int sessionId_;
@@ -489,11 +485,7 @@
return pimpl_->call(mode, method, args);
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void AbstractSensorChannelInterface::dbusConnectNotify(const char* signal)
-#else
void AbstractSensorChannelInterface::dbusConnectNotify(const QMetaMethod& signal)
-#endif
{
pimpl_->dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/abstractsensor_i.h
^
|
@@ -466,11 +466,7 @@
* Wrapper for function of QDBusAbstractInterface.
* For more details see QDBusAbstractInterface docs.
*/
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- void dbusConnectNotify(const char* signal);
-#else
void dbusConnectNotify(const QMetaMethod& signal);
-#endif
protected slots:
void startFinished(QDBusPendingCallWatcher *watch);
void stopFinished(QDBusPendingCallWatcher *watch);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/accelerometersensor_i.cpp
^
|
@@ -86,18 +86,10 @@
return getAccessor<XYZ>("xyz");
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void AccelerometerSensorChannelInterface::connectNotify(const char* signal)
-#else
void AccelerometerSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&AccelerometerSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/accelerometersensor_i.h
^
|
@@ -99,12 +99,8 @@
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod & signal);
-#endif
-virtual bool dataReceivedImpl();
+ virtual bool dataReceivedImpl();
private:
bool frameAvailableConnected; /**< has applicaiton connected slot for frameAvailable signal. */
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/gyroscopesensor_i.cpp
^
|
@@ -86,18 +86,10 @@
return true;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void GyroscopeSensorChannelInterface::connectNotify(const char* signal)
-#else
void GyroscopeSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&GyroscopeSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/gyroscopesensor_i.h
^
|
@@ -99,11 +99,7 @@
static GyroscopeSensorChannelInterface* interface(const QString& id);
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod & signal);
-#endif
virtual bool dataReceivedImpl();
private:
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/magnetometersensor_i.cpp
^
|
@@ -83,18 +83,10 @@
return true;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void MagnetometerSensorChannelInterface::connectNotify(const char* signal)
-#else
void MagnetometerSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&MagnetometerSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/magnetometersensor_i.h
^
|
@@ -100,11 +100,7 @@
static MagnetometerSensorChannelInterface* interface(const QString& id);
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod & signal);
-#endif
virtual bool dataReceivedImpl();
private:
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/qt-api.pro
^
|
@@ -50,12 +50,9 @@
DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
-equals(QT_MAJOR_VERSION, 4): {
- QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes
-}
-equals(QT_MAJOR_VERSION, 5): {
- QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes-qt5
+
include(../common-install.pri)
publicheaders.files = $$HEADERS
target.path = $$SHAREDLIBPATH
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/rotationsensor_i.cpp
^
|
@@ -92,18 +92,10 @@
return getAccessor<bool>("hasZ");
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void RotationSensorChannelInterface::connectNotify(const char* signal)
-#else
void RotationSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&RotationSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/rotationsensor_i.h
^
|
@@ -109,11 +109,7 @@
static RotationSensorChannelInterface* interface(const QString& id);
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod &signal);
-#endif
virtual bool dataReceivedImpl();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/sensormanager_i.cpp
^
|
@@ -31,9 +31,6 @@
#include "sensormanager_i.h"
#include <QAbstractSocket>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_DECLARE_METATYPE( QAbstractSocket::SocketState)
-#endif
void __attribute__ ((constructor)) qtapi_init(void)
{
qRegisterMetaType<QAbstractSocket::SocketState>("SocketState");
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/qt-api/socketreader.cpp
^
|
@@ -50,7 +50,7 @@
}
socket_ = new QLocalSocket(this);
- const char* SOCKET_NAME = "/var/run/sensord.sock";
+ const char* SOCKET_NAME = "/run/sensord.sock";
QByteArray env = qgetenv("SENSORFW_SOCKET_PATH");
if (!env.isEmpty()) {
env += SOCKET_NAME;
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensord-qt5.pc.in
^
|
@@ -0,0 +1,10 @@
+prefix=/usr
+includedir=${prefix}/include/sensord-qt5
+libdir=${prefix}/@LIB@
+
+Name: Sensorfw-qt5
+Description: Sensord for Qt 5
+Version: 0.12.2
+Requires:
+Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
+Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensord.prf
^
|
@@ -1,13 +1,5 @@
-equals(QT_MAJOR_VERSION, 4):{
- LIBS += -L/usr/lib/ -lsensorclient -lsensordatatypes
- DEPENDPATH += /usr/include/sensord
- INCLUDEPATH += /usr/include/sensord /usr/include/sensord/datatypes /usr/include/sensord/filters
-}
-
-equals(QT_MAJOR_VERSION, 5):{
- LIBS += -L/usr/lib/ -lsensorclient-qt5 -lsensordatatypes-qt5
- DEPENDPATH += /usr/include/sensord-qt5
- INCLUDEPATH += /usr/include/sensord-qt5 /usr/include/sensord-qt5/datatypes /usr/include/sensord-qt5/filters
-}
+LIBS += -L$$[QT_INSTALL_LIBS] -lsensorclient-qt5 -lsensordatatypes-qt5
+DEPENDPATH += /usr/include/sensord-qt5
+INCLUDEPATH += /usr/include/sensord-qt5 /usr/include/sensord-qt5/datatypes /usr/include/sensord-qt5/filters
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensord/main.cpp
^
|
@@ -169,7 +169,6 @@
{
Q_UNUSED(socket);
int sig = SIGTERM;
- uint64_t tmp = 0;
if (read(s_pipe[0], &sig, sizeof sig) == -1) {
// dontcare
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensord/sensord.pro
^
|
@@ -23,12 +23,7 @@
QMAKE_LIBDIR_FLAGS += -L../datatypes \
-L../core
-equals(QT_MAJOR_VERSION, 4):{
- TARGET_H.path += /usr/include/sensord
-}
-equals(QT_MAJOR_VERSION, 5):{
- TARGET_H.path += /usr/include/sensord-qt5
-}
+TARGET_H.path += /usr/include/sensord-qt5
SOURCES += main.cpp \
parser.cpp \
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensorfw.pro
^
|
@@ -26,16 +26,15 @@
tests \
examples
-equals(QT_MAJOR_VERSION, 4): {
- SUBDIRS = datatypes qt-api
-}
-
contains(CONFIG,configs) {
- # !contains(CONFIG,hybris) {
+ contains(CONFIG,hybris) {
SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
SENSORDHYBRISCONFIGFILE.path = /etc/sensorfw
INSTALLS += SENSORDHYBRISCONFIGFILE
- # }
+ }
+
+ contains(CONFIG,legacy) {
+
SENSORFWCONFIGFILES.files = config/sensord-rx_51.conf \
config/sensord-oaktrail.conf \
config/sensord-exopc.conf \
@@ -50,12 +49,14 @@
config/sensord-u8500.conf \
SENSORFWCONFIGFILES.path = /etc/sensorfw
+ INSTALLS += SENSORFWCONFIGFILES
+ }
SENSORCONFIG_SETUP.files = config/sensord-daemon-conf-setup
SENSORCONFIG_SETUP.path = /usr/bin
- INSTALLS += SENSORFWCONFIGFILES SENSORCONFIG_SETUP
- }
+ INSTALLS += SENSORCONFIG_SETUP
+}
contains(CONFIG,hybris) {
@@ -69,7 +70,7 @@
publicheaders.files += include/*.h
INSTALLS += PKGCONFIGFILES QTCONFIGFILES
- PKGCONFIGFILES.path = /usr/lib/pkgconfig
+ PKGCONFIGFILES.path = $$[QT_INSTALL_LIBS]/pkgconfig
QTCONFIGFILES.files = sensord.prf
qt-api.depends = datatypes
@@ -79,54 +80,40 @@
include( common-install.pri )
include( common-config.pri )
- equals(QT_MAJOR_VERSION, 4):{
- PKGCONFIGFILES.files = sensord.pc
- PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord.pc'
- QTCONFIGFILES.path = /usr/share/qt4/mkspecs/features
- }
-
- equals(QT_MAJOR_VERSION, 5):{
- PKGCONFIGFILES.files = sensord-qt5.pc
- PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord-qt5.pc'
- QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features
-
- }
+ PKGCONFIGFILES.files = sensord-qt5.pc
+ PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" $$_PRO_FILE_PWD_/sensord-qt5.pc'
+ QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features
}
# How to make this work in all cases?
-#PKGCONFIGFILES.commands = sed -i \"s/Version:.*$$/Version: `head -n1 debian/changelog | cut -f 2 -d\' \' | tr -d \'()\'`/\" sensord.pc
+#PKGCONFIGFILES.commands = sed -i \"s/Version:.*$$/Version: `head -n1 debian/changelog | cut -f 2 -d\' \' | tr -d \'()\'`/\" sensord-qt5.pc
-equals(QT_MAJOR_VERSION, 5): {
- !contains(CONFIG,hybris) {
+!contains(CONFIG,hybris) {
# config file installation not handled here
- DBUSCONFIGFILES.files = sensorfw.conf
- DBUSCONFIGFILES.path = /etc/dbus-1/system.d
- INSTALLS += DBUSCONFIGFILES
-
- SENSORDCONFIGFILES.files = config/10-sensord-default.conf
- SENSORDCONFIGFILES.files += config/20-sensors-default.conf
- SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
- INSTALLS += SENSORDCONFIGFILES
-
- SENSORSYSTEMD.files = rpm/sensorfwd.service
- SENSORSYSTEMD.path = /lib/systemd/system
- INSTALLS += SENSORSYSTEMD
- }
+ DBUSCONFIGFILES.files = sensorfw.conf
+ DBUSCONFIGFILES.path = /etc/dbus-1/system.d
+ INSTALLS += DBUSCONFIGFILES
+
+ SENSORDCONFIGFILES.files = config/10-sensord-default.conf
+ SENSORDCONFIGFILES.files += config/20-sensors-default.conf
+ SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
+ INSTALLS += SENSORDCONFIGFILES
}
-equals(QT_MAJOR_VERSION, 4): {
- OTHER_FILES += rpm/sensorfw.spec \
- rpm/sensorfw.yaml
+contains(CONFIG,systemdunit) {
+ # Install service files through packaging to take into account
+ # units file location unless called with CONFIG+=systemdunit
+ SENSORSYSTEMD.files = rpm/sensorfwd.service
+ SENSORSYSTEMD.path = /lib/systemd/system
+ INSTALLS += SENSORSYSTEMD
}
-equals(QT_MAJOR_VERSION, 5): {
- OTHER_FILES += rpm/sensorfw-qt5.spec \
- rpm/sensorfw-qt5.yaml
- OTHER_FILES += rpm/sensorfw-qt5-hybris.spec \
- rpm/sensorfw-qt5-hybris.yaml
+OTHER_FILES += rpm/sensorfw-qt5.spec \
+ rpm/sensorfw-qt5-binder.spec \
+ rpm/sensorfw-qt5-hybris.inc \
+ rpm/sensorfw-qt5-hybris.spec
-}
OTHER_FILES += config/*
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/accelerometersensor/accelerometerplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList AccelerometerPlugin::Dependencies() {
return QString("accelerometerchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometersensor, AccelerometerPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/accelerometersensor/accelerometerplugin.h
^
|
@@ -31,9 +31,7 @@
class AccelerometerPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/alssensor/alsplugin.cpp
^
|
@@ -45,7 +45,3 @@
QStringList ALSPlugin::Dependencies() {
return QString("alsadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alssensor, ALSPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/alssensor/alsplugin.h
^
|
@@ -31,9 +31,7 @@
class ALSPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/compasssensor/compassplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList CompassPlugin::Dependencies() {
return QString("compasschain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(compasssensor, CompassPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/compasssensor/compassplugin.h
^
|
@@ -31,9 +31,7 @@
class CompassPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/contextplugin/contextplugin.cpp
^
|
@@ -50,7 +50,3 @@
{
return sessionId;
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(contextsensor, ContextPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/contextplugin/contextplugin.h
^
|
@@ -30,9 +30,7 @@
class ContextPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
public:
static int getSessionId();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/gyroscopesensor/gyroscopeplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList GyroscopePlugin::Dependencies() {
return QString("gyroscopeadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroscopesensor, GyroscopePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/gyroscopesensor/gyroscopeplugin.h
^
|
@@ -32,9 +32,7 @@
class GyroscopePlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/humiditysensor/humidityplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList HumidityPlugin::Dependencies() {
return QString("humidityadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(humiditysensor, HumidityPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/humiditysensor/humidityplugin.h
^
|
@@ -31,9 +31,7 @@
class HumidityPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/lidsensor/lidplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList LidPlugin::Dependencies() {
return QString("lidsensoradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(lidsensor, LidPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/lidsensor/lidplugin.h
^
|
@@ -30,9 +30,7 @@
class LidPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/magnetometersensor/magnetometerplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList MagnetometerPlugin::Dependencies() {
return QString("magcalibrationchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometersensor, MagnetometerPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/magnetometersensor/magnetometerplugin.h
^
|
@@ -31,9 +31,7 @@
class MagnetometerPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/orientationsensor/orientationplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList OrientationPlugin::Dependencies() {
return QString("orientationchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationsensor, OrientationPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/orientationsensor/orientationplugin.h
^
|
@@ -31,9 +31,7 @@
class OrientationPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/pressuresensor/pressureplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList PressurePlugin::Dependencies() {
return QString("pressureadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pressuresensor, PressurePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/pressuresensor/pressureplugin.h
^
|
@@ -31,9 +31,7 @@
class PressurePlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/proximitysensor/proximityplugin.cpp
^
|
@@ -38,7 +38,3 @@
QStringList ProximityPlugin::Dependencies() {
return QString("proximityadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximitysensor, ProximityPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/proximitysensor/proximityplugin.h
^
|
@@ -31,9 +31,7 @@
class ProximityPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/rotationsensor/rotationplugin.cpp
^
|
@@ -38,7 +38,3 @@
QStringList RotationPlugin::Dependencies() {
return QString("accelerometerchain:rotationfilter:compasschain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(rotationsensor, RotationPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/rotationsensor/rotationplugin.h
^
|
@@ -31,9 +31,7 @@
class RotationPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/stepcountersensor/stepcounterplugin.cpp
^
|
@@ -47,7 +47,3 @@
QStringList StepCounterPlugin::Dependencies() {
return QString("stepcounteradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(stepcountersensor, StepCounterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/stepcountersensor/stepcounterplugin.h
^
|
@@ -33,9 +33,7 @@
class StepCounterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/tapsensor/tapplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList TapPlugin::Dependencies() {
return QString("tapadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(tapsensor, TapPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/tapsensor/tapplugin.h
^
|
@@ -31,9 +31,7 @@
class TapPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/temperaturesensor/temperatureplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList TemperaturePlugin::Dependencies() {
return QString("temperatureadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(temperaturesensor, TemperaturePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/sensors/temperaturesensor/temperatureplugin.h
^
|
@@ -31,9 +31,7 @@
class TemperaturePlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/benchmark/benchmarktest/benchmarktest.pro
^
|
@@ -25,9 +25,4 @@
-L../../../datatypes \
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/benchmark/dummyclient/dummyclient.pro
^
|
@@ -16,9 +16,4 @@
-L../../../datatypes \
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/benchmark/fakeadaptor/fakeadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<FakeAdaptor>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, FakeAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/benchmark/fakeadaptor/fakeadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class FakeAdaptorPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/client/client.pro
^
|
@@ -24,9 +24,5 @@
QMAKE_LIBDIR_FLAGS += -L../../qt-api \
-L../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/common-install.pri
^
|
@@ -3,12 +3,8 @@
include(../common-config.pri)
QMAKE_LIBDIR_FLAGS += -L../../datatypes -L../../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
target.path = /usr/bin
INSTALLS += target
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/contextfw/als/testals.py
^
|
@@ -2,11 +2,6 @@
##
## Copyright (C) 2009-2010 Nokia Corporation
##
-## Contact: Jean-Luc Lamadon <jean-luc.lamadon@nokia.com>
-## Matias Muhonen <ext-matias.muhonen@nokia.com>
-## Tapio Rantala <ext-tapio.rantala@nokia.com>
-## Lihan Guo <ext-lihan.4.guo@nokia.com>
-##
## This file is part of Sensord.
##
## Sensord is free software; you can redistribute it and/or modify
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/contextfw/orientation/testorientation-manual.sh
^
|
@@ -5,9 +5,6 @@
## Test different accelerometer input values manually.
## As a result, screen should rotate.
##
-## Contact: Matias Muhonen <ext-matias.muhonen@nokia.com>
-## Contact: Tapio Rantala <ext-tapio.rantala@nokia.com>
-##
INPUT_DEV_NUM=`ls /sys/class/input/event?/device/name | xargs grep -i accelerometer | cut -c23`
INPUT_DEV=/dev/input/event${INPUT_DEV_NUM}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/contextfw/orientation/testorientation.py
^
|
@@ -2,11 +2,6 @@
##
## Copyright (C) 2009-2010 Nokia Corporation
##
-## Contact: Jean-Luc Lamadon <jean-luc.lamadon@nokia.com>
-## Matias Muhonen <ext-matias.muhonen@nokia.com>
-## Tapio Rantala <ext-tapio.rantala@nokia.com>
-## Lihan Guo <ext-lihan.4.guo@nokia.com>
-##
## This file is part of Sensord.
##
## Sensord is free software; you can redistribute it and/or modify
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/contextfw/stationary/teststationary.py
^
|
@@ -2,8 +2,6 @@
##
## Copyright (C) 2009-2010 Nokia Corporation
##
-## Contact: Lihan Guo <ext-lihan.4.guo@nokia.com>
-##
## This file is part of Sensord.
##
## Sensord is free software; you can redistribute it and/or modify
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/deadclient/deadclient.pro
^
|
@@ -15,12 +15,8 @@
QMAKE_LIBDIR_FLAGS += -L../../qt-api \
-L../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
# Input
HEADERS += datareceiver.h testwindow.h
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/deadclient/sensord-deadclienttest.py
^
|
@@ -1,9 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
##
## Copyright (C) 2009-2010 Nokia Corporation
##
-## Contact: Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
-##
## This file is part of Sensord.
##
## Sensord is free software; you can redistribute it and/or modify
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/metadata/metadata.pro
^
|
@@ -22,12 +22,8 @@
QMAKE_LIBDIR_FLAGS += -L../../qt-api \
-L../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
#CONFIG += link_pkgconfig
#PKGCONFIG += mlite5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/powermanagement/driverpolltest/driverpolltest.pro
^
|
@@ -24,9 +24,4 @@
-L../../../datatypes\
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/powermanagement/powermanagementtests/powermanagementtests.pro
^
|
@@ -24,12 +24,7 @@
-L../../../datatypes\
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
#CONFIG += link_pkgconfig
#PKGCONFIG += mlite5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro
^
|
@@ -25,12 +25,7 @@
-L../../../datatypes\
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
#CONFIG += link_pkgconfig
#PKGCONFIG += mlite5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/testapp/testapp.pro
^
|
@@ -36,13 +36,7 @@
-L../../datatypes \
-L../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensorclient
-}
-
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensorclient-qt5
include(../../common.pri)
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/tests.xml.in
^
|
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<testdefinition version="0.1">
+ <!-- Test suite, sensorfw-tests for automated testing of sensord -->
+ <suite name="Sensorfw-tests" domain="System Software">
+ <!-- At least one set per suite, name and description mandatory -->
+ <set name="Sensord-automated-tests" description="Unit test cases for sensord" feature="Sensor Framework" requirement="88917">
+ <case name="Sensord_Filters" level="Component" type="Functional" description="Unit test cases for sensor filters" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorfilters-test</step>
+ </case>
+ <case name="Sensord_Dataflow" level="Component" type="Functional" description="Sensord dataflow test" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensordataflow-test</step>
+ </case>
+ <case name="Sensord_Adaptors" level="Component" type="Functional" description="Unit test cases for sensor adaptors" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensoradaptors-test</step>
+ </case>
+ <case name="Sensord_Chains" level="Component" type="Functional" description="Unit test cases for sensor chains" timeout="15" subfeature="Sensor Framework">
+ <step>stop sensord</step>
+ <step expected_result="0">/usr/bin/sensorchains-test</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ </case>
+ <case name="Sensor_Client_API" level="Component" type="Functional" description="Client API tests for sensord" timeout="90" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorapi-test</step>
+ </case>
+ <case name="Sensor_MetaData" level="Component" type="Functional" description="Sensor metadata tests for sensord" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensormetadata-test</step>
+ </case>
+ <case name="Dead_Client" type="Functional" level="Component" description="Unit test for properly detecting dead clients." timeout="60" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/share/sensorfw-tests/sensord-deadclienttest.py</step>
+ </case>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ <set name="Sensord-memory-tests" description="Memory leak tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+ <case name="Sensord_Memory_OpenClose" level="Component" type="Benchmark" description="Memory leak check for session open/close" timeout="200" subfeature="Sensor Framework">
+ <step>/usr/bin/sensorbenchmark-test testSessionLeaks</step>
+ </case>
+ <case name="Sensord_Memory_OpenKill" level="Component" type="Benchmark" description="Memory leak check for session open/kill" timeout="200" subfeature="Sensor Framework">
+ <step>/usr/bin/sensorbenchmark-test testLostSessionLeaks</step>
+ </case>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ <set name="Sensord-pm-tests" description="Sensord power management tests" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+ <pre_steps>
+ <step expected_result="0">/usr/bin/sensordiverter.sh start</step>
+ <step>sleep 5</step>
+ </pre_steps>
+
+ <case name="Sensord_Power_Management" type="Functional" level="Component" description="Sensord power management handling test" timeout="100" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorpowermanagement-test</step>
+ </case>
+
+ <case name="Sensord_Standby_Override" type="Functional" level="Component" description="Sensord standby override test" timeout="100" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorstandbyoverride-test</step>
+ </case>
+
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+
+ <post_steps>
+ <step expected_result="0">/usr/bin/sensordiverter.sh stop</step>
+ </post_steps>
+ </set>
+
+
+ <set name="Sensord-benchmark-tests" description="Benchmark test cases for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+
+ <pre_steps>
+ <!-- Stop sensord, kill to make sure -->
+ <step>stop sensord</step>
+ <step>killall sensord</step>
+ <step>rm -f /tmp/sensorTestSampleRate</step>
+ <step>mv @LIBDIR@/sensord/libalsadaptor.so @LIBDIR@/sensord/libalsadaptor.so.orig</step>
+ <step>ln -s @LIBDIR@/sensord/testing/libalsadaptor.so @LIBDIR@/sensord/libalsadaptor.so</step>
+ </pre_steps>
+
+ <case name="Sensord_Benchmark_50hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 50hz" timeout="45" subfeature="Sensor Framework">
+ <step>echo 20 > /tmp/sensorTestSampleRate</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ <step>/usr/bin/sensorbenchmark-test testThroughput</step>
+ </case>
+ <case name="Sensord_Benchmark_200hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 200hz" timeout="45" subfeature="Sensor Framework">
+ <step>stop sensord</step>
+ <step>echo 5 > /tmp/sensorTestSampleRate</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ <step>/usr/bin/sensorbenchmark-test testThroughput</step>
+ </case>
+ <case name="Sensord_Benchmark_500hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 500hz" timeout="45" subfeature="Sensor Framework">
+ <step>stop sensord</step>
+ <step>echo 2 > /tmp/sensorTestSampleRate</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ <step>/usr/bin/sensorbenchmark-test testThroughput</step>
+ </case>
+
+ <post_steps>
+ <!-- Clean up and restore normal behavior-->
+ <step>stop sensord</step>
+ <step>rm -f /tmp/sensorTestSampleRate</step>
+ <step>rm -f @LIBDIR@/sensord/libalsadaptor.so</step>
+ <step>mv @LIBDIR@/sensord/libalsadaptor.so.orig @LIBDIR@/sensord/libalsadaptor.so</step>
+ <step>start sensord</step>
+ </post_steps>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ <set name="Sensord-external-tests" description="External issue tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+ <case name="Sensord_External" level="Component" type="Functional" description="Check external required API, values etc." timeout="15" subfeature="Sensor Framework" insignificant="true">
+ <step>/usr/bin/sensorexternal-test</step>
+ </case>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ </suite>
+ </testdefinition>
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.12.2.tar.bz2/tests/testutils/sensordiverter.sh
^
|
@@ -2,8 +2,6 @@
##
## Copyright (C) 2009-2010 Nokia Corporation
##
-## Contact: Tapio Rantala <ext-tapio.rantala@nokia.com>
-##
## This file is part of Sensord.
##
## Sensord is free software; you can redistribute it and/or modify
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.inc
^
|
@@ -1,7 +1,6 @@
Summary: Sensor Framework Qt5
-Group: System/Sensor Framework
License: LGPLv2+
-URL: http://gitorious.org/sensorfw
+URL: https://git.sailfishos.org/mer-core/sensorfw
Source0: %{name}-%{version}.tar.bz2
# Eventhough this is not really needed we have this here
# as this is added to packaging dir by tar_git.
@@ -23,7 +22,6 @@
%package devel
Summary: Sensor framework daemon libraries development headers
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt5-qtcore-devel
Requires: qt5-qtdbus-devel
@@ -33,20 +31,17 @@
Development headers for sensor framework daemon and libraries.
%prep
-%setup -q -n %{name}-%{version}
+%autosetup -n %{name}-%{version}
%build
unset LD_AS_NEEDED
-export LD_RUN_PATH=/usr/lib/sensord-qt5/
-export QT_SELECT=5
+export LD_RUN_PATH=%{_libdir}/sensord-qt5/
%qmake5 CONFIG+=hybris %{qmake_extra_parameters} PC_VERSION=`echo %{version} | sed 's/+.*//'`
-make %{?_smp_mflags}
+%make_build
%install
-rm -rf %{buildroot}
-export QT_SELECT=5
%qmake5_install
%post
@@ -57,6 +52,7 @@
%files
%defattr(-,root,root,-)
+%license COPYING
%{_libdir}/libhybrissensorfw*.so.*
%{_libdir}/libhybrissensorfw*.so
%{_libdir}/sensord-qt5/*.so
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfwd.service
^
|
@@ -11,6 +11,11 @@
ExecReload=/bin/kill -HUP $MAINPID
Restart=always
RestartSec=1
+# Sandboxing
+CapabilityBoundingSet=CAP_BLOCK_SUSPEND CAP_DAC_OVERRIDE CAP_FOWNER
+PrivateTmp=yes
+ProtectHome=yes
+ProtectSystem=full
[Install]
WantedBy=graphical.target
|