summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuHyun Kim <jh8212.kim@samsung.com>2012-08-22 13:45:14 +0900
committerJuHyun Kim <jh8212.kim@samsung.com>2012-08-22 13:45:14 +0900
commitc1d394faa3c49618ed8c1005a1b0fb65c6e52f63 (patch)
tree2e9fc1b0b93857a9714dc44a0a42487fcceabe34
parent2aeb8ada040089818eb811bd85098a200b685cb1 (diff)
downloadlibslp-sensor-master.tar.gz
libslp-sensor-master.tar.bz2
libslp-sensor-master.zip
-rw-r--r--AUTHORSbin112 -> 368640 bytes
-rw-r--r--CMakeLists.txt6
-rw-r--r--COPYING506
-rwxr-xr-xTC/unit/Makefile3
-rwxr-xr-xTC/unit/tslist1
-rw-r--r--debian/changelog23
-rw-r--r--debian/compat1
-rw-r--r--debian/control27
-rw-r--r--debian/control.libs18
-rw-r--r--debian/dirs2
-rw-r--r--debian/docs1
-rw-r--r--debian/libslp-sensor-0.install.in1
-rw-r--r--debian/libslp-sensor-0.postinst.in10
-rw-r--r--debian/libslp-sensor-dev.install.in10
-rwxr-xr-xdebian/rules124
-rwxr-xr-xinclude/sensor.h63
-rwxr-xr-xinclude/sensor_accel.h24
-rwxr-xr-xinclude/sensor_barometer.h84
-rwxr-xr-xinclude/sensor_fusion.h74
-rwxr-xr-xinclude/sensor_geomag.h2
-rwxr-xr-xinclude/sensor_motion.h92
-rw-r--r--packaging/sensor.spec15
-rwxr-xr-xsrc/client.cpp819
23 files changed, 1548 insertions, 358 deletions
diff --git a/AUTHORS b/AUTHORS
index 4a9d6ba..105fabd 100644
--- a/AUTHORS
+++ b/AUTHORS
Binary files differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c35ab1..f7b1b63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ add_definitions(${rpkgs_CFLAGS})
#add_definitions(-Wall -O3 -omit-frame-pointer -lm)
#add_definitions(-Wall -g -lma -DUSE_FILE_DEBUG)
-#add_definitions(-Wall -g -lma -D_DEBUG)
+add_definitions(-Wall -g -lma -D_DEBUG)
#add_definitions(-fvisibility=hidden -lm -DUSE_DLOG_LOG)
#add_definitions(-fvisibility=hidden -lm)
@@ -54,7 +54,7 @@ install(FILES include/sensor_proxi.h DESTINATION include/sensor/)
install(FILES include/sensor_motion.h DESTINATION include/sensor/)
install(FILES include/sensor_light.h DESTINATION include/sensor/)
install(FILES include/sensor_gyro.h DESTINATION include/sensor/)
-
-
+install(FILES include/sensor_barometer.h DESTINATION include/sensor/)
+install(FILES include/sensor_fusion.h DESTINATION include/sensor/)
install(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..1683b26
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,506 @@
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/TC/unit/Makefile b/TC/unit/Makefile
index 31e9016..a1176cb 100755
--- a/TC/unit/Makefile
+++ b/TC/unit/Makefile
@@ -9,8 +9,7 @@ TARGETS = utc_SensorFW_sf_get_properties_func \
utc_SensorFW_sf_register_event_func \
utc_SensorFW_sf_unregister_event_func \
utc_SensorFW_sf_get_data_func \
- utc_SensorFW_sf_check_rotation_func \
- utc_SensorFW_sf_read_raw_data_func
+ utc_SensorFW_sf_check_rotation_func
PKGS = sf_common sensor
diff --git a/TC/unit/tslist b/TC/unit/tslist
index d7c0eff..8f2ef26 100755
--- a/TC/unit/tslist
+++ b/TC/unit/tslist
@@ -8,4 +8,3 @@
/unit/utc_SensorFW_sf_unregister_event_func
/unit/utc_SensorFW_sf_get_data_func
/unit/utc_SensorFW_sf_check_rotation_func
-/unit/utc_SensorFW_sf_read_raw_data_func
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 0bac025..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,23 +0,0 @@
-libslp-sensor (0.5.6-42) unstable; urgency=low
-
- * version sync
- * Git:165.213.180.234:public/pkgs/l/libslp-sensor
- * Tag:libslp-sensor_0.5.6-42
-
- -- JuHyun Kim <jh8212.kim@samsung.com> Fri, 30 Mar 2012 09:52:15 +0900
-
-libslp-sensor (0.5.6-41) unstable; urgency=low
-
- * version sync
- * Git:165.213.180.114:pkgs/l/libslp-sensor
- * Tag:libslp-sensor_0.5.6-41
-
- -- JuHyun Kim <jh8212.kim@samsung.com> Thu, 15 Dec 2011 10:54:47 +0900
-
-libslp-sensor (0.0.1-1) unstable; urgency=low
-
- * Initial Release.
- * Git:165.213.180.114:pkgs/l/libslp-sensor
- * Tag:libslp-sensor_0.0.0-1
-
- -- JuHyun Kim <jh8212.kim@samsung.com> Wed, 07 Dec 2011 12:51:28 +0900
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100644
index fc85411..0000000
--- a/debian/control
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: libslp-sensor
-Section: libs
-Priority: extra
-Maintainer: Juhyun Kim <jh8212.kim@samsung.com>, Taesoo Jun <steve.jun@samsung.com>
-Build-Depends: debhelper (>= 5), autotools-dev, libsf-common-dev, libslp-setting-dev, libglib2.0-dev
-Standards-Version: 0.1.0
-Homepage: N/A
-
-Package: libslp-sensor-dev
-XB-Public-Package: yes
-Architecture: any
-Depends: libslp-sensor-0 (= ${Source-Version})
-Description: Sensor framework client library
- Sensor framework client library.
-
-Package: libslp-sensor-0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsf-common-0
-Description: Sensor framework client library
- Sensor framework client library.
-
-Package: libslp-sensor-dbg
-Section: debug
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libslp-sensor-0(= ${Source-Version})
-Description:Sensor framework client library(unstripped)
- Easy Sensor framework client library for SLP(not recommended)
diff --git a/debian/control.libs b/debian/control.libs
deleted file mode 100644
index bd07b5f..0000000
--- a/debian/control.libs
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: <yoursource>
-Section: unknown
-Priority: extra
-Maintainer: unknown <unknown@samsung.com>
-Build-Depends: debhelper (>= 5), autotools-dev
-Standards-Version: 0.1.0
-
-Package: <yourpkg>-dev
-Section: libs
-Architecture: any
-Depends: <yourpkg> (= ${Source-Version})
-Description: <Fill description>
-
-Package: <yourpkg>
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <Fill description>
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index a0f0008..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-CMakeLists.txt
diff --git a/debian/libslp-sensor-0.install.in b/debian/libslp-sensor-0.install.in
deleted file mode 100644
index bf766f0..0000000
--- a/debian/libslp-sensor-0.install.in
+++ /dev/null
@@ -1 +0,0 @@
-@PREFIX@/lib/*.so*
diff --git a/debian/libslp-sensor-0.postinst.in b/debian/libslp-sensor-0.postinst.in
deleted file mode 100644
index 8e2fad5..0000000
--- a/debian/libslp-sensor-0.postinst.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#if [ ${USER} == "root" ];then
- # change file owner
- # 1.libraries
- #chown root:root /usr/lib/libsensor.so
-#fi
-# change file permissions
-# 1.libraries
-#chmod 644 /usr/lib/libsensor.so
-
diff --git a/debian/libslp-sensor-dev.install.in b/debian/libslp-sensor-dev.install.in
deleted file mode 100644
index b3d4413..0000000
--- a/debian/libslp-sensor-dev.install.in
+++ /dev/null
@@ -1,10 +0,0 @@
-@PREFIX@/include/sensor/sensor.h
-@PREFIX@/include/sensor/sensor_accel.h
-@PREFIX@/include/sensor/sensor_geomag.h
-@PREFIX@/include/sensor/sensor_proxi.h
-@PREFIX@/include/sensor/sensor_motion.h
-@PREFIX@/include/sensor/sensor_light.h
-@PREFIX@/include/sensor/sensor_gyro.h
-@PREFIX@/lib/pkgconfig/*.pc
-
-
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 7841ecc..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS ?= -Wall -g
-CXXFLAGS ?= -Wall -g
-LDFLAGS ?=
-PREFIX ?= /usr
-DATADIR ?= /opt
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- CXXFLAGS += -O0
-else
- CFLAGS += -O2
- CXXFLAGS += -O2
-endif
-
-LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake . -DCMAKE_INSTALL_PREFIX=$(PREFIX)
-
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- dh_buildinfo generate cat
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/wavplayer.sgml > wavplayer.1
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- cat $$f > $${f%.in}; \
- sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
- sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
- done
-
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
- rm -rf CMakeCache.txt
- rm -rf CMakeFiles
- rm -rf cmake_install.cmake
- rm -rf Makefile
- rm -rf install_manifest.txt
- rm -rf *.so
- rm -rf *.pc
- rm -rf $(CURDIR)/debian/buildinfo
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- rm -f $${f%.in}; \
- done
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/wavplayer.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_buildinfo install
- dh_installexamples
- dh_install --sourcedir=debian/tmp
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip --dbg-package=libslp-sensor-dbg
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs -plibslp-sensor-0
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/include/sensor.h b/include/sensor.h
index 2770464..034697a 100755
--- a/include/sensor.h
+++ b/include/sensor.h
@@ -67,8 +67,9 @@ typedef enum {
PROXIMITY_SENSOR = 0x0008,
THERMOMETER_SENSOR = 0x0010,
GYROSCOPE_SENSOR = 0x0020,
- PRESSURE_SENSOR = 0x0040,
+ BAROMETER_SENSOR = 0x0040,
MOTION_SENSOR = 0x0080,
+ FUSION_SENSOR = 0x0100,
} sensor_type_t;
/*header for each sensor type*/
@@ -78,8 +79,10 @@ typedef enum {
#include <sensor_proxi.h>
#include <sensor_motion.h>
#include <sensor_gyro.h>
+#include <sensor_barometer.h>
+#include <sensor_fusion.h>
-#define MAX_KEY_LEN 30
+#define MAX_KEY_LEN 64
#define MAX_VALUE_SIZE 12
typedef enum {
@@ -96,8 +99,8 @@ typedef struct {
typedef struct {
- size_t event_data_size;
- void *event_data;
+ size_t event_data_size;
+ void *event_data;
} sensor_event_data_t;
typedef void (*sensor_callback_func_t)(unsigned int, sensor_event_data_t *, void *); /**/
@@ -112,7 +115,6 @@ enum sensor_data_unit_idx {
SENSOR_UNIT_LEVEL_1_TO_10,
SENSOR_UNIT_STATE_ON_OFF,
SENSOR_UNIT_DEGREE_PER_SECOND,
-
SENSOR_UNIT_IDX_END
};
@@ -124,6 +126,11 @@ enum sensor_data_accuracy {
SENSOR_ACCURACY_VERYGOOD = 3
};
+enum sensor_start_option {
+ SENSOR_OPTION_DEFAULT = 0,
+ SENSOR_OPTION_ALWAYS_ON = 1,
+};
+
typedef struct {
int data_accuracy;
int data_unit_idx;
@@ -214,7 +221,7 @@ int sf_disconnect(int handle);
* @fn int sf_start(int handle , int option)
* @brief This API sends a start command to sensor server. This intimates server that the client side is ready to handle data and start processing. The parameter option should be '0' for current usages.
* @param[in] handle received handle value by sf_connect()
- * @param[in] option just set a "0" value (not support current , reserved for future
+ * @param[in] option With SENSOR_OPTION_DEFAULT, it stops to sense when LCD is off, and with SENSOR_OPTION_ALWAYS_ON, it continues to sense even when LCD is off
* @return if it succeed, it return zero value , otherwise negative value return
*/
int sf_start(int handle , int option);
@@ -270,6 +277,50 @@ int sf_get_data(int handle , unsigned int data_id , sensor_data_t* values);
*/
int sf_check_rotation( unsigned long *curr_state);
+
+/**
+ * @fn int sf_set_wakeup(sensor_type_t sensor_type)
+ * @brief This API used to set wakeup AP.
+ * @return if it succeed, it return zero value , otherwise negative value return
+ */
+int sf_set_wakeup(sensor_type_t sensor_type);
+
+
+/**
+ * @fn int sf_unset_wakeup(sensor_type_t sensor_type)
+ * @brief This API used to unset wakeup function.
+ * @return if it succeed, it return zero value , otherwise negative value return
+ */
+int sf_unset_wakeup(sensor_type_t sensor_type);
+
+
+/**
+ * @fn int sf_is_wakeup_supported(void)
+ * @brief This API will return 0 when it is available and negative value when it does not available
+ * @return if it succeed, it return zero value , otherwise negative value return
+ */
+int sf_is_wakeup_supported(sensor_type_t sensor_type);
+
+
+
+/**
+ * @fn int sf_is_wakeup_enabled(void)
+ * @brief This API check that wakeup is setted or unsetted
+ * @return if it succeed, it return zero value , otherwise negative value return
+ */
+int sf_is_wakeup_enabled(sensor_type_t sensor_type);
+
+
+
+/**
+ * @fn int sf_change_event_condition(int handle, unsigned int event_type, event_condition_t *event_condition)
+ * @brief This API change a user defined callback function condition with a sensor registered with the specified handle.
+ * @param[in] handle received handle value by sf_connect()
+ * @param[in] event_type your desired event_type that you want to unregister event
+ * @param[in] event_condition your desired event condition that you want to change event
+ * @return if it succeed, it return zero value , otherwise negative value return
+ */
+int sf_change_event_condition(int handle, unsigned int event_type, event_condition_t *event_condition);
/**
* @}
*/
diff --git a/include/sensor_accel.h b/include/sensor_accel.h
index 31bd28b..d2d5728 100755
--- a/include/sensor_accel.h
+++ b/include/sensor_accel.h
@@ -51,17 +51,19 @@ extern "C"
enum accelerometer_data_id {
- ACCELEROMETER_BASE_DATA_SET = (ACCELEROMETER_SENSOR<<16) | 0x0001,
- ACCELEROMETER_ORIENTATION_DATA_SET = (ACCELEROMETER_SENSOR<<16) | 0x0002,
+ ACCELEROMETER_BASE_DATA_SET = (ACCELEROMETER_SENSOR << 16) | 0x0001,
+ ACCELEROMETER_ORIENTATION_DATA_SET = (ACCELEROMETER_SENSOR << 16) | 0x0002,
+ ACCELEROMETER_LINEAR_ACCELERATION_DATA_SET = (ACCELEROMETER_SENSOR << 16) | 0x0004,
};
enum accelerometer_event_type {
- ACCELEROMETER_EVENT_ROTATION_CHECK = (ACCELEROMETER_SENSOR<<16) | 0x0001,
- ACCELEROMETER_EVENT_RAW_DATA_REPORT_ON_TIME = (ACCELEROMETER_SENSOR<<16) | 0x0002,
- ACCELEROMETER_EVENT_CALIBRATION_NEEDED = (ACCELEROMETER_SENSOR<<16) | 0x0004,
- ACCELEROMETER_EVENT_SET_HORIZON = (ACCELEROMETER_SENSOR<<16) | 0x0008,
- ACCELEROMETER_EVENT_SET_WAKEUP = (ACCELEROMETER_SENSOR<<16) | 0x0010,
- ACCELEROMETER_EVENT_ORIENTATION_DATA_REPORT_ON_TIME = (ACCELEROMETER_SENSOR<<16) | 0x0011,
+ ACCELEROMETER_EVENT_ROTATION_CHECK = (ACCELEROMETER_SENSOR << 16) | 0x0001,
+ ACCELEROMETER_EVENT_RAW_DATA_REPORT_ON_TIME = (ACCELEROMETER_SENSOR << 16) | 0x0002,
+ ACCELEROMETER_EVENT_CALIBRATION_NEEDED = (ACCELEROMETER_SENSOR << 16) | 0x0004,
+ ACCELEROMETER_EVENT_SET_HORIZON = (ACCELEROMETER_SENSOR << 16) | 0x0008,
+ ACCELEROMETER_EVENT_SET_WAKEUP = (ACCELEROMETER_SENSOR << 16) | 0x0010,
+ ACCELEROMETER_EVENT_ORIENTATION_DATA_REPORT_ON_TIME = (ACCELEROMETER_SENSOR << 16) | 0x0020,
+ ACCELEROMETER_EVENT_LINEAR_ACCELERATION_DATA_REPORT_ON_TIME = (ACCELEROMETER_SENSOR << 16) | 0x0040,
};
@@ -83,9 +85,13 @@ enum accelerometer_property_id {
ACCELEROMETER_PROPERTY_CHECK_CALIBRATION_STATUS,
ACCELEROMETER_PROPERTY_SET_WAKEUP,
ACCELEROMETER_PROPERTY_CHECK_WAKEUP_STATUS,
+ ACCELEROMETER_PROPERTY_CHECK_WAKEUP_SUPPORTED,
};
-
+enum accelerometer_wakeup_state {
+ WAKEUP_UNSET = 0,
+ WAKEUP_SET = 1,
+};
struct rotation_event {
enum accelerometer_rotate_state rotation;
diff --git a/include/sensor_barometer.h b/include/sensor_barometer.h
new file mode 100755
index 0000000..85820e6
--- /dev/null
+++ b/include/sensor_barometer.h
@@ -0,0 +1,84 @@
+/*
+ * libslp-sensor
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: JuHyun Kim <jh8212.kim@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+
+#ifndef __SAMSUNG_LINUX_SENSOR_BAROMETER_H__
+#define __SAMSUNG_LINUX_SENSOR_BAROMETER_H__
+
+//! Pre-defined events for the barometerscope sensor
+//! Sensor Plugin developer can add more event to their own headers
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/**
+ * @defgroup SENSOR_BAROMETER barometer Sensor
+ * @ingroup SENSOR_FRAMEWORK
+ *
+ * These APIs are used to control the barometer sensor.
+ * @{
+ */
+
+/**
+ * @file sensor_barometer.h
+ * @brief This file contains the prototypes of the barometer sensor API
+ * @author JuHyun Kim(jh8212.kim@samsung.com)
+ * @date 2010-01-24
+ * @version 0.1
+ */
+
+
+enum barometer_data_id {
+ BAROMETER_BASE_DATA_SET = (BAROMETER_SENSOR<<16) | 0x0001,
+ BAROMETER_TEMPERATURE_DATA_SET = (BAROMETER_SENSOR<<16) | 0x0002,
+ BAROMETER_ALTITUDE_DATA_SET = (BAROMETER_SENSOR<<16) | 0x0004,
+};
+
+
+enum barometer_evet_type {
+ BAROMETER_EVENT_RAW_DATA_REPORT_ON_TIME = (BAROMETER_SENSOR<<16) |0x0001,
+ BAROMETER_EVENT_TEMPERATURE_DATA_REPORT_ON_TIME = (BAROMETER_SENSOR<<16) |0x0002,
+ BAROMETER_EVENT_ALTITUDE_DATA_REPORT_ON_TIME = (BAROMETER_SENSOR<<16) |0x0004,
+
+};
+
+enum barometer_property_id {
+ BAROMETER_PROPERTY_UNKNOWN = 0,
+ BAROMETER_PROPERTY_SET_CALIBRATION,
+ BAROMETER_PROPERTY_CHECK_CALIBRATION,
+};
+
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
+//! End of a file
diff --git a/include/sensor_fusion.h b/include/sensor_fusion.h
new file mode 100755
index 0000000..d10add6
--- /dev/null
+++ b/include/sensor_fusion.h
@@ -0,0 +1,74 @@
+/*
+ * libslp-sensor
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: JuHyun Kim <jh8212.kim@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+
+#ifndef __SAMSUNG_LINUX_SENSOR_FUSION_H__
+#define __SAMSUNG_LINUX_SENSOR_FUSION_H__
+
+
+//! Pre-defined events for the accelometer sensor
+//! Sensor Plugin developer can add more event to their own headers
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/**
+ * @defgroup SENSOR_FUSION Fusion Sensor
+ * @ingroup SENSOR_FRAMEWORK
+ *
+ * These APIs are used to control the Fusion sensor.
+ * @{
+ */
+
+/**
+ * @file sensor_accel.h
+ * @brief This file contains the prototypes of the Accelerometer sensor API
+ * @author JuHyun Kim(jh8212.kim@samsung.com)
+ * @date 2010-01-24
+ * @version 0.1
+ */
+
+
+enum fusion_data_id {
+ FUSION_BASE_DATA_SET = (FUSION_SENSOR << 16) | 0x0001,
+ FUSION_ROTATION_VECTOR_DATA_SET = (FUSION_SENSOR<< 16) | 0x0002,
+ FUSION_ROTATION_MATRIX_DATA_SET = (FUSION_SENSOR << 16) | 0x0004,
+};
+enum fusion_evet_type_t {
+ FUSION_SENSOR_EVENT_RAW_DATA_REPORT_ON_TIME = (FUSION_SENSOR << 16) | 0x0001,
+ FUSION_ROTATION_VECTOR_EVENT_DATA_REPORT_ON_TIME = (FUSION_SENSOR << 16) | 0x0002,
+ FUSION_ROTATION_MATRIX_EVENT_DATA_REPORT_ON_TIME = (FUSION_SENSOR << 16) | 0x0004,
+};
+
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+//! End of a file
diff --git a/include/sensor_geomag.h b/include/sensor_geomag.h
index c936d4c..3c9c1ee 100755
--- a/include/sensor_geomag.h
+++ b/include/sensor_geomag.h
@@ -54,7 +54,7 @@ extern "C"
enum geomag_data_id {
GEOMAGNETIC_BASE_DATA_SET = (GEOMAGNETIC_SENSOR<<16) | 0x0001,
GEOMAGNETIC_RAW_DATA_SET = (GEOMAGNETIC_SENSOR<<16) | 0x0001,
- GEOMAGNETIC_ATITUDE_DATA_SET = (GEOMAGNETIC_SENSOR<<16) | 0x0002,
+ GEOMAGNETIC_ATTITUDE_DATA_SET = (GEOMAGNETIC_SENSOR<<16) | 0x0002,
};
diff --git a/include/sensor_motion.h b/include/sensor_motion.h
index ec095aa..c2812e8 100755
--- a/include/sensor_motion.h
+++ b/include/sensor_motion.h
@@ -35,43 +35,69 @@ extern "C"
enum motion_evet_type {
- MOTION_ENGINE_EVENT_SNAP = (MOTION_SENSOR<<16) |0x0001,
- MOTION_ENGINE_EVENT_SHAKE = (MOTION_SENSOR<<16) |0x0002,
- MOTION_ENGINE_EVENT_DOUBLETAP = (MOTION_SENSOR<<16) |0x0004,
- MOTION_ENGINE_EVENT_PANNING = (MOTION_SENSOR<<16) |0x0008,
- MOTION_ENGINE_EVENT_TOP_TO_BOTTOM = (MOTION_SENSOR<<16) |0x0010,
+ MOTION_ENGINE_EVENT_SNAP = (MOTION_SENSOR<<16) | 0x0001,
+ MOTION_ENGINE_EVENT_SHAKE = (MOTION_SENSOR<<16) | 0x0002,
+ MOTION_ENGINE_EVENT_DOUBLETAP = (MOTION_SENSOR<<16) | 0x0004,
+ MOTION_ENGINE_EVENT_PANNING = (MOTION_SENSOR<<16) | 0x0008,
+ MOTION_ENGINE_EVENT_TOP_TO_BOTTOM = (MOTION_SENSOR<<16) | 0x0010,
+ MOTION_ENGINE_EVENT_DIRECT_CALL = (MOTION_SENSOR<<16) | 0x0020,
+ MOTION_ENGINE_EVENT_TILT_TO_UNLOCK = (MOTION_SENSOR<<16) | 0x0040,
+ MOTION_ENGINE_EVENT_LOCK_EXECUTE_CAMERA = (MOTION_SENSOR<<16) | 0x0080,
+ MOTION_ENGINE_EVENT_REACTIVE_ALERT = (MOTION_SENSOR<<16) | 0x0100,
};
enum motion_snap_event {
- MOTION_ENGIEN_SNAP_NONE,
- MOTION_ENGIEN_NEGATIVE_SNAP_X,
- MOTION_ENGIEN_POSITIVE_SNAP_X,
- MOTION_ENGIEN_NEGATIVE_SNAP_Y,
- MOTION_ENGIEN_POSITIVE_SNAP_Y,
- MOTION_ENGIEN_NEGATIVE_SNAP_Z,
- MOTION_ENGIEN_POSITIVE_SNAP_Z,
+ MOTION_ENGIEN_SNAP_NONE = 0,
+ MOTION_ENGIEN_NEGATIVE_SNAP_X = 1,
+ MOTION_ENGIEN_POSITIVE_SNAP_X = 2,
+ MOTION_ENGIEN_NEGATIVE_SNAP_Y = 3,
+ MOTION_ENGIEN_POSITIVE_SNAP_Y = 4,
+ MOTION_ENGIEN_NEGATIVE_SNAP_Z = 5,
+ MOTION_ENGIEN_POSITIVE_SNAP_Z = 6,
MOTION_ENGIEN_SNAP_LEFT = MOTION_ENGIEN_NEGATIVE_SNAP_X,
MOTION_ENGIEN_SNAP_RIGHT = MOTION_ENGIEN_POSITIVE_SNAP_X,
+ MOTION_ENGINE_SNAP_NONE = 0,
+ MOTION_ENGINE_NEGATIVE_SNAP_X = 1,
+ MOTION_ENGINE_POSITIVE_SNAP_X = 2,
+ MOTION_ENGINE_NEGATIVE_SNAP_Y = 3,
+ MOTION_ENGINE_POSITIVE_SNAP_Y = 4,
+ MOTION_ENGINE_NEGATIVE_SNAP_Z = 5,
+ MOTION_ENGINE_POSITIVE_SNAP_Z = 6,
+ MOTION_ENGINE_SNAP_LEFT = MOTION_ENGINE_NEGATIVE_SNAP_X,
+ MOTION_ENGINE_SNAP_RIGHT = MOTION_ENGINE_POSITIVE_SNAP_X,
+
};
enum motion_shake_event {
- MOTION_ENGIEN_SHAKE_NONE,
- MOTION_ENGIEN_SHAKE_DETECTION,
- MOTION_ENGIEN_SHAKE_CONTINUING,
- MOTION_ENGIEN_SHAKE_FINISH,
- MOTION_ENGINE_SHAKE_BREAK,
+ MOTION_ENGIEN_SHAKE_NONE = 0,
+ MOTION_ENGIEN_SHAKE_DETECTION = 1,
+ MOTION_ENGIEN_SHAKE_CONTINUING = 2,
+ MOTION_ENGIEN_SHAKE_FINISH = 3,
+ MOTION_ENGINE_SHAKE_BREAK = 4,
+ MOTION_ENGINE_SHAKE_NONE = 0,
+ MOTION_ENGINE_SHAKE_DETECTION = 1,
+ MOTION_ENGINE_SHAKE_CONTINUING = 2,
+ MOTION_ENGINE_SHAKE_FINISH = 3,
+
};
enum motion_doubletap_event {
- MOTION_ENGIEN_DOUBLTAP_NONE,
- MOTION_ENGIEN_DOUBLTAP_DETECTION,
+ MOTION_ENGIEN_DOUBLTAP_NONE = 0,
+ MOTION_ENGIEN_DOUBLTAP_DETECTION = 1,
+ MOTION_ENGINE_DOUBLTAP_NONE = 0,
+ MOTION_ENGINE_DOUBLTAP_DETECTION = 1,
+
};
enum motion_top_to_bottom_event {
- MOTION_ENGIEN_TOP_TO_BOTTOM_NONE,
- MOTION_ENGIEN_TOP_TO_BOTTOM_WAIT,
- MOTION_ENGIEN_TOP_TO_BOTTOM_DETECTION,
+ MOTION_ENGIEN_TOP_TO_BOTTOM_NONE = 0,
+ MOTION_ENGIEN_TOP_TO_BOTTOM_WAIT = 1,
+ MOTION_ENGIEN_TOP_TO_BOTTOM_DETECTION = 2,
+ MOTION_ENGINE_TOP_TO_BOTTOM_NONE = 0,
+ MOTION_ENGINE_TOP_TO_BOTTOM_WAIT = 1,
+ MOTION_ENGINE_TOP_TO_BOTTOM_DETECTION = 2,
+
};
enum motion_property_id {
@@ -80,6 +106,28 @@ enum motion_property_id {
MOTION_PROPERTY_CHECK_GYRO_SENSOR,
};
+enum motion_direct_call_event_t {
+ MOTION_ENGINE_DIRECT_CALL_NONE,
+ MOTION_ENGINE_DIRECT_CALL_DETECTION,
+};
+
+enum motion_tilt_to_unlock_event_t {
+ MOTION_ENGINE_TILT_TO_UNLOCK_NONE,
+ MOTION_ENGINE_TILT_TO_UNLOCK_DETECTION,
+};
+
+enum motion_lock_execute_camera_event_t {
+ MOTION_ENGINE_LOCK_EXECUTE_CAMERA_NONE,
+ MOTION_ENGINE_LOCK_EXECUTE_CAMERA_L_DETECTION,
+ MOTION_ENGINE_LOCK_EXECUTE_CAMERA_R_DETECTION,
+};
+
+enum motion_reactive_alert_t {
+ MOTION_ENGINE_REACTIVE_ALERT_NONE,
+ MOTION_ENGINE_REACTIVE_ALERT_DETECTION,
+};
+
+
/**
* @}
*/
diff --git a/packaging/sensor.spec b/packaging/sensor.spec
index 753c97d..fae68cf 100644
--- a/packaging/sensor.spec
+++ b/packaging/sensor.spec
@@ -1,21 +1,19 @@
Name: sensor
Summary: Sensor framework client library
-Version: 0.5.6
+Version: 0.5.10
Release: 1
Group: TO_BE/FILLED_IN
License: TO BE FILLED IN
Source0: sensor-%{version}.tar.gz
-Source1001: packaging/sensor.manifest
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: cmake
-BuildRequires: pkgconfig(vconf)
+BuildRequires: vconf-keys-devel
BuildRequires: pkgconfig(sf_common)
BuildRequires: pkgconfig(vconf)
BuildRequires: pkgconfig(glib-2.0)
-
%description
Sensor framework client library
@@ -35,7 +33,6 @@ Sensor framework client library (devel)
%build
-cp %{SOURCE1001} .
cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
@@ -46,20 +43,22 @@ rm -rf %{buildroot}
%make_install
+
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
+
+
%files
-%manifest sensor.manifest
%defattr(-,root,root,-)
-#%doc COPYING
%{_libdir}/libsensor.so.*
%files devel
-%manifest sensor.manifest
%defattr(-,root,root,-)
%{_includedir}/sensor/*.h
%{_libdir}/libsensor.so
diff --git a/src/client.cpp b/src/client.cpp
index caeab15..fe765a5 100755
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -66,6 +66,7 @@ extern int errno;
#define MAX_BIND_SLOT 16
#define MAX_CB_SLOT_PER_BIND 16
#define MAX_CB_BIND_SLOT 64
+#define MAX_EVENT_LIST 16
#define PITCH_MIN 35
#define PITCH_MAX 145
@@ -79,6 +80,8 @@ extern int errno;
#define PROXI_SENSOR_BASE_CHANNEL_NAME "proxi_datastream"
#define MOTION_ENGINE_BASE_CHANNEL_NAME "motion_datastream"
#define GYRO_SENSOR_BASE_CHANNEL_NAME "gyro_datastream"
+#define BAROMETER_SENSOR_BASE_CHANNEL_NAME "barometer_datastream"
+#define FUSION_SENSOR_BASE_CHANNEL_NAME "fusion_datastream"
#define ROTATION_0 0
#define ROTATION_90 90
@@ -86,24 +89,36 @@ extern int errno;
#define ROTATION_270 270
#define ROTATION_360 360
#define ROTATION_THD 45
-
+
#define RADIAN_VALUE (57.2957)
#define XY_POSITIVE_THD 2.0
#define XY_NEGATIVE_THD -2.0
#define ON_TIME_REQUEST_COUNTER 1
-
+#define VCONF_SF_SERVER_POWER_OFF "memory/private/sensor/poweroff"
const char *STR_SF_CLIENT_IPC_SOCKET = "/tmp/sf_socket";
-const char *LCD_TYPE_KEY = "memory/sensor/lcd_type";
static cmutex _lock;
+static int g_system_off_cb_ct = 0;
enum _sensor_current_state {
SENSOR_STATE_UNKNOWN = -1,
SENSOR_STATE_STOPPED = 0,
SENSOR_STATE_STARTED = 1,
+ SENSOR_STATE_PAUSED = 2
+};
+
+enum _sensor_wakeup_state {
+ SENSOR_WAKEUP_UNKNOWN = -1,
+ SENSOR_WAKEUP_UNSETTED = 0,
+ SENSOR_WAKEUP_SETTED = 1,
+};
+
+enum _sensor_poweroff_state {
+ SENSOR_POWEROFF_UNKNOWN = -1,
+ SENSOR_POWEROFF_AWAKEN = 1,
};
struct sf_bind_table_t {
@@ -113,6 +128,8 @@ struct sf_bind_table_t {
int cb_slot_num[MAX_CB_SLOT_PER_BIND];
int my_handle;
int sensor_state;
+ int wakeup_state;
+ int sensor_option;
};
struct cb_bind_table_t {
@@ -135,48 +152,102 @@ struct cb_bind_table_t {
static struct rotation_event rotation_mode[] =
{
- {
- ROTATION_UNKNOWN,
- {
- ROTATION_UNKNOWN,
- ROTATION_UNKNOWN
- },
- },
- {
- ROTATION_EVENT_90,
- {
- ROTATION_LANDSCAPE_LEFT,
- ROTATION_PORTRAIT_BTM
- },
- },
- {
- ROTATION_EVENT_0,
- {
- ROTATION_PORTRAIT_TOP,
- ROTATION_LANDSCAPE_LEFT
- },
- },
- {
- ROTATION_EVENT_180,
- {
- ROTATION_PORTRAIT_BTM,
- ROTATION_LANDSCAPE_RIGHT
- },
- },
- {
- ROTATION_EVENT_270,
- {
- ROTATION_LANDSCAPE_RIGHT,
- ROTATION_PORTRAIT_TOP
- },
- },
+ { ROTATION_UNKNOWN, { ROTATION_UNKNOWN, ROTATION_UNKNOWN }},
+ { ROTATION_EVENT_90, { ROTATION_LANDSCAPE_LEFT, ROTATION_PORTRAIT_BTM }},
+ { ROTATION_EVENT_0, { ROTATION_PORTRAIT_TOP, ROTATION_LANDSCAPE_LEFT }},
+ { ROTATION_EVENT_180, { ROTATION_PORTRAIT_BTM, ROTATION_LANDSCAPE_RIGHT }},
+ { ROTATION_EVENT_270, { ROTATION_LANDSCAPE_RIGHT, ROTATION_PORTRAIT_TOP }},
};
+struct event_counter_t {
+ const unsigned int event_type;
+ unsigned int event_counter;
+ unsigned int cb_list[MAX_BIND_SLOT];
+};
+
+static event_counter_t g_event_list[MAX_EVENT_LIST] = {
+ { ACCELEROMETER_EVENT_ROTATION_CHECK, 0, {0, }},
+ { ACCELEROMETER_EVENT_CALIBRATION_NEEDED, 0, {0, }},
+ { ACCELEROMETER_EVENT_SET_HORIZON, 0, {0, }},
+ { ACCELEROMETER_EVENT_SET_WAKEUP, 0, {0, }},
+ { GEOMAGNETIC_EVENT_CALIBRATION_NEEDED, 0, {0, }},
+ { PROXIMITY_EVENT_CHANGE_STATE, 0, {0, }},
+ { LIGHT_EVENT_CHANGE_LEVEL, 0, {0, }},
+ { MOTION_ENGINE_EVENT_SNAP, 0, {0, }},
+ { MOTION_ENGINE_EVENT_SHAKE, 0, {0, }},
+ { MOTION_ENGINE_EVENT_DOUBLETAP, 0, {0, }},
+ { MOTION_ENGINE_EVENT_PANNING, 0, {0, }},
+ { MOTION_ENGINE_EVENT_TOP_TO_BOTTOM, 0, {0, }},
+ { MOTION_ENGINE_EVENT_DIRECT_CALL, 0, {0, }},
+ { MOTION_ENGINE_EVENT_TILT_TO_UNLOCK, 0, {0, }},
+ { MOTION_ENGINE_EVENT_LOCK_EXECUTE_CAMERA, 0, {0, }},
+ { MOTION_ENGINE_EVENT_REACTIVE_ALERT , 0, {0, }},
+};
static sf_bind_table_t g_bind_table[MAX_BIND_SLOT];
static cb_bind_table_t g_cb_table[MAX_CB_BIND_SLOT];
+static gboolean sensor_timeout_handler(gpointer data);
+
+inline static void add_cb_number(int list_slot, unsigned int cb_number)
+{
+ if(list_slot < 0 || list_slot > MAX_EVENT_LIST)
+ return;
+
+ unsigned int i = 0;
+ const unsigned int EVENT_COUNTER = g_event_list[list_slot].event_counter;
+
+ for(i = 0 ; i < EVENT_COUNTER ; i++) {
+ if(g_event_list[list_slot].cb_list[i] == cb_number){
+ return;
+ }
+ }
+
+ if(EVENT_COUNTER < MAX_BIND_SLOT) {
+ g_event_list[list_slot].event_counter++;
+ g_event_list[list_slot].cb_list[EVENT_COUNTER] = cb_number;
+ } else {
+ return ;
+ }
+}
+
+
+inline static void del_cb_number(int list_slot, unsigned int cb_number)
+{
+ if(list_slot < 0 || list_slot > MAX_EVENT_LIST)
+ return;
+
+ unsigned int i = 0, j = 0;
+ const unsigned int EVENT_COUNTER = g_event_list[list_slot].event_counter;
+
+ for(i = 0 ; i < EVENT_COUNTER ; i++){
+ if(g_event_list[list_slot].cb_list[i] == cb_number){
+ for(j = i ; j < EVENT_COUNTER - 1; j++){
+ g_event_list[list_slot].cb_list[j] = g_event_list[list_slot].cb_list[j+1];
+ }
+ g_event_list[list_slot].cb_list[EVENT_COUNTER - 1] = 0;
+ g_event_list[list_slot].event_counter--;
+ return ;
+ }
+ }
+
+ DBG("cb number [%d] is not registered\n", cb_number);
+}
+
+
+inline static void del_cb_by_event_type(unsigned int event_type, unsigned int cb_number)
+{
+ int list_slot = 0;
+
+ for(list_slot = 0 ; list_slot < MAX_EVENT_LIST ; list_slot++)
+ if(g_event_list[list_slot].event_type == event_type)
+ break;
+
+ del_cb_number(list_slot, cb_number);
+}
+
+
inline static int acquire_handle(void)
{
register int i;
@@ -214,9 +285,12 @@ inline static void release_handle(int i)
g_bind_table[i].my_handle = -1;
g_bind_table[i].sensor_state = SENSOR_STATE_UNKNOWN;
+ g_bind_table[i].wakeup_state = SENSOR_WAKEUP_UNKNOWN;
+ g_bind_table[i].sensor_option = SENSOR_OPTION_DEFAULT;
for (j=0; j<g_bind_table[i].cb_event_max_num; j++) {
- if ( (j<MAX_CB_SLOT_PER_BIND) && (g_bind_table[i].cb_slot_num[j] > -1) ) {
+ if ( (j<MAX_CB_SLOT_PER_BIND) && (g_bind_table[i].cb_slot_num[j] > -1) ) {
+ del_cb_by_event_type(g_cb_table[g_bind_table[i].cb_slot_num[j]].cb_event_type, g_bind_table[i].cb_slot_num[j]);
g_cb_table[g_bind_table[i].cb_slot_num[j]].client_data= NULL;
g_cb_table[g_bind_table[i].cb_slot_num[j]].sensor_callback_func_t = NULL;
g_cb_table[g_bind_table[i].cb_slot_num[j]].cb_event_type = 0x00;
@@ -230,6 +304,7 @@ inline static void release_handle(int i)
_lock.unlock();
}
+
inline static void cb_release_handle(int i)
{
_lock.lock();
@@ -242,8 +317,11 @@ inline static void cb_release_handle(int i)
g_cb_table[i].request_count = 0;
g_cb_table[i].request_data_id = 0;
- if ( g_cb_table[i].collected_data )
+ if ( g_cb_table[i].collected_data )
+ {
free (g_cb_table[i].collected_data);
+ g_cb_table[i].collected_data = NULL;
+ }
g_cb_table[i].collected_data = NULL;
g_cb_table[i].current_collected_idx = 0;
@@ -251,16 +329,229 @@ inline static void cb_release_handle(int i)
g_cb_table[i].source = NULL;
g_cb_table[i].gsource_interval = 0;
g_cb_table[i].gID = 0;
-
_lock.unlock();
}
+void power_off_cb(keynode_t *node, void *data)
+{
+ int val = -1;
+ int handle = -1, j = -1;
+ int state = -1;
+
+ if(vconf_keynode_get_type(node) != VCONF_TYPE_INT)
+ {
+ ERR("Errer invailed keytype");
+ return;
+ }
+
+ val = vconf_keynode_get_int(node);
+
+ switch(val)
+ {
+ case SENSOR_POWEROFF_AWAKEN:
+ for(handle = 0 ; handle < MAX_BIND_SLOT ; handle++)
+ {
+ if(g_bind_table[handle].ipc != NULL)
+ {
+ state = sf_stop(handle);
+
+ if(state < 0)
+ {
+ ERR("Cannot stop handle [%d]",handle);
+ continue;
+ }
+ else
+ {
+ DBG("LCD OFF and sensor handle [%d] stopped",handle);
+ }
+
+ for(j = 0 ; j < g_bind_table[handle].cb_event_max_num ; j++)
+ {
+ if((j<MAX_CB_SLOT_PER_BIND) && (g_bind_table[handle].cb_slot_num[j] > -1))
+ {
+ state = sf_unregister_event(handle ,g_cb_table[g_bind_table[handle].cb_slot_num[j]].cb_event_type);
+
+ if(state < 0)
+ ERR("cannot unregster_event for event [%x], handle [%d]",g_cb_table[g_bind_table[handle].cb_slot_num[j]].cb_event_type, handle);
+ }
+ }
+
+ sf_disconnect(handle);
+ }
+ }
+ break;
+
+ default:
+ break;
+
+ }
+}
+
+
+void lcd_off_cb(keynode_t *node, void *data)
+{
+ int val = -1;
+ int i = -1, j = -1;
+
+ if(vconf_keynode_get_type(node) != VCONF_TYPE_INT)
+ {
+ ERR("Errer invailed keytype");
+ return;
+ }
+
+ val = vconf_keynode_get_int(node);
+
+ switch(val)
+ {
+ case VCONFKEY_PM_STATE_LCDOFF: // LCD OFF
+ for(i = 0 ; i < MAX_BIND_SLOT ; i++)
+ {
+ if((g_bind_table[i].wakeup_state != SENSOR_WAKEUP_SETTED && g_bind_table[i].sensor_option != SENSOR_OPTION_ALWAYS_ON ) && g_bind_table[i].ipc != NULL)
+ {
+ if(g_bind_table[i].sensor_state == SENSOR_STATE_STARTED)
+ {
+ if(sf_stop(i) < 0)
+ {
+ ERR("Cannot stop handle [%d]",i);
+ }
+ else
+ {
+ g_bind_table[i].sensor_state = SENSOR_STATE_PAUSED;
+
+ for(j = -1; j < g_bind_table[i].cb_event_max_num; j++)
+ {
+ if(g_cb_table[g_bind_table[i].cb_slot_num[j]].collected_data != NULL)
+ {
+ g_source_destroy(g_cb_table[g_bind_table[i].cb_slot_num[j]].source);
+ g_source_unref(g_cb_table[g_bind_table[i].cb_slot_num[j]].source);
+ }
+ }
+
+ }
+ }
+ DBG("LCD OFF and sensor handle [%d] stopped",i);
+ }
+ }
+
+ break;
+ case VCONFKEY_PM_STATE_NORMAL: // LCD ON
+ for(i = 0 ; i < MAX_BIND_SLOT ; i++)
+ {
+ if(g_bind_table[i].sensor_state == SENSOR_STATE_PAUSED)
+ {
+ if(sf_start(i,g_bind_table[i].sensor_option) < 0)
+ {
+ ERR("Cannot start handle [%d]",i);
+ }
+ else
+ {
+ for(j = -1; j < g_bind_table[i].cb_event_max_num; j++)
+ {
+ if(g_cb_table[g_bind_table[i].cb_slot_num[j]].collected_data != NULL)
+ {
+ g_cb_table[g_bind_table[i].cb_slot_num[j]].source = g_timeout_source_new(g_cb_table[g_bind_table[i].cb_slot_num[j]].gsource_interval);
+ g_source_set_callback(g_cb_table[g_bind_table[i].cb_slot_num[j]].source, sensor_timeout_handler, (gpointer)&g_cb_table[g_bind_table[i].cb_slot_num[j]].my_cb_handle,NULL);
+ g_cb_table[g_bind_table[i].cb_slot_num[j]].gID = g_source_attach(g_cb_table[g_bind_table[i].cb_slot_num[j]].source, NULL);
+ }
+ }
+ }
+ DBG("LCD ON and sensor handle [%d] started",i);
+ }
+ }
+
+ break;
+ default :
+ break ;
+ }
+}
+
+int system_off_set(void)
+{
+ int result = -1;
+ if(g_system_off_cb_ct == 0)
+ {
+ result = vconf_notify_key_changed(VCONFKEY_PM_STATE, lcd_off_cb, NULL);
+ if(result < 0)
+ {
+ ERR("cannot setting lcd_off_set_cb");
+ }
+
+ result = vconf_notify_key_changed(VCONF_SF_SERVER_POWER_OFF, power_off_cb, NULL);
+ if(result < 0)
+ {
+ ERR("cannot setting power_off_set_cb");
+ }
+
+ g_system_off_cb_ct++;
+ }
+ else if (g_system_off_cb_ct > 0)
+ {
+ g_system_off_cb_ct++;
+ }
+ else
+ {
+ ERR("g_system_off_cb_ct is negative");
+ return -1;
+ }
+
+ DBG("system_off_set success");
+ return 1;
+}
+
+int system_off_unset(void)
+{
+ int result = -1;
+ if(g_system_off_cb_ct == 1)
+ {
+ result = vconf_ignore_key_changed(VCONFKEY_PM_STATE, lcd_off_cb);
+ if(result < 0)
+ {
+ ERR("cannot setting lcd_off_set_cb");
+ }
+
+ result = vconf_ignore_key_changed(VCONF_SF_SERVER_POWER_OFF, power_off_cb);
+ if(result < 0)
+ {
+ ERR("cannot setting power_off_set_cb");
+ }
+
+ g_system_off_cb_ct = 0;
+ }
+ else if (g_system_off_cb_ct > 1)
+ {
+ g_system_off_cb_ct--;
+ }
+ else
+ {
+ ERR("g_system_off_cb_ct is negative");
+ return -1;
+ }
+ DBG("system_off_unset success");
+
+ return 1;
+}
+
+
+void lcd_off_set_wake_up(keynode_t *node, void *data)
+{
+ int state = 0;
+
+ state = sf_set_property(ACCELEROMETER_SENSOR, ACCELEROMETER_PROPERTY_SET_WAKEUP, WAKEUP_SET);
+
+ if(state < 0)
+ {
+ ERR("ACCELEROMETER_PROPERTY_SET_WAKEUP fail");
+ }
+}
+
+
static void sensor_changed_cb(keynode_t *node, void *data)
{
- unsigned int event_type = (unsigned int)(data);
- int i = 0;
+ int event_number = (int)(data);
+ unsigned int i = 0;
int val;
+ int cb_number = 0;
sensor_event_data_t cb_data;
sensor_panning_data_t panning_data;
@@ -270,20 +561,23 @@ static void sensor_changed_cb(keynode_t *node, void *data)
return;
}
- if (vconf_keynode_get_type(node) != VCONF_TYPE_INT ) {
+ if (vconf_keynode_get_type(node) != VCONF_TYPE_INT )
+ {
ERR("Err invaild key_type , incomming key_type : %d , key_name : %s , key_value : %d", vconf_keynode_get_type(node), vconf_keynode_get_name(node),vconf_keynode_get_int(node));
return;
}
val = vconf_keynode_get_int(node);
- for( i = 0 ; i < MAX_CB_BIND_SLOT ; i++)
+ for( i = 0 ; i < g_event_list[event_number].event_counter ; i++)
{
- if(g_cb_table[i].cb_event_type == event_type)
+ cb_number = g_event_list[event_number].cb_list[i];
+
+ if(g_bind_table[g_cb_table[cb_number].my_sf_handle].sensor_state == SENSOR_STATE_STARTED)
{
- if (g_cb_table[i].sensor_callback_func_t)
+ if (g_cb_table[cb_number].sensor_callback_func_t)
{
- if(g_cb_table[i].cb_event_type == MOTION_ENGINE_EVENT_PANNING)
+ if(g_cb_table[cb_number].cb_event_type == MOTION_ENGINE_EVENT_PANNING)
{
if(val != 0)
{
@@ -291,22 +585,24 @@ static void sensor_changed_cb(keynode_t *node, void *data)
panning_data.y = (short)(val & 0x0000FFFF);
cb_data.event_data_size = sizeof(sensor_panning_data_t);
cb_data.event_data = (void *)&panning_data;
- g_cb_table[i].sensor_callback_func_t(g_cb_table[i].cb_event_type, &cb_data, g_cb_table[i].client_data);
+ g_cb_table[cb_number].sensor_callback_func_t(g_cb_table[cb_number].cb_event_type,&cb_data, g_cb_table[cb_number].client_data);
}
- } else {
- if ( val<0 )
+ }
+ else
+ {
+ if ( val<0 )
{
- ERR("vconf_keynode_get_int fail for key : %s , handle_num : %d , get_value : %d\n", g_cb_table[i].call_back_key,i , val);
+ ERR("vconf_keynode_get_int fail for key : %s , handle_num : %d ,get_value : %d\n",g_cb_table[cb_number].call_back_key,cb_number , val);
return ;
}
- switch (g_cb_table[i].cb_event_type) {
+ switch (g_cb_table[cb_number].cb_event_type) {
+ case ACCELEROMETER_EVENT_SET_WAKEUP :
+ /* fall through */
case ACCELEROMETER_EVENT_ROTATION_CHECK :
/* fall through */
case ACCELEROMETER_EVENT_SET_HORIZON :
/* fall through */
- case ACCELEROMETER_EVENT_SET_WAKEUP :
- /* fall through */
case GEOMAGNETIC_EVENT_CALIBRATION_NEEDED :
/* fall through */
case LIGHT_EVENT_CHANGE_LEVEL :
@@ -321,21 +617,40 @@ static void sensor_changed_cb(keynode_t *node, void *data)
/* fall through */
case MOTION_ENGINE_EVENT_TOP_TO_BOTTOM:
/* fall through */
+ case MOTION_ENGINE_EVENT_DIRECT_CALL:
+ /* fall through */
+ case MOTION_ENGINE_EVENT_TILT_TO_UNLOCK:
+ /* fall through */
+ case MOTION_ENGINE_EVENT_LOCK_EXECUTE_CAMERA:
+ /* fall through */
+ case MOTION_ENGINE_EVENT_REACTIVE_ALERT:
+
cb_data.event_data_size = sizeof(val);
cb_data.event_data = (void *)&val;
+ g_cb_table[cb_number].sensor_callback_func_t(g_cb_table[cb_number].cb_event_type, &cb_data , g_cb_table[cb_number].client_data);
break;
default :
ERR("Undefined cb_event_type");
return ;
break;
}
- g_cb_table[i].sensor_callback_func_t(g_cb_table[i].cb_event_type , &cb_data , g_cb_table[i].client_data);
+
+ if(g_cb_table[cb_number].cb_event_type == ACCELEROMETER_EVENT_SET_WAKEUP)
+ {
+ cb_release_handle(cb_number);
+ del_cb_number(event_number, cb_number);
+ }
}
}
- else {
- ERR("Empty Callback func in event : %d\n", event_type);
+ else
+ {
+ ERR("Empty Callback func in event : %x\n",g_cb_table[cb_number].cb_event_type);
}
}
+ else
+ {
+ ERR("Sensor doesn't start for event : %x",g_cb_table[cb_number].cb_event_type);
+ }
}
}
@@ -347,12 +662,10 @@ static gboolean sensor_timeout_handler(gpointer data)
sensor_event_data_t cb_data;
if ( g_bind_table[g_cb_table[*cb_handle].my_sf_handle].sensor_state != SENSOR_STATE_STARTED ) {
- ERR("Check sensor_state, current sensor state : %d",g_bind_table[g_cb_table[*cb_handle].my_sf_handle].sensor_state);
+// ERR("Check sensor_state, current sensor state : %d",g_bind_table[g_cb_table[*cb_handle].my_sf_handle].sensor_state);
return TRUE;
}
- DBG("sensor_timeout_handler started , cb_handle value : %d\n", *cb_handle);
-
if (g_cb_table[*cb_handle].sensor_callback_func_t) {
if ( ((g_cb_table[*cb_handle].request_data_id & 0xFFFF) > 0) && ((g_cb_table[*cb_handle].request_data_id & 0xFFFF) < 10) ) {
@@ -469,7 +782,7 @@ static int server_get_properties(int handle , unsigned int data_id, void *proper
return_properties->sensor_unit_idx = base_return_property->sensor_unit_idx ;
return_properties->sensor_min_range= base_return_property->sensor_min_range;
return_properties->sensor_max_range= base_return_property->sensor_max_range;
- return_properties->sensor_resolution = base_return_property->sensor_resolution;
+ return_properties->sensor_resolution = base_return_property->sensor_resolution;
memset(return_properties->sensor_name, '\0', sizeof(return_properties->sensor_name));
memset(return_properties->sensor_vendor, '\0', sizeof(return_properties->sensor_vendor));
strncpy(return_properties->sensor_name, base_return_property->sensor_name, strlen(base_return_property->sensor_name));
@@ -540,6 +853,7 @@ static int server_set_property(int handle , unsigned int property_id, long value
if (packet.cmd() == CMD_DONE) {
cmd_done_t *payload;
payload = (cmd_done_t*)packet.data();
+
if (payload->value == -1) {
ERR("cannot support input property\n");
errno = ENODEV;
@@ -724,7 +1038,7 @@ EXTAPI int sf_connect(sensor_type_t sensor_type)
switch (sensor_type) {
case ACCELEROMETER_SENSOR :
sf_channel_name = (char *)ACCEL_SENSOR_BASE_CHANNEL_NAME;
- g_bind_table[i].cb_event_max_num = 6;
+ g_bind_table[i].cb_event_max_num = 7;
break;
case GEOMAGNETIC_SENSOR :
@@ -744,7 +1058,7 @@ EXTAPI int sf_connect(sensor_type_t sensor_type)
case MOTION_SENSOR:
sf_channel_name = (char *)MOTION_ENGINE_BASE_CHANNEL_NAME;
- g_bind_table[i].cb_event_max_num = 7;
+ g_bind_table[i].cb_event_max_num = 9;
break;
case GYROSCOPE_SENSOR:
@@ -753,19 +1067,30 @@ EXTAPI int sf_connect(sensor_type_t sensor_type)
break;
case THERMOMETER_SENSOR:
- case PRESSURE_SENSOR:
+ break;
+ case BAROMETER_SENSOR:
+ sf_channel_name = (char *)BAROMETER_SENSOR_BASE_CHANNEL_NAME;
+ g_bind_table[i].cb_event_max_num = 3;
+ break;
+ case FUSION_SENSOR:
+ sf_channel_name = (char *)FUSION_SENSOR_BASE_CHANNEL_NAME;
+ g_bind_table[i].cb_event_max_num = 3;
+ break;
+
case UNKNOWN_SENSOR:
default :
ERR("Undefined sensor_type");
release_handle(i);
errno = ENODEV;
- return -2;
+ return -2;
break;
}
g_bind_table[i].sensor_type = sensor_type ;
g_bind_table[i].my_handle = i;
g_bind_table[i].sensor_state = SENSOR_STATE_STOPPED;
+ g_bind_table[i].wakeup_state = SENSOR_WAKEUP_UNSETTED;
+ g_bind_table[i].sensor_option = SENSOR_OPTION_DEFAULT;
for(j = 0 ; j < g_bind_table[i].cb_event_max_num ; j++)
g_bind_table[i].cb_slot_num[j] = -1;
@@ -851,6 +1176,8 @@ EXTAPI int sf_connect(sensor_type_t sensor_type)
return -1;
}
+ system_off_set();
+
INFO("Connected sensor type : %x , handle : %d \n", sensor_type , i);
return i;
}
@@ -898,6 +1225,7 @@ EXTAPI int sf_disconnect(int handle)
out:
release_handle(handle);
+ system_off_unset();
return 0;
}
@@ -907,10 +1235,33 @@ EXTAPI int sf_start(int handle , int option)
cpacket packet(sizeof(cmd_start_t)+4);
cmd_start_t *payload;
+ int lcd_state = 0;
+
retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sensor_start fail , invalid handle value : %d",handle);
- retvm_if( option != 0 , -1 , "sensor_start fail , invalid option value : %d",option);
+ retvm_if( option < 0 , -1 , "sensor_start fail , invalid option value : %d",option);
+ retvm_if( g_bind_table[handle].sensor_state == SENSOR_STATE_STARTED , 0 , "sensor already started");
+ if(option != SENSOR_OPTION_ALWAYS_ON)
+ {
+ if(vconf_get_int(VCONFKEY_PM_STATE, &lcd_state) == 0)
+ {
+ if(lcd_state == VCONFKEY_PM_STATE_LCDOFF)
+ {
+ g_bind_table[handle].sensor_state = SENSOR_STATE_PAUSED;
+ DBG("SENSOR_STATE_PAUSED(LCD OFF)");
+ return 0;
+ }
+ }
+ else
+ {
+ DBG("vconf_get_int Error lcd_state = [%d]",lcd_state);
+ }
+ }
+ else
+ {
+ DBG("sensor start (SENSOR_OPTION_ALWAYS_ON)");
+ }
INFO("Sensor S/F Started\n");
@@ -965,6 +1316,7 @@ EXTAPI int sf_start(int handle , int option)
}
g_bind_table[handle].sensor_state = SENSOR_STATE_STARTED;
+ g_bind_table[handle].sensor_option = option;
return 0;
@@ -977,7 +1329,7 @@ EXTAPI int sf_stop(int handle)
retvm_if( handle > MAX_BIND_SLOT , -1 , "Incorrect handle");
retvm_if( (g_bind_table[handle].ipc == NULL) ||(handle < 0) , -1 , "sensor_stop fail , invalid handle value : %d",handle);
-
+ retvm_if( (g_bind_table[handle].sensor_state == SENSOR_STATE_STOPPED) || (g_bind_table[handle].sensor_state == SENSOR_STATE_PAUSED) , 0 , "sensor already stopped");
INFO("Sensor S/F Stopped\n");
@@ -1009,7 +1361,7 @@ EXTAPI int sf_register_event(int handle , unsigned int event_type , event_condi
{
cpacket packet(sizeof(cmd_reg_t)+4);
cmd_reg_t *payload;
- int i;
+ int i = 0, j = 0;
int avail_cb_slot_idx = -1;
int collect_data_flag = 0;
@@ -1128,7 +1480,11 @@ EXTAPI int sf_register_event(int handle , unsigned int event_type , event_condi
/* fall through */
case GYROSCOPE_EVENT_RAW_DATA_REPORT_ON_TIME:
/* fall through */
+ case BAROMETER_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
case LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_SENSOR_EVENT_RAW_DATA_REPORT_ON_TIME:
collect_data_flag = 1;
g_cb_table[i].request_data_id = (event_type & (0xFFFF<<16)) |0x0001;
break;
@@ -1138,10 +1494,24 @@ EXTAPI int sf_register_event(int handle , unsigned int event_type , event_condi
/* fall through */
case ACCELEROMETER_EVENT_ORIENTATION_DATA_REPORT_ON_TIME:
/* fall through */
+ case BAROMETER_EVENT_TEMPERATURE_DATA_REPORT_ON_TIME:
+ /* fall through */
case PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_ROTATION_VECTOR_EVENT_DATA_REPORT_ON_TIME:
collect_data_flag = 1;
g_cb_table[i].request_data_id = (event_type & (0xFFFF<<16)) |0x0002;
break;
+ case ACCELEROMETER_EVENT_LINEAR_ACCELERATION_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_ROTATION_MATRIX_EVENT_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case BAROMETER_EVENT_ALTITUDE_DATA_REPORT_ON_TIME:
+ collect_data_flag = 1;
+ g_cb_table[i].request_data_id = (event_type & (0xFFFF<<16)) |0x0004;
+ break;
+ default :
+ collect_data_flag = 0;
}
INFO("key : %s(p:%p), cb_handle value : %d\n", g_cb_table[i].call_back_key ,g_cb_table[i].call_back_key, i );
@@ -1188,15 +1558,29 @@ EXTAPI int sf_register_event(int handle , unsigned int event_type , event_condi
g_cb_table[i].request_count = 0;
g_cb_table[i].request_data_id = 0;
g_cb_table[i].collected_data = NULL;
-
- if (vconf_notify_key_changed( g_cb_table[i].call_back_key,sensor_changed_cb,(void*)(g_cb_table[i].cb_event_type)) < 0 ) {
- DBG("vconf_add_changed_cb is already registered for key : %s , my_cb_handle value : %d\n", g_cb_table[i].call_back_key, g_cb_table[i].my_cb_handle);
- } else {
- DBG("vconf_add_chaged_cb success for key : %s , my_cb_handle value : %d\n", g_cb_table[i].call_back_key, g_cb_table[i].my_cb_handle);
+
+ for(j = 0 ; j < MAX_EVENT_LIST ; j++){
+ if(g_event_list[j].event_type == event_type) {
+ if(g_event_list[j].event_counter < 1){
+ if(vconf_notify_key_changed(g_cb_table[i].call_back_key,sensor_changed_cb,(void*)(j)) == 0 ) {
+ DBG("vconf_add_chaged_cb success for key : %s , my_cb_handle value : %d\n", g_cb_table[i].call_back_key, g_cb_table[i].my_cb_handle);
+ } else {
+ DBG("vconf_add_chaged_cb fail for key : %s , my_cb_handle value : %d\n", g_cb_table[i].call_back_key, g_cb_table[i].my_cb_handle);
+ cb_release_handle(i);
+ errno = ENODEV;
+ return -2;
+ }
+ }else {
+ DBG("vconf_add_changed_cb is already registered for key : %s, my_cb_handle value : %d\n", g_cb_table[i].call_back_key, g_cb_table[i].my_cb_handle);
+ }
+ add_cb_number(j, i);
+ }
}
}
+
+
g_bind_table[handle].cb_slot_num[avail_cb_slot_idx] = i;
-
+
return 0;
}
@@ -1207,7 +1591,7 @@ EXTAPI int sf_unregister_event(int handle, unsigned int event_type)
cpacket packet(sizeof(cmd_reg_t)+4);
cmd_reg_t *payload;
int find_cb_handle =-1;
- int i;
+ int i = 0, j = 0;
int collect_data_flag = 0;
@@ -1250,6 +1634,8 @@ EXTAPI int sf_unregister_event(int handle, unsigned int event_type)
case ACCELEROMETER_EVENT_RAW_DATA_REPORT_ON_TIME:
/* fall through */
case ACCELEROMETER_EVENT_ORIENTATION_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case ACCELEROMETER_EVENT_LINEAR_ACCELERATION_DATA_REPORT_ON_TIME :
/* fall through */
case GEOMAGNETIC_EVENT_ATTITUDE_DATA_REPORT_ON_TIME:
/* fall through */
@@ -1257,6 +1643,12 @@ EXTAPI int sf_unregister_event(int handle, unsigned int event_type)
/* fall through */
case GYROSCOPE_EVENT_RAW_DATA_REPORT_ON_TIME:
/* fall through */
+ case BAROMETER_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case BAROMETER_EVENT_TEMPERATURE_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case BAROMETER_EVENT_ALTITUDE_DATA_REPORT_ON_TIME:
+ /* fall through */
case LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME:
/* fall through */
case GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME:
@@ -1264,6 +1656,12 @@ EXTAPI int sf_unregister_event(int handle, unsigned int event_type)
case LIGHT_EVENT_LUX_DATA_REPORT_ON_TIME:
/* fall through */
case PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_SENSOR_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_ROTATION_VECTOR_EVENT_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_ROTATION_MATRIX_EVENT_DATA_REPORT_ON_TIME:
collect_data_flag = 1;
break;
}
@@ -1290,7 +1688,6 @@ EXTAPI int sf_unregister_event(int handle, unsigned int event_type)
errno = ECOMM;
return -2;
}
-
}
if ( collect_data_flag ) {
@@ -1299,13 +1696,24 @@ EXTAPI int sf_unregister_event(int handle, unsigned int event_type)
g_cb_table[find_cb_handle].request_count = 0;
g_cb_table[find_cb_handle].request_data_id = 0;
g_cb_table[find_cb_handle].gsource_interval = 0;
-
} else {
- state = vconf_ignore_key_changed(g_cb_table[find_cb_handle].call_back_key, sensor_changed_cb);
- if ( state < 0 ) {
- ERR("Failed to del callback using by vconf_del_changed_cb for key : %s\n",g_cb_table[find_cb_handle].call_back_key);
- errno = ENODEV;
- state = -2;
+ for(j = 0 ; j < MAX_EVENT_LIST ; j++){
+ if(g_event_list[j].event_type == event_type){
+ if(g_event_list[j].event_counter <= 1){
+ state = vconf_ignore_key_changed(g_cb_table[find_cb_handle].call_back_key, sensor_changed_cb);
+ if ( state < 0 ) {
+ ERR("Failed to del callback using by vconf_del_changed_cb for key : %s\n",g_cb_table[find_cb_handle].call_back_key);
+ errno = ENODEV;
+ state = -2;
+ }
+ else {
+ DBG("del callback using by vconf success");
+ }
+ } else {
+ DBG("fake remove");
+ }
+ del_cb_number(j,find_cb_handle);
+ }
}
}
@@ -1415,7 +1823,7 @@ EXTAPI int sf_check_rotation( unsigned long *curr_state)
double raw_z;
double atan_value = 0, norm_z = 0;
- int acc_theta = 0 , acc_pitch = 0;
+ int acc_theta = 0 , acc_pitch = 0;
int handle = 0;
int lcd_type = 0;
@@ -1462,18 +1870,16 @@ EXTAPI int sf_check_rotation( unsigned long *curr_state)
return 0;
}
- if(vconf_get_int(LCD_TYPE_KEY, &lcd_type) != 0)
- lcd_type = 0;
-
if((base_data_values->values[0] > XY_POSITIVE_THD || base_data_values->values[0] < XY_NEGATIVE_THD) || (base_data_values->values[1] > XY_POSITIVE_THD || base_data_values->values[1] < XY_NEGATIVE_THD))
{
- atan_value = atan2(base_data_values->values[1],base_data_values->values[0]);
+ atan_value = atan2(-(base_data_values->values[1]),(base_data_values->values[0]));
acc_theta = ((int)(atan_value * (RADIAN_VALUE) + 270.0))%360;
+
raw_z = (double)(base_data_values->values[2]) / 9.8;
if ( raw_z > 1.0 ) {
norm_z = 1.0;
- }
+ }
else if ( raw_z < -1.0 ) {
norm_z = -1.0;
}
@@ -1513,10 +1919,245 @@ EXTAPI int sf_check_rotation( unsigned long *curr_state)
state = 0;
if(base_data_values)
+ {
free(base_data_values);
+ base_data_values = NULL;
+ }
return state;
}
+
+EXTAPI int sf_set_wakeup(sensor_type_t sensor_type)
+{
+ int i = 0;
+
+ if(sf_is_wakeup_supported(sensor_type) < 0)
+ {
+ ERR("Cannot support wake up");
+ return -1;
+ }
+
+ for(i = 0 ; i < MAX_BIND_SLOT ; i++)
+ {
+ if(g_bind_table[i].sensor_type == sensor_type)
+ {
+ g_bind_table[i].wakeup_state = SENSOR_WAKEUP_SETTED;
+ }
+ }
+
+ vconf_notify_key_changed(VCONFKEY_PM_STATE, lcd_off_set_wake_up, NULL);
+
+ return 0;
+}
+
+EXTAPI int sf_unset_wakeup(sensor_type_t sensor_type)
+{
+ int i = 0;
+
+ if(sf_is_wakeup_supported(sensor_type) < 0)
+ {
+ ERR("Cannot support wake up");
+ return -1;
+ }
+
+ if(sensor_type == ACCELEROMETER_SENSOR)
+ return sf_set_property(sensor_type, ACCELEROMETER_PROPERTY_SET_WAKEUP, WAKEUP_UNSET);
+ else
+ {
+ ERR("Cannot support wakeup");
+ return -1;
+ }
+
+ for(i = 0 ; i < MAX_BIND_SLOT ; i++)
+ {
+ if(g_bind_table[i].sensor_type == sensor_type)
+ {
+ g_bind_table[i].wakeup_state = SENSOR_WAKEUP_UNSETTED;
+ }
+ }
+
+ vconf_ignore_key_changed(VCONFKEY_PM_STATE, lcd_off_set_wake_up);
+
+ return 0;
+}
+
+EXTAPI int sf_is_wakeup_supported(sensor_type_t sensor_type)
+{
+ if(sensor_type == ACCELEROMETER_SENSOR)
+ return sf_set_property(sensor_type, ACCELEROMETER_PROPERTY_CHECK_WAKEUP_SUPPORTED, WAKEUP_SET);
+ else
+ {
+ ERR("Cannot support wakeup");
+ return -1;
+ }
+}
+
+EXTAPI int sf_is_wakeup_enabled(sensor_type_t sensor_type)
+{
+ if(sensor_type == ACCELEROMETER_SENSOR)
+ return sf_set_property(sensor_type,ACCELEROMETER_PROPERTY_CHECK_WAKEUP_STATUS,0);
+ else
+ {
+ ERR("Cannot support wakeup");
+ return -1;
+ }
+}
+
+EXTAPI int sf_change_event_condition(int handle, unsigned int event_type, event_condition_t *event_condition)
+{
+ cpacket packet(sizeof(cmd_reg_t) + 4);
+ cmd_reg_t *payload;
+ int sensor_state = SENSOR_STATE_UNKNOWN;
+
+ int i = 0;
+
+ switch (event_type ) {
+ case ACCELEROMETER_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case ACCELEROMETER_EVENT_ORIENTATION_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case ACCELEROMETER_EVENT_LINEAR_ACCELERATION_DATA_REPORT_ON_TIME :
+ /* fall through */
+ case GEOMAGNETIC_EVENT_ATTITUDE_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case PROXIMITY_EVENT_STATE_REPORT_ON_TIME:
+ /* fall through */
+ case GYROSCOPE_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case BAROMETER_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case BAROMETER_EVENT_TEMPERATURE_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case BAROMETER_EVENT_ALTITUDE_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case LIGHT_EVENT_LUX_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case PROXIMITY_EVENT_DISTANCE_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_SENSOR_EVENT_RAW_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_ROTATION_VECTOR_EVENT_DATA_REPORT_ON_TIME:
+ /* fall through */
+ case FUSION_ROTATION_MATRIX_EVENT_DATA_REPORT_ON_TIME:
+ break;
+ default :
+ ERR("Cannot support this API");
+ return -1;
+ }
+
+ for(i = 0 ; i < MAX_CB_SLOT_PER_BIND ; i++)
+ {
+ if(g_cb_table[g_bind_table[handle].cb_slot_num[i]].cb_event_type == event_type)
+ {
+ if(!event_condition)
+ {
+ if(g_cb_table[g_bind_table[handle].cb_slot_num[i]].gsource_interval == (guint)BASE_GATHERING_INTERVAL)
+ {
+ ERR("same interval");
+ return -1;
+ }
+ }
+ else
+ {
+ if(g_cb_table[g_bind_table[handle].cb_slot_num[i]].gsource_interval == (guint)event_condition->cond_value1)
+ {
+ ERR("same interval");
+ return -1;
+ }
+ }
+
+ DBG("find callback number [%d]",i);
+ break;
+ }
+ }
+
+ if(i == MAX_CB_SLOT_PER_BIND)
+ {
+ ERR("cannot find event_type [%x] in handle [%d]", event_type, handle);
+ return -1;
+ }
+
+ sensor_state = g_bind_table[handle].sensor_state;
+ g_bind_table[handle].sensor_state = SENSOR_STATE_STOPPED;
+
+ payload = (cmd_reg_t*)packet.data();
+ if(payload) {
+ ERR("cannot find memory for send packet.data");
+ errno = ENOMEM;
+ g_bind_table[handle].sensor_state = SENSOR_STATE_STARTED;
+ return -2;
+ }
+
+ packet.set_version(PROTOCOL_VERSION);
+ packet.set_cmd(CMD_REG);
+ packet.set_payload_size(sizeof(cmd_reg_t));
+ payload->type = REG_ADD;
+ payload->event_type = event_type;
+
+ if(!event_condition)
+ payload->interval = BASE_GATHERING_INTERVAL;
+ else if((event_condition->cond_op == CONDITION_EQUAL) && (event_condition->cond_value1 > 0 ))
+ payload->interval = event_condition->cond_value1;
+ else
+ payload->interval = BASE_GATHERING_INTERVAL;
+
+
+ INFO("Send CMD_REG command with reg_type : %x , event_type : %x\n",payload->type , payload->event_type );
+ if (g_bind_table[handle].ipc && g_bind_table[handle].ipc->send(packet.packet(), packet.size()) == false) {
+ ERR("Faield to send a packet\n");
+ errno = ECOMM;
+ g_bind_table[handle].sensor_state = sensor_state;
+ return -2;
+ }
+
+ if (g_bind_table[handle].ipc && g_bind_table[handle].ipc->recv(packet.packet(), packet.header_size()) == false) {
+ ERR("Faield to receive a packet\n");
+ errno = ECOMM;
+ g_bind_table[handle].sensor_state = sensor_state;
+ return -2;
+ }
+
+ if (packet.payload_size()) {
+ if (g_bind_table[handle].ipc && g_bind_table[handle].ipc->recv((char*)packet.packet() + packet.header_size(), packet.payload_size()) == false) {
+ ERR("Faield to receive a packet\n");
+ errno = ECOMM;
+ g_bind_table[handle].sensor_state = sensor_state;
+ return -2;
+ }
+
+ if (packet.cmd() == CMD_DONE) {
+ cmd_done_t *payload;
+ payload = (cmd_done_t*)packet.data();
+ if (payload->value == -1) {
+ ERR("server register fail\n");
+ errno = ECOMM;
+ g_bind_table[handle].sensor_state = sensor_state;
+ return -2;
+ }
+ } else {
+ ERR("unexpected server cmd\n");
+ errno = ECOMM;
+ g_bind_table[handle].sensor_state = sensor_state;
+ return -2;
+ }
+ }
+
+ g_source_destroy(g_cb_table[i].source);
+ g_source_unref(g_cb_table[i].source);
+
+ g_cb_table[i].gsource_interval = (guint)payload->interval;
+ g_cb_table[i].source = g_timeout_source_new(g_cb_table[i].gsource_interval);
+ g_source_set_callback (g_cb_table[i].source, sensor_timeout_handler, (gpointer)&g_cb_table[i].my_cb_handle,NULL);
+ g_cb_table[i].gID = g_source_attach (g_cb_table[i].source, NULL);
+
+ g_bind_table[handle].sensor_state = sensor_state;
+
+ return 0;
+}
//! End of a file