summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Toikkanen <timo.toikkanen@ixonos.com>2013-06-04 14:51:17 +0300
committerJacek Pielaszkiewicz <j.pielaszkie@samsung.com>2013-10-28 11:21:39 +0100
commite0214813cbdbc7cafcedee969fc4ddb5b5c24145 (patch)
tree9339a228406ac502c254b826a42922bc9a3c375c
parent71bcf8ea1048dd83b4a913934f424bfd922d4af5 (diff)
downloadsensor-framework-e0214813cbdbc7cafcedee969fc4ddb5b5c24145.tar.gz
sensor-framework-e0214813cbdbc7cafcedee969fc4ddb5b5c24145.tar.bz2
sensor-framework-e0214813cbdbc7cafcedee969fc4ddb5b5c24145.zip
Partial fix for TZSP-5314 Motion sensor enable for PR3 device
Change-Id: Ia8d349c3ad30bcc2a5b410fea5e1ae8e57bf7530 Signed-off-by: Jacek Pielaszkiewicz <j.pielaszkie@samsung.com>
-rw-r--r--CMakeLists.txt5
-rw-r--r--packaging/sensor-framework.changes3
-rwxr-xr-xsf_data_stream-mfld-blackbay.conf8
-rwxr-xr-xsf_processor-mfld-blackbay.conf7
4 files changed, 21 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53cab73..73545f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,9 @@ endif()
add_subdirectory(server)
if("${PLATFORM_ARCH}" MATCHES "arch_ia")
- CONFIGURE_FILE(sf_sensor.conf.in sf_sensor.conf @ONLY)
- CONFIGURE_FILE(sf_filter.conf.in sf_filter.conf @ONLY)
+ file(WRITE empty.conf " ")
+ CONFIGURE_FILE(empty.conf sf_sensor.conf @ONLY)
+ CONFIGURE_FILE(empty.conf sf_filter.conf @ONLY)
CONFIGURE_FILE(sf_processor-mfld-blackbay.conf sf_processor.conf @ONLY)
CONFIGURE_FILE(sf_data_stream-mfld-blackbay.conf sf_data_stream.conf @ONLY)
install(FILES
diff --git a/packaging/sensor-framework.changes b/packaging/sensor-framework.changes
index b980bdb..2555031 100644
--- a/packaging/sensor-framework.changes
+++ b/packaging/sensor-framework.changes
@@ -1,3 +1,6 @@
+* Tue Jun 04 2013 Timo Toikkanen <timo.toikkanen@ixonos.com> submit/tizen_2.2/20130604.080218@69ee0e8
+- Partial fix for TZSP-5314 Motion sensor enable for PR3 device
+
* Tue Feb 19 2013 Telle-Tiia Pitkanen <telle-tiia.pitkanen@ixonos.com> accepted/trunk/20130131.000522@e0551a5
- PR3 required changes added.
- Add assign tag in manifest file
diff --git a/sf_data_stream-mfld-blackbay.conf b/sf_data_stream-mfld-blackbay.conf
index 2d22cc6..2182099 100755
--- a/sf_data_stream-mfld-blackbay.conf
+++ b/sf_data_stream-mfld-blackbay.conf
@@ -30,6 +30,14 @@ id=2214
override=yes
disable=no
+[motion_datastream]
+multi_stream=disable
+processor_input=motion_processor, motion_processor, motion_prosessor
+version=1
+id=2209
+override=yes
+disable=no
+
[gyro_datastream]
multi_stream=disable
processor_input=gyro_processor, gyro_processor, gyro_processor
diff --git a/sf_processor-mfld-blackbay.conf b/sf_processor-mfld-blackbay.conf
index ef948cf..84cec7a 100755
--- a/sf_processor-mfld-blackbay.conf
+++ b/sf_processor-mfld-blackbay.conf
@@ -33,3 +33,10 @@ id=2124
version=1
override=yes
disable=no
+
+[motion_processor]
+path=/usr/lib/sensor_framework/libmotionprocessor.so
+id=2111
+version=1
+override=yes
+disable=no