diff --git a/lib/Joba_Tsl2561/COPYING b/lib/Joba_Tsl2561/COPYING
new file mode 100644
index 000000000..f288702d2
--- /dev/null
+++ b/lib/Joba_Tsl2561/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, 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
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/lib/Joba_Tsl2561/COPYING.LESSER b/lib/Joba_Tsl2561/COPYING.LESSER
new file mode 100644
index 000000000..0a041280b
--- /dev/null
+++ b/lib/Joba_Tsl2561/COPYING.LESSER
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ 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 that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU 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 as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/lib/Joba_Tsl2561/README b/lib/Joba_Tsl2561/README
new file mode 100644
index 000000000..86c1f1a0b
--- /dev/null
+++ b/lib/Joba_Tsl2561/README
@@ -0,0 +1,20 @@
+This is a library for the TSL2561 digital luminosity sensors from Ams (Taos).
+
+Design goals:
+* It is modularized so you can use only what you need if space/ram is constrained.
+* It does not swallow error codes so you can react on them.
+* It doesn't use floats as they are overkill for most IoT stuff.
+
+Datasheet used:
+http://ams.com/eng/Products/Light-Sensors/Ambient-Light-Sensors/TSL2561/TSL2560-TSL2561-Datasheet
+http://ams.com/eng/content/download/250094/975485/file/TSL2560-61_DS000110_2-00.pdf
+http://ams.com/eng/content/view/download/145438
+http://ams.com/eng/content/view/download/181895
+
+To use the library, just place the folder in your projects lib folder.
+For usage, see the examples folder.
+
+The library has 3 classes:
+Tsl2561 All register access as described in the datasheet, except for interrupts
+Tsl2561Util Convenience functions like lux calculation or automatic gain
+Tsl2561Int TODO, Interrupt related stuff (not needed if int pin unconnected)
diff --git a/lib/Joba_Tsl2561/examples/Autogain/Autogain.ino b/lib/Joba_Tsl2561/examples/Autogain/Autogain.ino
new file mode 100644
index 000000000..03da78d46
--- /dev/null
+++ b/lib/Joba_Tsl2561/examples/Autogain/Autogain.ino
@@ -0,0 +1,65 @@
+/*
+Autogain tests for Tsl2561Util namespace.
+
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#include
+
+Tsl2561 Tsl(Wire);
+uint8_t id;
+
+void setup() {
+ Serial.begin(115200);
+ Wire.begin();
+ while( !Tsl.begin() )
+ ; // wait until chip detected or wdt reset
+ Serial.println("\nStarting Tsl2561Util autogain loop");
+ Tsl.on();
+ Tsl.id(id);
+}
+
+void loop() {
+ uint16_t scaledFull = ~0, scaledIr = ~0;
+ uint32_t full = ~0, ir = ~0, milliLux = ~0;
+ bool gain = false;
+ Tsl2561::exposure_t exposure = Tsl2561::EXP_OFF;
+
+ if( Tsl2561Util::autoGain(Tsl, gain, exposure, scaledFull, scaledIr) ) {
+ if( Tsl2561Util::normalizedLuminosity(gain, exposure, full = scaledFull, ir = scaledIr) ) {
+ if( Tsl2561Util::milliLux(full, ir, milliLux, Tsl2561::packageCS(id)) ) {
+ Serial.printf("Tsl2561 addr: 0x%02x, id: 0x%02x, sfull: %5u, sir: %5u, full: %5u, ir: %5u, gain: %d, exp: %d, lux: %5u.%03u\n",
+ Tsl.address(), id, scaledFull, scaledIr, full, ir, gain, exposure, milliLux/1000, milliLux%1000);
+ }
+ else {
+ Serial.printf("Tsl2561Util::milliLux(full=%u, ir=%u) error\n", full, ir);
+ }
+ }
+ else {
+ Serial.printf("Tsl2561Util::normalizedLuminosity(gain=%u, exposure=%u, sfull=%u, sir=%u, full=%u, ir=%u) error\n",
+ gain, exposure, scaledFull, scaledIr, full, ir);
+ }
+ }
+ else {
+ Serial.printf("Tsl2561Util::autoGain(gain=%u, exposure=%u, sfull=%u, sir=%u) error\n",
+ gain, exposure, scaledFull, scaledIr);
+ }
+
+ delay(1000);
+}
+
diff --git a/lib/Joba_Tsl2561/examples/Simple/Simple.ino b/lib/Joba_Tsl2561/examples/Simple/Simple.ino
new file mode 100644
index 000000000..f1c2d88d9
--- /dev/null
+++ b/lib/Joba_Tsl2561/examples/Simple/Simple.ino
@@ -0,0 +1,56 @@
+/*
+Simple tests for Tsl2561 class. No error checking is done.
+
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#include
+
+Tsl2561 Tsl(Wire);
+
+void setup() {
+ Serial.begin(115200);
+ Wire.begin();
+ Serial.println("\nStarting Tsl2561 simple loop");
+}
+
+void loop() {
+ Tsl.begin();
+ if( Tsl.available() ) {
+ Tsl.on();
+
+ Tsl.setSensitivity(true, Tsl2561::EXP_14);
+ delay(16);
+
+ uint8_t id;
+ uint16_t full, ir;
+
+ Tsl.id(id);
+ Tsl.fullLuminosity(full);
+ Tsl.irLuminosity(ir);
+
+ Serial.printf("Tsl2561 at 0x%02x(id=0x%02x) luminosity is %5u (full) and %5u (ir)\n", Tsl.address(), id, full, ir);
+
+ Tsl.off();
+ }
+ else {
+ Serial.println("No Tsl2561 found. Check wiring.");
+ }
+
+ delay(5000);
+}
diff --git a/lib/Joba_Tsl2561/examples/Testing/Testing.ino b/lib/Joba_Tsl2561/examples/Testing/Testing.ino
new file mode 100644
index 000000000..8fc6d121a
--- /dev/null
+++ b/lib/Joba_Tsl2561/examples/Testing/Testing.ino
@@ -0,0 +1,163 @@
+/*
+Tests for the Tsl2561 class.
+It shows how to use every available method.
+
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#include
+
+Tsl2561 Tsl(Wire);
+
+void showError( Tsl2561 &tsl ) {
+ Tsl2561::status_t status = tsl.status();
+ Serial.printf("Error was %u: ", status);
+ switch( status ) {
+ case Tsl2561::ERR_OK: Serial.println("None"); break;
+ case Tsl2561::ERR_RW: Serial.println("Read/Write"); break;
+ case Tsl2561::ERR_BUSY: Serial.println("Busy"); break;
+ case Tsl2561::ERR_GONE: Serial.println("Gone"); break;
+ case Tsl2561::ERR_GENERAL: Serial.println("General"); break;
+ default: Serial.println("Unknown"); break;
+ }
+}
+
+void testSensitivity( Tsl2561 &tsl, bool newGain, Tsl2561::exposure_t newExp ) {
+ if( tsl.on() ) {
+ uint32_t start = millis();
+ Serial.printf("Chip powered on at %u\n", start);
+
+ bool chipGain;
+ Tsl2561::exposure_t chipExp;
+ bool change = true;
+ if( tsl.getSensitivity(chipGain, chipExp) ) {
+ if( chipGain == newGain && chipExp == newExp ) {
+ change = false;
+ }
+ }
+ else {
+ Serial.print("getSensitivity failed. ");
+ showError(tsl);
+ }
+
+ bool check = true;
+ if( change ) {
+ if( tsl.setSensitivity(newGain, newExp) ) {
+ Serial.printf("New gain = %d, exposure = 0x%02x\n", newGain, newExp);
+ }
+ else {
+ check = false;
+ Serial.print("setSensitivity failed. ");
+ showError(tsl);
+ }
+ }
+
+ if( check ) {
+ uint16_t ir, full = 0;
+ while( !full && millis() - start < 1000 ) {
+ if( !tsl.fullLuminosity(full) ) {
+ Serial.print("Check full luminosity failed. ");
+ showError(tsl);
+ }
+ if( full ) {
+ if( !tsl.irLuminosity(ir) ) {
+ Serial.print("Check ir luminosity failed. ");
+ showError(tsl);
+ }
+ }
+ else {
+ delay(10);
+ }
+ }
+
+ if( !full ) {
+ Serial.println("No luminosity reading after 1s. Too dark?");
+ }
+ else {
+ Serial.printf("Got luminosity after %d ms. Full spectrum is %d and IR only is %d\n", millis() - start, full, ir);
+ }
+ }
+
+ if( !tsl.off() ) {
+ Serial.print("Power off failed. ");
+ showError(tsl);
+ }
+ }
+ else {
+ Serial.print("Power on failed. ");
+ showError(tsl);
+ }
+}
+
+bool testPackage( Tsl2561 &tsl ) {
+ uint8_t id;
+ if( tsl.id(id) ) {
+ Serial.printf("Chip has type %02x and revision %x\n", Tsl2561::type(id), Tsl2561::revision(id) );
+ if( Tsl2561::packageT_FN_CL(id) ) {
+ Serial.println("Chip is a T, FN or CL type package");
+ }
+ else if( Tsl2561::packageCS(id) ) {
+ Serial.println("Chip is a CS type package");
+ }
+ else {
+ Serial.println("Chip is an unknown package");
+ }
+ return true;
+ }
+ else {
+ Serial.print("Get Chip ID failed. ");
+ showError(tsl);
+ }
+ return false;
+}
+
+void test( Tsl2561 &tsl ) {
+ bool ok = tsl.available();
+ Serial.printf("\nTesting Tsl2561 at address %02x: %sfound\n", tsl.address(), ok ? "" : "NOT ");
+ if( ok ) {
+ if( testPackage(tsl) ) {
+ testSensitivity(tsl, Tsl2561::GAIN_OFF, Tsl2561::EXP_402);
+ testSensitivity(tsl, Tsl2561::GAIN_ON, Tsl2561::EXP_402);
+ testSensitivity(tsl, Tsl2561::GAIN_OFF, Tsl2561::EXP_101);
+ testSensitivity(tsl, Tsl2561::GAIN_ON, Tsl2561::EXP_101);
+ testSensitivity(tsl, Tsl2561::GAIN_OFF, Tsl2561::EXP_14);
+ testSensitivity(tsl, Tsl2561::GAIN_ON, Tsl2561::EXP_14);
+ }
+ }
+ else {
+ showError(tsl);
+ }
+}
+
+void setup() {
+ Serial.begin(115200);
+ Wire.begin();
+ Serial.println("\nStarting Tsl2561 testing loop");
+}
+
+void loop() {
+ Tsl.begin(Tsl2561::ADDR_GND);
+ test(Tsl);
+ Tsl.begin(Tsl2561::ADDR_FLOAT);
+ test(Tsl);
+ Tsl.begin(Tsl2561::ADDR_VDD);
+ test(Tsl);
+ Serial.println("\nNext test in 5s\n");
+ delay(5000);
+}
+
diff --git a/lib/Joba_Tsl2561/examples/Utility/Utility.ino b/lib/Joba_Tsl2561/examples/Utility/Utility.ino
new file mode 100644
index 000000000..58e03ca14
--- /dev/null
+++ b/lib/Joba_Tsl2561/examples/Utility/Utility.ino
@@ -0,0 +1,87 @@
+/*
+Simple tests for Tsl2561Util namespace.
+
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#include
+
+Tsl2561::address_t addr[] = { Tsl2561::ADDR_GND, Tsl2561::ADDR_FLOAT, Tsl2561::ADDR_VDD };
+Tsl2561 Tsl(Wire);
+
+void setup() {
+ Serial.begin(115200);
+ Wire.begin();
+ Serial.println("\nStarting Tsl2561Util loop");
+}
+
+void loop() {
+ bool found = false;
+
+ for( uint8_t i = 0; i < sizeof(addr)/sizeof(addr[0]); i++ ) {
+ if( Tsl.begin(addr[i]) ) {
+ found = true;
+ Serial.println();
+
+ uint16_t scaledFull = 0, scaledIr;
+ uint32_t full, ir, milliLux;
+ uint8_t id;
+ bool gain;
+ Tsl2561::exposure_t exposure;
+
+ for( uint8_t g=0; g<2; g++ ) {
+ gain = g;
+ for( uint8_t e=0; e<3; e++ ) {
+ exposure = (Tsl2561::exposure_t)e;
+
+ Tsl.on();
+
+ Tsl.setSensitivity(gain, exposure);
+ Tsl2561Util::waitNext(exposure);
+ Tsl.id(id);
+ Tsl.getSensitivity(gain, exposure);
+ Tsl.fullLuminosity(scaledFull);
+ Tsl.irLuminosity(scaledIr);
+
+ Serial.printf("Tsl2561 addr: 0x%02x, id: 0x%02x, sfull: %5u, sir: %5u, gain: %d, exp: %d", addr[i], id, scaledFull, scaledIr, gain, exposure);
+
+ if( Tsl2561Util::normalizedLuminosity(gain, exposure, full = scaledFull, ir = scaledIr) ) {
+ if( Tsl2561Util::milliLux(full, ir, milliLux, Tsl2561::packageCS(id)) ) {
+ Serial.printf(", full: %5u, ir: %5u, lux: %5u.%03u\n", full, ir, milliLux/1000, milliLux%1000);
+ }
+ else {
+ Serial.printf(", full: %5u, ir: %5u: Tsl2561Util::milliLux() error\n", full, ir);
+ }
+ }
+ else {
+ Serial.printf(", full: %5u, ir: %5u: Tsl2561Util::normalizedLuminosity() error\n", full, ir);
+ }
+
+ Tsl.off();
+ }
+ }
+ }
+ }
+
+ if( !found ) {
+ Serial.println("No Tsl2561 found. Check wiring.");
+ }
+
+ delay(5000);
+}
+
diff --git a/lib/Joba_Tsl2561/library.json b/lib/Joba_Tsl2561/library.json
new file mode 100644
index 000000000..cacc33d5a
--- /dev/null
+++ b/lib/Joba_Tsl2561/library.json
@@ -0,0 +1,13 @@
+{
+ "name": "Joba_Tsl2561",
+ "version": "2.0.1",
+ "keywords": "twowire, i2c, bus, sensor, luminosity, illuminance, lux",
+ "description": "Arduino Library for ams (taos) luminance chip Tsl2561 with autogain",
+ "repository":
+ {
+ "type": "git",
+ "url": "https://github.com/joba-1/Joba_Tsl2561.git"
+ },
+ "frameworks": "arduino",
+ "platforms": "*"
+}
diff --git a/lib/Joba_Tsl2561/library.properties b/lib/Joba_Tsl2561/library.properties
new file mode 100644
index 000000000..148736de6
--- /dev/null
+++ b/lib/Joba_Tsl2561/library.properties
@@ -0,0 +1,9 @@
+name=Joba Tsl2561 Library
+version=2.0.1
+author=joba-1
+maintainer=joba-1
+sentence=IoT library for using the Tsl2561 luminosity sensor
+paragraph=Luminosity measurement in lux with autogain
+category=Sensors
+url=https://github.com/joba-1/Joba_Tsl2561
+architectures=*
diff --git a/lib/Joba_Tsl2561/src/Tsl2561.cpp b/lib/Joba_Tsl2561/src/Tsl2561.cpp
new file mode 100644
index 000000000..ad347f071
--- /dev/null
+++ b/lib/Joba_Tsl2561/src/Tsl2561.cpp
@@ -0,0 +1,134 @@
+/*
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#include "Tsl2561.h"
+
+Tsl2561::Tsl2561( TwoWire &wire ) : _addr(ADDR_NONE), _wire(wire), _status(ERR_OK) {
+}
+
+bool Tsl2561::available() {
+ _wire.beginTransmission(_addr);
+ return (_status = static_cast(_wire.endTransmission())) == ERR_OK;
+}
+
+bool Tsl2561::begin( address_t addr ) {
+ _addr = addr;
+ return available();
+}
+
+bool Tsl2561::begin() {
+ static address_t addr[] = { ADDR_GND, ADDR_FLOAT, ADDR_VDD };
+
+ for( uint8_t i=0; i(_wire.read());
+ }
+ }
+ return (_status = static_cast(_wire.endTransmission())) == ERR_OK;
+}
+
+bool Tsl2561::readWord( register_t reg, uint16_t &val ) {
+ _wire.beginTransmission(_addr);
+ _wire.write(reg | CONTROL_CMD);
+ if( _wire.endTransmission(false) == ERR_OK ) {
+ if( _wire.requestFrom(_addr, 2) ) {
+ val = (uint16_t)_wire.read() & 0xff;
+ val |= ((uint16_t)_wire.read() & 0xff) << 8;
+ }
+ }
+ return (_status = static_cast(_wire.endTransmission())) == ERR_OK;
+}
+
+bool Tsl2561::writeByte( register_t reg, uint8_t val ) {
+ _wire.beginTransmission(_addr);
+ _wire.write(reg | CONTROL_CMD);
+ _wire.write(val);
+ return (_status = static_cast(_wire.endTransmission())) == ERR_OK;
+}
+
+Tsl2561::status_t Tsl2561::status() const {
+ return _status;
+}
+
+Tsl2561::address_t Tsl2561::address() const {
+ return _addr;
+}
+
+bool Tsl2561::id( uint8_t &id ) {
+ return readByte(REG_ID, id);
+}
+
+uint8_t Tsl2561::type( uint8_t id ) {
+ return id & PKG_ID;
+}
+
+uint8_t Tsl2561::revision( uint8_t id ) {
+ return id & PKG_REV;
+}
+
+bool Tsl2561::packageCS( uint8_t id ) {
+ return type(id) == PKG_CS;
+}
+
+bool Tsl2561::packageT_FN_CL( uint8_t id ) {
+ return type(id) == PKG_T_FN_CL;
+}
+
+bool Tsl2561::on() {
+ return writeByte(REG_CONTROL, POWER_ON);
+}
+
+bool Tsl2561::off() {
+ return writeByte(REG_CONTROL, POWER_OFF);
+}
+
+bool Tsl2561::setSensitivity( bool gain, exposure_t exposure ) {
+ return writeByte(REG_TIMING, (gain ? GAIN_ON : GAIN_OFF) | exposure);
+}
+
+bool Tsl2561::getSensitivity( bool &gain, exposure_t &exposure )
+{
+ uint8_t val;
+ if( readByte(REG_TIMING, val) ) {
+ gain = val & GAIN_ON;
+ exposure = static_cast(val & EXP_ON);
+ }
+ return _status == ERR_OK;
+}
+
+bool Tsl2561::fullLuminosity( uint16_t &luminosity ) {
+ return readWord(REG_DATA0LOW, luminosity);
+}
+
+bool Tsl2561::irLuminosity( uint16_t &luminosity ) {
+ return readWord(REG_DATA1LOW, luminosity);
+}
diff --git a/lib/Joba_Tsl2561/src/Tsl2561.h b/lib/Joba_Tsl2561/src/Tsl2561.h
new file mode 100644
index 000000000..75056f912
--- /dev/null
+++ b/lib/Joba_Tsl2561/src/Tsl2561.h
@@ -0,0 +1,133 @@
+/*
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#ifndef Tsl2561_H
+#define Tsl2561_H
+
+#include
+#include
+
+class Tsl2561 {
+
+public:
+
+ typedef enum {
+ ADDR_NONE = 0b0000000,
+ ADDR_GND = 0b0101001,
+ ADDR_FLOAT = 0b0111001,
+ ADDR_VDD = 0b1001001
+ } address_t;
+
+ typedef enum {
+ REG_CONTROL, // Control of basic functions
+ REG_TIMING, // Integration time/gain control
+ REG_THRESHLOWLOW, // Low byte of low interrupt threshold
+ REG_THRESHLOWHIGH, // High byte of low interrupt threshold
+ REG_THRESHHIGHLOW, // Low byte of high interrupt threshold
+ REG_THRESHHIGHHIGH, // High byte of high interrupt threshold
+ REG_INTERRUPT, // Interrupt control
+ REG_RESERVED1,
+ REG_CRC, // Factory test - not a user register
+ REG_RESERVED2,
+ REG_ID, // Part number/Rev ID
+ REG_RESERVED3,
+ REG_DATA0LOW, // Low byte of ADC channel 0
+ REG_DATA0HIGH, // High byte of ADC channel 0
+ REG_DATA1LOW, // Low byte of ADC channel 1
+ REG_DATA1HIGH // High byte of ADC channel 1
+ } register_t;
+
+ enum {
+ CONTROL_CMD = 0b10000000,
+ CONTROL_CLEAR = 0b01000000,
+ CONTROL_WORD = 0b00100000, // SPI only?
+ CONTROL_BLOCK = 0b00010000, // SPI only?
+ CONTROL_ADDRESS = 0b00001111
+ };
+
+ enum {
+ POWER_OFF,
+ POWER_ON = 0b11,
+ };
+
+ enum {
+ GAIN_OFF,
+ GAIN_ON = 0b00010000
+ };
+
+ typedef enum {
+ EXP_ON = 0b00001011,
+ EXP_OFF = 0b00000011,
+ EXP_14 = 0b00000000,
+ EXP_101 = 0b00000001,
+ EXP_402 = 0b00000010
+ } exposure_t;
+
+ enum {
+ PKG_ID = 0b11110000,
+ PKG_REV = 0b00001111,
+ PKG_CS = 0b00010000,
+ PKG_T_FN_CL = 0b01010000
+ };
+
+ typedef enum {
+ ERR_OK = 0,
+ ERR_GENERAL = 1,
+ ERR_GONE = 2,
+ ERR_RW = 3,
+ ERR_BUSY = 4
+ } status_t;
+
+ Tsl2561( TwoWire &wire );
+
+ bool begin( address_t addr );
+ bool begin();
+
+ bool available();
+ status_t status() const;
+ address_t address() const;
+
+ bool id( uint8_t &id );
+ static uint8_t type( uint8_t id );
+ static uint8_t revision( uint8_t id );
+ static bool packageCS( uint8_t id );
+ static bool packageT_FN_CL( uint8_t id );
+
+ bool on();
+ bool off();
+ bool setSensitivity( bool gain, exposure_t exposure );
+ bool getSensitivity( bool &gain, exposure_t &exposure );
+ bool fullLuminosity( uint16_t &luminosity );
+ bool irLuminosity( uint16_t &luminosity );
+
+protected:
+ bool readByte( register_t reg, uint8_t &val );
+ bool readWord( register_t reg, uint16_t &val );
+ bool writeByte( register_t reg, uint8_t val );
+
+private:
+ Tsl2561();
+ Tsl2561( Tsl2561 & );
+
+ address_t _addr;
+ TwoWire &_wire;
+ status_t _status;
+};
+
+#endif
diff --git a/lib/Joba_Tsl2561/src/Tsl2561Util.cpp b/lib/Joba_Tsl2561/src/Tsl2561Util.cpp
new file mode 100644
index 000000000..92997b60b
--- /dev/null
+++ b/lib/Joba_Tsl2561/src/Tsl2561Util.cpp
@@ -0,0 +1,193 @@
+/*
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#include "Tsl2561Util.h"
+
+namespace Tsl2561Util {
+
+// Tsl2561Util::normalizedLuminosity returncode false can mean:
+// - saturation: full and/or ir have value ~0 (aka -1)
+// - manual exposure time: full and ir are corrected only for gain
+// If true, full and ir have values as if exposure was 402 and gain 16.
+bool normalizedLuminosity( bool gain, Tsl2561::exposure_t exposure, uint32_t &full, uint32_t &ir ) {
+
+ uint16_t scaledFull = (uint16_t)full;
+ uint16_t scaledIr = (uint16_t)ir;
+
+ if( scaledFull ) {
+
+ if( ! gain ) {
+ full <<= 4;
+ ir <<= 4;
+ }
+
+ switch( exposure ) {
+ case Tsl2561::EXP_14:
+ full = (scaledFull >= 5047/4*3) ? ~0 : ((full + 5) * 322) / 11;
+ ir = (scaledIr >= 5047/4*3) ? ~0 : ((ir + 5) * 322) / 11;
+ break;
+ case Tsl2561::EXP_101:
+ full = (scaledFull >= 37177/4*3) ? ~0 : ((full + 40) * 322) / 81;
+ ir = (scaledIr >= 37177/4*3) ? ~0 : ((ir + 40) * 322) / 81;
+ break;
+ case Tsl2561::EXP_402:
+ if( scaledFull >= 65535/4*3 ) full = ~0;
+ if( scaledIr >= 65535/4*3 ) ir = ~0;
+ break;
+ default:
+ return false;
+ }
+
+ return full != ~0U && ir != ~0U;
+ }
+
+ return false;
+}
+
+// Return upper saturation limit upto which chip returns accurate data
+uint16_t getLimit( Tsl2561::exposure_t exposure ) {
+ switch( exposure ) {
+ case Tsl2561::EXP_14: return 5047/4*3;
+ case Tsl2561::EXP_101: return 37177/4*3;
+ default: return 65535/4*3;
+ }
+}
+
+// Wait for one measurement interval plus some empirically tested extra millis
+void waitNext( Tsl2561::exposure_t exposure ) {
+ switch( exposure ) {
+ case Tsl2561::EXP_14: delay(16); break;
+ case Tsl2561::EXP_101: delay(103); break;
+ default: delay(408); break;
+ }
+}
+
+// Wait for next sample, read luminosity and adjust sensitivity, if needed and possible
+bool autoGain( Tsl2561 &tsl, bool &gain, Tsl2561::exposure_t &exposure, uint16_t &full, uint16_t &ir ) {
+
+ static const struct {
+ bool gain;
+ Tsl2561::exposure_t exposure;
+ } sensitivity[] = {
+ { false, Tsl2561::EXP_14, }, // min
+ { false, Tsl2561::EXP_101 },
+ { true, Tsl2561::EXP_14 },
+ { false, Tsl2561::EXP_402 },
+ { true, Tsl2561::EXP_101 },
+ { true, Tsl2561::EXP_402 } // max
+ };
+
+ // get current sensitivity
+ if( !tsl.getSensitivity(gain, exposure) ) {
+ return false;
+ }
+
+ // find index of current sensitivity
+ uint8_t curr = 0;
+ while( curr < sizeof(sensitivity)/sizeof(sensitivity[0]) ) {
+ if( sensitivity[curr].gain == gain && sensitivity[curr].exposure == exposure ) {
+ break;
+ }
+ curr++;
+ }
+ if( curr == sizeof(sensitivity)/sizeof(sensitivity[0]) ) {
+ return false; // should not happen...
+ }
+
+ // in a loop wait for next sample, get values and adjust sensitivity if needed
+ while( true ) {
+ waitNext(exposure);
+
+ if( !tsl.fullLuminosity(full) || !tsl.irLuminosity(ir) ) {
+ return false;
+ }
+
+ uint16_t limit = getLimit(exposure);
+ if( full >= 1000 && full <= limit ) {
+ return true; // new value within limits
+ }
+
+ if( (full < 1000 && ++curr < sizeof(sensitivity)/sizeof(sensitivity[0]))
+ || (full > limit && curr-- > 0) ) {
+ if( !tsl.setSensitivity(sensitivity[curr].gain, sensitivity[curr].exposure) ) {
+ return false;
+ }
+ gain = sensitivity[curr].gain;
+ exposure = sensitivity[curr].exposure;
+ }
+ else {
+ return true; // saturated, but best we can do
+ }
+ }
+}
+
+// Measurement is up to 20% too high for temperatures above 25°C. Compensate for that.
+bool compensateTemperature( int16_t centiCelsius, uint32_t &full, uint32_t &ir ) {
+ // assume linear gradient 0% at 25°C to +20% at 70°C
+ if( centiCelsius >= -3000 && centiCelsius <= 7000 ) {
+ full -= (full * (centiCelsius - 2500) * 20) / (100 * (7000 - 2500));
+ ir -= (ir * (centiCelsius - 2500) * 20) / (100 * (7000 - 2500));
+ return true;
+ }
+
+ return false;
+}
+
+// Calculate lux from raw luminosity values
+bool milliLux( uint32_t full, uint32_t ir, uint32_t &mLux, bool csType ) {
+ if( !full ) {
+ mLux = 0;
+ return true;
+ }
+
+ uint32_t milliRatio = ir * 1000 / full;
+
+ if( csType ) {
+ if( milliRatio < 130 ) { mLux = 1000 * full - 840 * ir; }
+ else if ( milliRatio < 260 ) { mLux = 1080 * full - 1380 * ir; }
+ else if ( milliRatio < 390 ) { mLux = 1160 * full - 1690 * ir; }
+ else if ( milliRatio < 520 ) { mLux = 1260 * full - 1940 * ir; }
+ else if ( milliRatio < 650 ) { mLux = 730 * full - 930 * ir; }
+ else if ( milliRatio < 800 ) { mLux = 500 * full - 575 * ir; }
+ else if ( milliRatio < 1300 ) { mLux = 110 * full - 85 * ir; }
+ else {
+ mLux = 0;
+ return false;
+ }
+ mLux /= 400 * 16 / 200; // 32 = counts/lux (cpl)
+ }
+ else {
+ if( milliRatio < 125 ) { mLux = 1000 * full - 895 * ir; }
+ else if ( milliRatio < 250 ) { mLux = 1070 * full - 1045 * ir; }
+ else if ( milliRatio < 375 ) { mLux = 1150 * full - 1790 * ir; }
+ else if ( milliRatio < 500 ) { mLux = 1260 * full - 2050 * ir; }
+ else if ( milliRatio < 610 ) { mLux = 740 * full - 1020 * ir; }
+ else if ( milliRatio < 800 ) { mLux = 420 * full - 500 * ir; }
+ else if ( milliRatio < 1300 ) { mLux = 48 * full - 37 * ir; }
+ else {
+ mLux = 0;
+ return false;
+ }
+ mLux /= 400 * 16 / 193; // 33 = counts/lux (cpl)
+ }
+
+ return true;
+}
+
+} // namespace Tsl2561Util
diff --git a/lib/Joba_Tsl2561/src/Tsl2561Util.h b/lib/Joba_Tsl2561/src/Tsl2561Util.h
new file mode 100644
index 000000000..58c5d4bbf
--- /dev/null
+++ b/lib/Joba_Tsl2561/src/Tsl2561Util.h
@@ -0,0 +1,48 @@
+/*
+Copyright: Joachim Banzhaf, 2018
+
+This file is part of the Joba_Tsl2561 Library.
+
+ Joba_Tsl2561 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 3 of the License, or
+ (at your option) any later version.
+
+ Joba_Tsl2561 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Joba_Tsl2561. If not, see .
+*/
+
+#ifndef Tsl2561Util_H
+#define Tsl2561Util_H
+
+#include
+
+namespace Tsl2561Util {
+
+ // delay until next sample is available
+ void waitNext( Tsl2561::exposure_t exposure );
+
+ // get saturation limit for given exposure time
+ uint16_t getLimit( Tsl2561::exposure_t exposure );
+
+ // in a loop wait for a sample, get it, check if within thresholds,
+ // until luminosity is either valid or at upper or lower saturation limit
+ bool autoGain( Tsl2561 &tsl, bool &gain, Tsl2561::exposure_t &exposure, uint16_t &full, uint16_t &ir );
+
+ // adjust luminosity as if measured with maximum exposure time and maximum gain
+ bool normalizedLuminosity( bool gain, Tsl2561::exposure_t exposure, uint32_t &full, uint32_t &ir );
+
+ // adjust luminosity according to sensor temperature (max +/-20% from 25°C)
+ bool compensateTemperature( int16_t centiCelsius, uint32_t &full, uint32_t &ir );
+
+ // calculate lux from normalized (and optionally temperature adjusted) luminosity
+ bool milliLux( uint32_t full, uint32_t ir, uint32_t &milliLux, bool csType = false );
+
+};
+
+#endif
diff --git a/lib/TSL2561-Arduino-Library/TSL2561.cpp b/lib/TSL2561-Arduino-Library/Adafruit_TSL2561.cpp
similarity index 98%
rename from lib/TSL2561-Arduino-Library/TSL2561.cpp
rename to lib/TSL2561-Arduino-Library/Adafruit_TSL2561.cpp
index b033aad0a..a6b37c3bb 100644
--- a/lib/TSL2561-Arduino-Library/TSL2561.cpp
+++ b/lib/TSL2561-Arduino-Library/Adafruit_TSL2561.cpp
@@ -1,6 +1,6 @@
/**************************************************************************/
-/*!
- @file tsl2561.c
+/*!
+ @file Adafruit_TSL2561.c
@author K. Townsend (microBuilder.eu / adafruit.com)
@section LICENSE
@@ -42,7 +42,7 @@
#endif
#include
-#include "TSL2561.h"
+#include "Adafruit_TSL2561.h"
TSL2561::TSL2561(uint8_t addr) {
_addr = addr;
@@ -109,7 +109,7 @@ void TSL2561::setGain(tsl2561Gain_t gain) {
enable();
_gain = gain;
- write8(TSL2561_COMMAND_BIT | TSL2561_REGISTER_TIMING, _integration | _gain);
+ write8(TSL2561_COMMAND_BIT | TSL2561_REGISTER_TIMING, _integration | _gain);
disable();
}
@@ -119,7 +119,7 @@ void TSL2561::setTiming(tsl2561IntegrationTime_t integration)
enable();
_integration = integration;
- write8(TSL2561_COMMAND_BIT | TSL2561_REGISTER_TIMING, _integration | _gain);
+ write8(TSL2561_COMMAND_BIT | TSL2561_REGISTER_TIMING, _integration | _gain);
disable();
}
@@ -254,7 +254,7 @@ uint16_t TSL2561::getLuminosity (uint8_t channel) {
// Reads all and subtracts out just the visible!
return ( (x & 0xFFFF) - (x >> 16));
}
-
+
// unknown channel!
return 0;
}
diff --git a/lib/TSL2561-Arduino-Library/TSL2561.h b/lib/TSL2561-Arduino-Library/Adafruit_TSL2561.h
similarity index 99%
rename from lib/TSL2561-Arduino-Library/TSL2561.h
rename to lib/TSL2561-Arduino-Library/Adafruit_TSL2561.h
index 2750f2b13..c607afe1f 100644
--- a/lib/TSL2561-Arduino-Library/TSL2561.h
+++ b/lib/TSL2561-Arduino-Library/Adafruit_TSL2561.h
@@ -1,7 +1,7 @@
/**************************************************************************/
/*!
- @file tsl2561.h
+ @file Adafruit_TSL2561.h
@author K. Townsend (microBuilder.eu)
@section LICENSE
diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index 3a11a8062..8aff85fb6 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -11,6 +11,7 @@
* Add Restart time to Status 1 (#1938)
* Change Sonoff SC JSON format (#1939)
* Fix compile error when define HOME_ASSISTANT_DISCOVERY_ENABLE is not set (#1937)
+ * Add optional TSL2561 driver using library Joba_Tsl2561 to be enabled in user_config.h with define USE_TSL2561_JOBA (#1951)
*
* 5.12.0a
* Change platformio option sonoff-ds18x20 to sonoff-xxl enabling ds18x20 and all other sensors in one image
diff --git a/sonoff/user_config.h b/sonoff/user_config.h
index 7be45dd23..9f2c1f1d3 100644
--- a/sonoff/user_config.h
+++ b/sonoff/user_config.h
@@ -189,7 +189,8 @@
// #define USE_BME680 // Add additional support for BME680 sensor using Adafruit Sensor and BME680 libraries (+6k code)
#define USE_BH1750 // Add I2C code for BH1750 sensor (+0k5 code)
// #define USE_VEML6070 // Add I2C code for VEML6070 sensor (+0k5 code)
-// #define USE_TSL2561 // Add I2C code for TSL2561 sensor using library Adafruit TSL2561 Arduino (+1k2 code)
+// #define USE_TSL2561 // Add I2C code for TSL2561 sensor using library Adafruit TSL2561 Arduino (+1k4 code)
+// #define USE_TSL2561_JOBA // Add I2C code for TSL2561 sensor using library Joba_Tsl2561 (+2k3 code)
// #define USE_ADS1115 // Add I2C code for ADS1115 16 bit A/D converter based on Adafruit ADS1x15 library (no library needed) (+0k7 code)
// #define USE_ADS1115_I2CDEV // Add I2C code for ADS1115 16 bit A/D converter using library i2cdevlib-Core and i2cdevlib-ADS1115 (+2k code)
// #define USE_INA219 // Add I2C code for INA219 Low voltage and current sensor (+1k code)
diff --git a/sonoff/xsns_16_tsl2561.ino b/sonoff/xsns_16_tsl2561.ino
index 79f112dda..65575a48f 100644
--- a/sonoff/xsns_16_tsl2561.ino
+++ b/sonoff/xsns_16_tsl2561.ino
@@ -27,7 +27,7 @@
* Using library https://github.com/adafruit/TSL2561-Arduino-Library
\*********************************************************************************************/
-#include
+#include
uint8_t tsl2561_address;
uint8_t tsl2561_addresses[] = { TSL2561_ADDR_LOW, TSL2561_ADDR_FLOAT, TSL2561_ADDR_HIGH };
diff --git a/sonoff/xsns_16_tsl2561_joba.ino b/sonoff/xsns_16_tsl2561_joba.ino
new file mode 100644
index 000000000..43df5d712
--- /dev/null
+++ b/sonoff/xsns_16_tsl2561_joba.ino
@@ -0,0 +1,116 @@
+/*
+ xsns_16_tsl2561.ino - TSL2561 light sensor support for Sonoff-Tasmota
+
+ Copyright (C) 2018 Theo Arends
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#ifdef USE_I2C
+#ifdef USE_TSL2561_JOBA
+/*********************************************************************************************\
+ * TSL2561 - Light Intensity
+ *
+ * I2C Addresses: 0x29 (low), 0x39 (float) or 0x49 (high)
+ *
+ * Using library https://github.com/joba-1/Joba_Tsl2561
+\*********************************************************************************************/
+
+#include
+
+Tsl2561 Tsl(Wire);
+
+void Tsl2561Detect()
+{
+ if (!Tsl.available()) {
+ Tsl.begin();
+ if (Tsl.available()) {
+ snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, "TSL2561", Tsl.address());
+ AddLog(LOG_LEVEL_DEBUG);
+ }
+ }
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_TSL2561[] PROGMEM =
+ "%s{s}TSL2561 " D_ILLUMINANCE "{m}%u.%03u " D_UNIT_LUX "{e}"; // {s} = , {m} = | , {e} = |
+#endif // USE_WEBSERVER
+
+void Tsl2561Show(boolean json)
+{
+ uint8_t id;
+ bool gain;
+ Tsl2561::exposure_t exposure;
+ uint16_t scaledFull, scaledIr;
+ uint32_t full, ir;
+ uint32_t milliLux;
+
+ if (Tsl.available()) {
+ if (Tsl.on()) {
+ if( Tsl.id(id)
+ && Tsl2561Util::autoGain(Tsl, gain, exposure, scaledFull, scaledIr)
+ && Tsl2561Util::normalizedLuminosity(gain, exposure, full = scaledFull, ir = scaledIr)
+ && Tsl2561Util::milliLux(full, ir, milliLux, Tsl2561::packageCS(id))) {
+
+ snprintf_P(log_data, sizeof(log_data), PSTR(D_ILLUMINANCE " g:%d, e:%d, f:%u, i:%u -> %u.%03u " D_UNIT_LUX),
+ gain, exposure, full, ir, milliLux/1000, milliLux%1000);
+ AddLog(LOG_LEVEL_DEBUG);
+
+ if (json) {
+ snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"TSL2561\":{\"" D_JSON_ILLUMINANCE "\":%u.%03u}"),
+ mqtt_data, milliLux/1000, milliLux%1000);
+#ifdef USE_DOMOTICZ
+ DomoticzSensor(DZ_ILLUMINANCE, (milliLux+500)/1000);
+#endif // USE_DOMOTICZ
+#ifdef USE_WEBSERVER
+ } else {
+ snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TSL2561, mqtt_data, milliLux/1000, milliLux%1000);
+#endif // USE_WEBSERVER
+ }
+ }
+ Tsl.off();
+ }
+ }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+#define XSNS_16
+
+boolean Xsns16(byte function)
+{
+ boolean result = false;
+
+ if (i2c_flg) {
+ switch (function) {
+ case FUNC_PREP_BEFORE_TELEPERIOD:
+ Tsl2561Detect();
+ break;
+ case FUNC_JSON_APPEND:
+ Tsl2561Show(1);
+ break;
+#ifdef USE_WEBSERVER
+ case FUNC_WEB_APPEND:
+ Tsl2561Show(0);
+ break;
+#endif // USE_WEBSERVER
+ }
+ }
+ return result;
+}
+
+#endif // USE_TSL2561_JOBA
+#endif // USE_I2C