From a3f1c194ba2e0891ac89e9800ea7acfa20635ae7 Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Thu, 15 Jan 2026 23:35:47 +0100 Subject: [PATCH] embed rtc driver, not sure if its that exact but should be better infact --- include/rtc.hpp | 4 +- lib/RX8010SJ/LICENSE | 674 ------------------------------- lib/RX8010SJ/RX8010SJ.cpp | 429 -------------------- lib/RX8010SJ/RX8010SJ.h | 152 ------- lib/RX8010SJ/library.json | 20 - lib/TFT_eSPI/ILI9341_Defines.h | 81 ---- lib/TFT_eSPI/ILI9341_Init.h | 2 +- lib/TFT_eSPI/ILI9341_Rotation.h | 54 +-- lib/TFT_eSPI/TFT_eSPI.cpp | 609 ++++------------------------ lib/TFT_eSPI/TFT_eSPI.h | 31 +- lib/TFT_eSPI/User_Setup_Select.h | 24 -- src/TEF6686.cpp | 6 +- src/main.cpp | 16 +- src/rtc.cpp | 119 ++++-- 14 files changed, 185 insertions(+), 2036 deletions(-) delete mode 100644 lib/RX8010SJ/LICENSE delete mode 100644 lib/RX8010SJ/RX8010SJ.cpp delete mode 100644 lib/RX8010SJ/RX8010SJ.h delete mode 100644 lib/RX8010SJ/library.json diff --git a/include/rtc.hpp b/include/rtc.hpp index 9c92c11..9016096 100644 --- a/include/rtc.hpp +++ b/include/rtc.hpp @@ -3,14 +3,14 @@ #include #include "constants.h" #include -#include +#include extern bool rtcset; extern bool NTPupdated; extern ESP32Time rtc; extern bool rx_rtc_avail; -extern RX8010SJ::Adapter rx_rtc; +bool init_rtc(); void sync_from_rx_rtc(int32_t offset = 0); void set_time(time_t time); \ No newline at end of file diff --git a/lib/RX8010SJ/LICENSE b/lib/RX8010SJ/LICENSE deleted file mode 100644 index e72bfdd..0000000 --- a/lib/RX8010SJ/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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 -. \ No newline at end of file diff --git a/lib/RX8010SJ/RX8010SJ.cpp b/lib/RX8010SJ/RX8010SJ.cpp deleted file mode 100644 index 3b9611d..0000000 --- a/lib/RX8010SJ/RX8010SJ.cpp +++ /dev/null @@ -1,429 +0,0 @@ -#include "RX8010SJ.h" - -namespace RX8010SJ { - - Adapter::Adapter(byte i2cSlaveAddr) { - i2cAddress = i2cSlaveAddr; - } - - Adapter::~Adapter() {} - - /** - * - * PUBLIC FUNCTIONS - * - */ - - /** - * GENERAL - */ - - bool Adapter::initAdapter() { - Wire.begin(); - delay(40); - - return initModule(); - } - - bool Adapter::initModule() { - byte flagValue = readFromModule(RX8010_FLAG); - byte vlf = getValueFromBinary(flagValue, RX8010_VLF_POS); - - // It's 1 when the module had power issues and needs to be reinitialised - if (vlf == 1) { - // The oscillator takes some time stabilise - while (vlf == 1) { - flagValue = setBinary(flagValue, RX8010_VLF_POS, 0); - writeToModule(RX8010_FLAG, vlf); - delay(10); - flagValue = readFromModule(RX8010_FLAG); - vlf = getValueFromBinary(flagValue, RX8010_VLF_POS); - } - - resetModule(); - - return true; - } - - return false; - } - - void Adapter::resetModule() { - writeToModule(RX8010_RESV17, RX8010_ADDR17_DEF_VAL); - writeToModule(RX8010_RESV30, RX8010_ADDR30_DEF_VAL); - writeToModule(RX8010_RESV31, RX8010_ADDR31_DEF_VAL); - writeToModule(RX8010_IRQ, RX8010_IRQ_DEF_VAL); - - writeFlag(RX8010_EXT, RX8010_TE_POS, 0); - writeFlag(RX8010_FLAG, RX8010_VLF_POS, 0); - - writeToModule(RX8010_CTRL, RX8010_CTRL_DEF_VAL); - } - - void Adapter::toggleGlobalStop(bool stopEnabled) { - writeFlag(RX8010_CTRL, RX8010_STOP_POS, stopEnabled ? 1 : 0); - } - - /** - * DATE TIME - */ - - DateTime Adapter::readDateTime() { - byte secondBin = readFromModule(RX8010_SEC); - byte minuteBin = readFromModule(RX8010_MIN); - byte hourBin = readFromModule(RX8010_HOUR); - byte dayOfWeekBin = readFromModule(RX8010_WDAY); - byte dayOfMonthBin = readFromModule(RX8010_MDAY); - byte monthBin = readFromModule(RX8010_MONTH); - byte yearBin = readFromModule(RX8010_YEAR); - - DateTime dateTime; - - dateTime.second = sumValueFromBinary(secondBin, 7); - dateTime.minute =sumValueFromBinary(minuteBin, 7); - dateTime.hour = sumValueFromBinary(hourBin, 6); - dateTime.dayOfWeek = getSingleBit(dayOfWeekBin); - dateTime.dayOfMonth = sumValueFromBinary(dayOfMonthBin, 6); - dateTime.month = sumValueFromBinary(monthBin, 5); - dateTime.year = sumValueFromBinary(yearBin, 8); - - return dateTime; - } - - void Adapter::writeDateTime(DateTime dateTime) { - byte second = dateTime.second % 10; - byte minute = dateTime.minute % 10; - byte hour = dateTime.hour % 10; - byte dayOfWeek = setBinary(0, dateTime.dayOfWeek, 1); - byte dayOfMonth = dateTime.dayOfMonth % 10; - byte month = dateTime.month % 10; - byte year = dateTime.year % 10; - - second = setFortyBinary(second, dateTime.second); - second = setTwentyBinary(second, dateTime.second); - second = setTenBinary(second, dateTime.second); - - minute = setFortyBinary(minute, dateTime.minute); - minute = setTwentyBinary(minute, dateTime.minute); - minute = setTenBinary(minute, dateTime.minute); - - hour = setTwentyBinary(hour, dateTime.hour); - hour = setTenBinary(hour, dateTime.hour); - - dayOfMonth = setTwentyBinary(dayOfMonth, dateTime.dayOfMonth); - dayOfMonth = setTenBinary(dayOfMonth, dateTime.dayOfMonth); - - month = setTenBinary(month, dateTime.month); - - year = setEightyBinary(year, dateTime.year); - year = setFortyBinary(year, dateTime.year); - year = setTwentyBinary(year, dateTime.year); - year = setTenBinary(year, dateTime.year); - - writeToModule(RX8010_SEC, second); - writeToModule(RX8010_MIN, minute); - writeToModule(RX8010_HOUR, hour); - writeToModule(RX8010_WDAY, dayOfWeek); - writeToModule(RX8010_MDAY, dayOfMonth); - writeToModule(RX8010_MONTH, month); - writeToModule(RX8010_YEAR, year); - } - - /** - * FCT - */ - - void Adapter::setFCTCounter(uint16_t multiplier, byte frequency) { - byte firstHalf = multiplier & 0b11111111; - byte secondHalf = multiplier >> 8; - - writeToModule(RX8010_TCOUNT0, firstHalf); - writeToModule(RX8010_TCOUNT1, secondHalf); - - writeFlag(RX8010_EXT, RX8010_TSEL0_POS, getValueFromBinary(frequency, RX8010_TSEL0_POS)); - writeFlag(RX8010_EXT, RX8010_TSEL1_POS, getValueFromBinary(frequency, RX8010_TSEL1_POS)); - writeFlag(RX8010_EXT, RX8010_TSEL2_POS, getValueFromBinary(frequency, RX8010_TSEL2_POS)); - } - - uint16_t Adapter::getFCTCounter() { - byte firstHalf = readFromModule(RX8010_TCOUNT0); - byte secondHalf = readFromModule(RX8010_TCOUNT1); - - return firstHalf + (secondHalf << 8); - } - - void Adapter::setFCTOutput(byte pin) { - if (pin > 1) { - writeFlag(RX8010_CTRL, RX8010_TIE_POS, 0); - } else { - writeFlag(RX8010_IRQ, RX8010_TMPIN_POS, pin); - writeFlag(RX8010_CTRL, RX8010_TIE_POS, 1); - } - } - - void Adapter::enableFCT() { - writeFlag(RX8010_CTRL, RX8010_TSTP_POS, 0); - writeFlag(RX8010_CTRL, RX8010_TIE_POS, 1); - writeFlag(RX8010_EXT, RX8010_TE_POS, 1); - } - - void Adapter::disableFCT() { - writeFlag(RX8010_EXT, RX8010_TE_POS, 0); - writeFlag(RX8010_CTRL, RX8010_TSTP_POS, 1); - } - - bool Adapter::checkFCT() { - byte flag = readFromModule(RX8010_FLAG); - bool interrupted = getValueFromBinary(flag, RX8010_TF_POS) == 1; - - if (interrupted) { - writeFlag(RX8010_FLAG, RX8010_TF_POS, 0); - } - - return interrupted; - } - - /** - * ALARM - */ - - void Adapter::setAlarm(DateTime time, byte mode) { - byte minute; - byte hour; - - if (time.minute == RX8010_ALARM_IGNORE) { - minute = RX8010_AL_DISABLED; - } else { - minute = time.minute % 10; - minute = setFortyBinary(minute, time.minute); - minute = setTwentyBinary(minute, time.minute); - minute = setTenBinary(minute, time.minute); - } - - if (time.hour == RX8010_ALARM_IGNORE) { - hour = RX8010_AL_DISABLED; - } else { - hour = time.hour % 10; - hour = setTwentyBinary(hour, time.hour); - hour = setTenBinary(hour, time.hour); - } - - writeToModule(RX8010_ALMIN, minute); - writeToModule(RX8010_ALHOUR, hour); - - if (mode == RX8010_ALARM_MOD_WEEK) { - writeToModule(RX8010_ALWDAY, time.dayOfWeek == RX8010_ALARM_IGNORE ? RX8010_AL_DISABLED : time.dayOfWeek); - } else { - byte day; - - if (time.hour == RX8010_ALARM_IGNORE) { - day = RX8010_AL_DISABLED; - } else { - day = time.dayOfMonth % 10; - day = setTwentyBinary(hour, time.hour); - day = setTenBinary(hour, time.hour); - } - - writeToModule(RX8010_ALWDAY, day); - } - - writeFlag(RX8010_EXT, RX8010_WADA_POS, mode == RX8010_ALARM_MOD_WEEK ? 0 : 1); - } - - void Adapter::enableAlarm() { - writeFlag(RX8010_FLAG, RX8010_AF_POS, 0); - writeFlag(RX8010_CTRL, RX8010_AIE_POS, 1); - } - - void Adapter::disableAlarm() { - writeFlag(RX8010_CTRL, RX8010_AIE_POS, 0); - writeFlag(RX8010_FLAG, RX8010_AF_POS, 0); - } - - bool Adapter::checkAlarm() { - byte flag = readFromModule(RX8010_FLAG); - bool triggered = getValueFromBinary(flag, RX8010_AF_POS) == 1; - - if (triggered) { - writeFlag(RX8010_FLAG, RX8010_AF_POS, 0); - } - - return triggered; - } - - /** - * TIME UPDATE INTERRUPT - */ - - void Adapter::setTUIMode(byte mode) { - writeFlag(RX8010_EXT, RX8010_USEL_POS, mode); - } - - void Adapter::enableTUI() { - writeFlag(RX8010_CTRL, RX8010_UIE_POS, 1); - } - - void Adapter::disableTUI() { - writeFlag(RX8010_CTRL, RX8010_UIE_POS, 0); - } - - bool Adapter::checkTUI() { - byte flag = readFromModule(RX8010_FLAG); - bool interrupted = getValueFromBinary(flag, RX8010_UF_POS) == 1; - - if (interrupted) { - writeFlag(RX8010_FLAG, RX8010_UF_POS, 0); - } - - return interrupted; - } - - /** - * FREQUENCY OUTPUT - */ - - void Adapter::enableFOUT(byte frequency, byte pin) { - switch (frequency) { - case 3: - writeFlag(RX8010_EXT, RX8010_FSEL0_POS, 1); - writeFlag(RX8010_EXT, RX8010_FSEL1_POS, 1); - break; - case 2: - writeFlag(RX8010_EXT, RX8010_FSEL0_POS, 0); - writeFlag(RX8010_EXT, RX8010_FSEL1_POS, 1); - break; - case 1: - writeFlag(RX8010_EXT, RX8010_FSEL0_POS, 1); - writeFlag(RX8010_EXT, RX8010_FSEL1_POS, 0); - break; - case 0: - default: - disableFOUT(); - return; - } - - writeFlag(RX8010_IRQ, RX8010_FOPIN0_POS, pin); - writeFlag(RX8010_IRQ, RX8010_FOPIN1_POS, 0); - } - - void Adapter::disableFOUT() { - writeFlag(RX8010_EXT, RX8010_FSEL0_POS, 0); - writeFlag(RX8010_EXT, RX8010_FSEL1_POS, 0); - } - - /** - * - * PRIVATE FUNCTIONS - * - */ - - byte Adapter::readFromModule(byte address) { - Wire.beginTransmission(i2cAddress); - Wire.write(address); - Wire.endTransmission(); - Wire.requestFrom((uint8_t)i2cAddress, (uint8_t) 1); - - if (Wire.available()) { - return Wire.read(); - } - - return -1; - } - - void Adapter::writeToModule(byte address, byte data) { - Wire.beginTransmission(i2cAddress); - Wire.write(address); - Wire.write(data); - Wire.endTransmission(); - } - - void Adapter::writeFlag(byte address, byte pos, byte value) { - byte addressValue = readFromModule(address); - addressValue = setBinary(addressValue, pos, value); - writeToModule(address, addressValue); - } - - byte Adapter::getSingleBit(byte binary) { - for (byte i = 0; i <= 7; i++) { - if (binary >> i == 1) { - return i; - } - } - - return 0; - } - - byte Adapter::getValueFromBinary(byte binary, byte pos) { - return getValueFromBinary(binary, pos, 1); - } - - byte Adapter::getValueFromBinary(byte binary, byte pos, byte val) { - return ((binary >> pos) & 1) == 1 ? val : 0; - } - - byte Adapter::sumValueFromBinary(byte binary, byte length) { - byte sum = 0; - - for (byte i = 0; i < length; i++) { - byte value; - - if (i < 4 ) { - value = 1 << i; - } else { - value = 10 * (1 << (i - 4)); - } - - sum += getValueFromBinary(binary, i, value); - } - - return sum; - } - - byte Adapter::setEightyBinary(byte binary, byte val) { - if (val >= 80) { - return setBinary(binary, 7, 1); - } - - return setBinary(binary, 7, 0); - } - - byte Adapter::setFortyBinary(byte binary, byte val) { - if (val >= 40 && val < 80) { - return setBinary(binary, 6, 1); - } - - return setBinary(binary, 6, 0); - } - - byte Adapter::setTwentyBinary(byte binary, byte val) { - if ((val >= 20 && val < 40) || - (val >= 60 && val < 80)) { - - return setBinary(binary, 5, 1); - } - - return setBinary(binary, 5, 0); - } - - byte Adapter::setTenBinary(byte binary, byte val) { - if ((val >= 10 && val < 20) || - (val >= 30 && val < 40) || - (val >= 50 && val < 60) || - (val >= 70 && val < 80) || - (val >= 90 && val < 100)) { - - return setBinary(binary, 4, 1); - } - - return setBinary(binary, 4, 0); - } - - byte Adapter::setBinary(byte binary, byte pos, byte flagVal) { - if (flagVal == 1) { - return binary | (1 << pos); - } - - return binary & (~(1 << pos)); - } - -} \ No newline at end of file diff --git a/lib/RX8010SJ/RX8010SJ.h b/lib/RX8010SJ/RX8010SJ.h deleted file mode 100644 index d7ce76c..0000000 --- a/lib/RX8010SJ/RX8010SJ.h +++ /dev/null @@ -1,152 +0,0 @@ -#ifndef RX8010SJ_ADAPTER - #define RX8010SJ_ADAPTER - - #include "Arduino.h" - #include "Wire.h" - - #define RX8010_FCT_FREQ_4096 0b000 - #define RX8010_FCT_FREQ_64 0b001 - #define RX8010_FCT_FREQ_1 0b010 - #define RX8010_FCT_FREQ_1_60 0b011 - #define RX8010_FCT_FREQ_1_3600 0b100 - - #define RX8010_FCT_OUT_IRQ1 0b01 - #define RX8010_FCT_OUT_IRQ2 0b00 - #define RX8010_FCT_OUT_OFF 0b10 - - #define RX8010_ALARM_IGNORE 0b11111111 - #define RX8010_ALARM_MOD_MONTH 0b0 - #define RX8010_ALARM_MOD_WEEK 0b1 - - #define RX8010_TUI_MOD_SEC 0b0 - #define RX8010_TUI_MOD_MIN 0b1 - - #define RX8010_FOUT_FREQ_OFF 0b00 - #define RX8010_FOUT_FREQ_1 0b01 - #define RX8010_FOUT_FREQ_1024 0b10 - #define RX8010_FOUT_FREQ_32768 0b11 - #define RX8010_FOUT_IRQ1 0b01 - #define RX8010_FOUT_IRQ2 0b00 - - namespace RX8010SJ { - #define RX8010_SEC 0x10 - #define RX8010_MIN 0x11 - #define RX8010_HOUR 0x12 - #define RX8010_WDAY 0x13 - #define RX8010_MDAY 0x14 - #define RX8010_MONTH 0x15 - #define RX8010_YEAR 0x16 - #define RX8010_RESV17 0x17 - #define RX8010_ALMIN 0x18 - #define RX8010_ALHOUR 0x19 - #define RX8010_ALWDAY 0x1A - #define RX8010_TCOUNT0 0x1B - #define RX8010_TCOUNT1 0x1C - #define RX8010_EXT 0x1D - #define RX8010_FLAG 0x1E - #define RX8010_CTRL 0x1F - /* 0x20 to 0x2F are user registers */ - #define RX8010_RESV30 0x30 - #define RX8010_RESV31 0x31 - #define RX8010_IRQ 0x32 - - /* Default values for reseting the module */ - #define RX8010_ADDR17_DEF_VAL 0xD8 - #define RX8010_ADDR30_DEF_VAL 0x00 - #define RX8010_ADDR31_DEF_VAL 0x08 - #define RX8010_ADDR31_DEF_VAL 0x08 - #define RX8010_IRQ_DEF_VAL 0x04 - #define RX8010_CTRL_DEF_VAL 0x04 - - #define RX8010_VLF_POS 1 - #define RX8010_TE_POS 4 - #define RX8010_TSEL0_POS 0 - #define RX8010_TSEL1_POS 1 - #define RX8010_TSEL2_POS 2 - #define RX8010_TIE_POS 4 - #define RX8010_TMPIN_POS 2 - #define RX8010_TF_POS 4 - #define RX8010_STOP_POS 6 - #define RX8010_TSTP_POS 2 - #define RX8010_AIE_POS 3 - #define RX8010_WADA_POS 3 - #define RX8010_AF_POS 3 - #define RX8010_USEL_POS 5 - #define RX8010_UF_POS 5 - #define RX8010_UIE_POS 5 - #define RX8010_FSEL0_POS 6 - #define RX8010_FSEL1_POS 7 - #define RX8010_FOPIN0_POS 0 - #define RX8010_FOPIN1_POS 1 - - #define RX8010_AL_DISABLED 0b10000000 - - struct DateTime { - byte second; - byte minute; - byte hour; - byte dayOfWeek; // Has to be set - byte dayOfMonth; - byte month; - byte year; // Two digits - }; - - class Adapter { - public: - // Constructor/destructor - Adapter(byte i2cSlaveAddr); - virtual ~Adapter(); - - // Methods - bool initAdapter(); - bool initModule(); - void resetModule(); - void toggleGlobalStop(bool stopEnabled); - - // Calendar - DateTime readDateTime(); - void writeDateTime(DateTime dateTime); - - // Fixed cycle interrupt - void setFCTCounter(uint16_t multiplier, byte frequency); - uint16_t getFCTCounter(); - void setFCTOutput(byte pin); - void enableFCT(); - void disableFCT(); - bool checkFCT(); - - // Alarm - void setAlarm(DateTime time, byte mode); - void enableAlarm(); - void disableAlarm(); - bool checkAlarm(); - - // Time Update Interrupt - void setTUIMode(byte mode); - void enableTUI(); - void disableTUI(); - bool checkTUI(); - - // Frequency output - void enableFOUT(byte frequency, byte pin); - void disableFOUT(); - - private: - byte i2cAddress; - - byte readFromModule(byte address); - void writeToModule(byte address, byte data); - void writeFlag(byte address, byte pos, byte value); - byte getSingleBit(byte binary); - byte getValueFromBinary(byte binary, byte pos); - byte getValueFromBinary(byte binary, byte pos, byte val); - byte sumValueFromBinary(byte binary, byte length); - byte setEightyBinary(byte binary, byte val); - byte setFortyBinary(byte binary, byte val); - byte setTwentyBinary(byte binary, byte val); - byte setTenBinary(byte binary, byte val); - byte setBinary(byte binary, byte pos, byte flagVal); - }; - } - -#endif \ No newline at end of file diff --git a/lib/RX8010SJ/library.json b/lib/RX8010SJ/library.json deleted file mode 100644 index 4f5e969..0000000 --- a/lib/RX8010SJ/library.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "RX8010SJ", - "version": "1.03", - "repository": - { - "type": "git", - "url": "https://github.com/Wh1teRabbitHU/RX8010SJ" - }, - "authors": - [ - { - "name": "Wh1teRabbitHU", - "email": "ruszka.tamas@gmail.com", - "maintainer": true - } - ], - "frameworks": "arduino", - "platforms": "espressif32", - "headers": "TFT_eSPI.h" -} diff --git a/lib/TFT_eSPI/ILI9341_Defines.h b/lib/TFT_eSPI/ILI9341_Defines.h index caf5bb4..7464992 100644 --- a/lib/TFT_eSPI/ILI9341_Defines.h +++ b/lib/TFT_eSPI/ILI9341_Defines.h @@ -1,38 +1,8 @@ -// Color definitions for backwards compatibility with old sketches -// use colour definitions like TFT_BLACK to make sketches more portable -#define ILI9341_BLACK 0x0000 /* 0, 0, 0 */ -#define ILI9341_NAVY 0x000F /* 0, 0, 128 */ -#define ILI9341_DARKGREEN 0x03E0 /* 0, 128, 0 */ -#define ILI9341_DARKCYAN 0x03EF /* 0, 128, 128 */ -#define ILI9341_MAROON 0x7800 /* 128, 0, 0 */ -#define ILI9341_PURPLE 0x780F /* 128, 0, 128 */ -#define ILI9341_OLIVE 0x7BE0 /* 128, 128, 0 */ -#define ILI9341_LIGHTGREY 0xC618 /* 192, 192, 192 */ -#define ILI9341_DARKGREY 0x7BEF /* 128, 128, 128 */ -#define ILI9341_BLUE 0x001F /* 0, 0, 255 */ -#define ILI9341_GREEN 0x07E0 /* 0, 255, 0 */ -#define ILI9341_CYAN 0x07FF /* 0, 255, 255 */ -#define ILI9341_RED 0xF800 /* 255, 0, 0 */ -#define ILI9341_MAGENTA 0xF81F /* 255, 0, 255 */ -#define ILI9341_YELLOW 0xFFE0 /* 255, 255, 0 */ -#define ILI9341_WHITE 0xFFFF /* 255, 255, 255 */ -#define ILI9341_ORANGE 0xFD20 /* 255, 165, 0 */ -#define ILI9341_GREENYELLOW 0xAFE5 /* 173, 255, 47 */ -#define ILI9341_PINK 0xF81F - - -// Delay between some initialisation commands -#define TFT_INIT_DELAY 0x80 // Not used unless commandlist invoked - #define TFT_NOP 0x00 -#define TFT_SWRST 0x01 #define TFT_INVOFF 0x20 #define TFT_INVON 0x21 -#define TFT_DISPOFF 0x28 -#define TFT_DISPON 0x29 - #define TFT_CASET 0x2A #define TFT_PASET 0x2B #define TFT_RAMWR 0x2C @@ -49,74 +19,23 @@ #define TFT_MAD_MH 0x04 #define TFT_MAD_RGB 0x00 -#ifdef TFT_RGB_ORDER - #if (TFT_RGB_ORDER == 1) - #define TFT_MAD_COLOR_ORDER TFT_MAD_RGB - #else - #define TFT_MAD_COLOR_ORDER TFT_MAD_BGR - #endif -#else - #define TFT_MAD_COLOR_ORDER TFT_MAD_BGR -#endif - -#define ILI9341_NOP 0x00 -#define ILI9341_SWRESET 0x01 -#define ILI9341_RDDID 0x04 -#define ILI9341_RDDST 0x09 - -#define ILI9341_SLPIN 0x10 #define ILI9341_SLPOUT 0x11 -#define ILI9341_PTLON 0x12 #define ILI9341_NORON 0x13 -#define ILI9341_RDMODE 0x0A -#define ILI9341_RDMADCTL 0x0B -#define ILI9341_RDPIXFMT 0x0C -#define ILI9341_RDIMGFMT 0x0A -#define ILI9341_RDSELFDIAG 0x0F - -#define ILI9341_INVOFF 0x20 -#define ILI9341_INVON 0x21 #define ILI9341_GAMMASET 0x26 -#define ILI9341_DISPOFF 0x28 #define ILI9341_DISPON 0x29 -#define ILI9341_CASET 0x2A -#define ILI9341_PASET 0x2B -#define ILI9341_RAMWR 0x2C -#define ILI9341_RAMRD 0x2E - -#define ILI9341_PTLAR 0x30 -#define ILI9341_VSCRDEF 0x33 #define ILI9341_MADCTL 0x36 -#define ILI9341_VSCRSADD 0x37 #define ILI9341_PIXFMT 0x3A -#define ILI9341_WRDISBV 0x51 -#define ILI9341_RDDISBV 0x52 -#define ILI9341_WRCTRLD 0x53 - #define ILI9341_FRMCTR1 0xB1 -#define ILI9341_FRMCTR2 0xB2 -#define ILI9341_FRMCTR3 0xB3 -#define ILI9341_INVCTR 0xB4 #define ILI9341_DFUNCTR 0xB6 #define ILI9341_PWCTR1 0xC0 #define ILI9341_PWCTR2 0xC1 -#define ILI9341_PWCTR3 0xC2 -#define ILI9341_PWCTR4 0xC3 -#define ILI9341_PWCTR5 0xC4 #define ILI9341_VMCTR1 0xC5 #define ILI9341_VMCTR2 0xC7 -#define ILI9341_RDID4 0xD3 -#define ILI9341_RDINDEX 0xD9 -#define ILI9341_RDID1 0xDA -#define ILI9341_RDID2 0xDB -#define ILI9341_RDID3 0xDC -#define ILI9341_RDIDX 0xDD - #define ILI9341_GMCTRP1 0xE0 #define ILI9341_GMCTRN1 0xE1 diff --git a/lib/TFT_eSPI/ILI9341_Init.h b/lib/TFT_eSPI/ILI9341_Init.h index d7e01b6..a1f741c 100644 --- a/lib/TFT_eSPI/ILI9341_Init.h +++ b/lib/TFT_eSPI/ILI9341_Init.h @@ -48,7 +48,7 @@ writedata(0x86); //-- writecommand(ILI9341_MADCTL); // Memory Access Control - writedata(TFT_MAD_MX | TFT_MAD_COLOR_ORDER); // Rotation 0 (portrait mode) + writedata(TFT_MAD_MX | TFT_MAD_BGR); // Rotation 0 (portrait mode) writecommand(ILI9341_PIXFMT); writedata(0x55); diff --git a/lib/TFT_eSPI/ILI9341_Rotation.h b/lib/TFT_eSPI/ILI9341_Rotation.h index f31b9df..1390077 100644 --- a/lib/TFT_eSPI/ILI9341_Rotation.h +++ b/lib/TFT_eSPI/ILI9341_Rotation.h @@ -1,82 +1,46 @@ - -// This is the command sequence that rotates the ILI9341 driver coordinate frame - rotation = m % 8; // Limit the range of values to 0-7 writecommand(TFT_MADCTL); switch (rotation) { case 0: -#ifdef M5STACK - writedata(TFT_MAD_MY | TFT_MAD_MV | TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_MX | TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_MX | TFT_MAD_BGR); _width = _init_width; _height = _init_height; break; case 1: -#ifdef M5STACK - writedata(TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_MV | TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_MV | TFT_MAD_BGR); _width = _init_height; _height = _init_width; break; case 2: -#ifdef M5STACK - writedata(TFT_MAD_MV | TFT_MAD_MX | TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_MY | TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_MY | TFT_MAD_BGR); _width = _init_width; _height = _init_height; break; case 3: -#ifdef M5STACK - writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_MV | TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_MV | TFT_MAD_BGR); _width = _init_height; _height = _init_width; break; // These next rotations are for bottom up BMP drawing case 4: -#ifdef M5STACK - writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_MV | TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_BGR); _width = _init_width; _height = _init_height; break; case 5: -#ifdef M5STACK - writedata(TFT_MAD_MY | TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_MV | TFT_MAD_MX | TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_MV | TFT_MAD_MX | TFT_MAD_BGR); _width = _init_height; _height = _init_width; break; case 6: -#ifdef M5STACK - writedata(TFT_MAD_MV | TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_BGR); _width = _init_width; _height = _init_height; break; case 7: -#ifdef M5STACK - writedata(TFT_MAD_MX | TFT_MAD_COLOR_ORDER); -#else - writedata(TFT_MAD_MY | TFT_MAD_MV | TFT_MAD_COLOR_ORDER); -#endif + writedata(TFT_MAD_MY | TFT_MAD_MV | TFT_MAD_BGR); _width = _init_height; _height = _init_width; break; - - } + } \ No newline at end of file diff --git a/lib/TFT_eSPI/TFT_eSPI.cpp b/lib/TFT_eSPI/TFT_eSPI.cpp index 90eb562..906b78d 100644 --- a/lib/TFT_eSPI/TFT_eSPI.cpp +++ b/lib/TFT_eSPI/TFT_eSPI.cpp @@ -152,23 +152,6 @@ void TFT_eSPI::pushPixels(const void* data_in, uint32_t len){ while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_USR); } -bool TFT_eSPI::dmaBusy() -{ - if (!DMA_Enabled || !spiBusyCheck) return false; - - spi_transaction_t *rtrans; - esp_err_t ret; - uint8_t checks = spiBusyCheck; - for (int i = 0; i < checks; ++i) - { - ret = spi_device_get_trans_result(dmaHAL, &rtrans, 0); - if (ret == ESP_OK) spiBusyCheck--; - } - - if (spiBusyCheck ==0) return false; - return true; -} - void TFT_eSPI::dmaWait() { if (!DMA_Enabled || !spiBusyCheck) return; @@ -181,47 +164,6 @@ void TFT_eSPI::dmaWait() spiBusyCheck = 0; } -void TFT_eSPI::pushPixelsDMA(uint16_t* image, uint32_t len) -{ - if ((len == 0) || (!DMA_Enabled)) return; - - dmaWait(); - - if(_swapBytes) { - for (uint32_t i = 0; i < len; i++) (image[i] = image[i] << 8 | image[i] >> 8); - } - - esp_err_t ret; - static spi_transaction_t trans; - - memset(&trans, 0, sizeof(spi_transaction_t)); - - trans.user = (void *)1; - trans.tx_buffer = image; //finally send the line data - trans.length = len * 16; //Data length, in bits - trans.flags = 0; //SPI_TRANS_USE_TXDATA flag - - ret = spi_device_queue_trans(dmaHAL, &trans, portMAX_DELAY); - assert(ret == ESP_OK); - - spiBusyCheck++; -} - -extern "C" void dc_callback(); - -void IRAM_ATTR dc_callback(spi_transaction_t *spi_tx) -{ - if ((bool)spi_tx->user) {DC_D;} - else {DC_C;} -} - -extern "C" void dma_end_callback(); - -void IRAM_ATTR dma_end_callback(spi_transaction_t *spi_tx) -{ - WRITE_PERI_REG(SPI_DMA_CONF_REG(spi_host), 0); -} - bool TFT_eSPI::initDMA(bool ctrl_cs) { if (DMA_Enabled) return false; @@ -258,7 +200,7 @@ bool TFT_eSPI::initDMA(bool ctrl_cs) .spics_io_num = pin, .flags = SPI_DEVICE_NO_DUMMY, //0, .queue_size = 1, - .pre_cb = 0, //dc_callback, //Callback to handle D/C line + .pre_cb = 0, .post_cb = 0 }; ret = spi_bus_initialize(spi_host, &buscfg, 1); @@ -358,45 +300,39 @@ inline void TFT_eSPI::end_tft_read() { void TFT_eSPI::setViewport(int32_t x, int32_t y, int32_t w, int32_t h, bool vpDatum) { - // Viewport metrics (not clipped) - _xDatum = x; // Datum x position in screen coordinates - _yDatum = y; // Datum y position in screen coordinates - _xWidth = w; // Viewport width - _yHeight = h; // Viewport height + _xDatum = x; + _yDatum = y; + _xWidth = w; + _yHeight = h; - // Full size default viewport - _vpDatum = false; // Datum is at top left corner of screen (true = top left of viewport) - _vpOoB = false; // Out of Bounds flag (true is all of viewport is off screen) - _vpX = 0; // Viewport top left corner x coordinate - _vpY = 0; // Viewport top left corner y coordinate - _vpW = width(); // Equivalent of TFT width (Nb: viewport right edge coord + 1) - _vpH = height(); // Equivalent of TFT height (Nb: viewport bottom edge coord + 1) + _vpDatum = false; + _vpOoB = false; + _vpX = 0; + _vpY = 0; + _vpW = width(); + _vpH = height(); - // Clip viewport to screen area if (x<0) { w += x; x = 0; } if (y<0) { h += y; y = 0; } if ((x + w) > width() ) { w = width() - x; } if ((y + h) > height() ) { h = height() - y; } - // Check if viewport is entirely out of bounds if (w < 1 || h < 1) { - // Set default values and Out of Bounds flag in case of error _xDatum = 0; _yDatum = 0; _xWidth = width(); _yHeight = height(); - _vpOoB = true; // Set Out of Bounds flag to inhibit all drawing + _vpOoB = true; return; } if (!vpDatum) { - _xDatum = 0; // Reset to top left of screen if not using a viewport datum + _xDatum = 0; _yDatum = 0; _xWidth = width(); _yHeight = height(); } - // Store the clipped screen viewport metrics and datum position _vpX = x; _vpY = y; _vpW = x + w; @@ -404,29 +340,6 @@ void TFT_eSPI::setViewport(int32_t x, int32_t y, int32_t w, int32_t h, bool vpDa _vpDatum = vpDatum; } -bool TFT_eSPI::checkViewport(int32_t x, int32_t y, int32_t w, int32_t h) { - if (_vpOoB) return false; - x+= _xDatum; - y+= _yDatum; - - if ((x >= _vpW) || (y >= _vpH)) return false; - - int32_t dx = 0; - int32_t dy = 0; - int32_t dw = w; - int32_t dh = h; - - if (x < _vpX) { dx = _vpX - x; dw -= dx; x = _vpX; } - if (y < _vpY) { dy = _vpY - y; dh -= dy; y = _vpY; } - - if ((x + dw) > _vpW ) dw = _vpW - x; - if ((y + dh) > _vpH ) dh = _vpH - y; - - if (dw < 1 || dh < 1) return false; - - return true; -} - void TFT_eSPI::setSPISpeed(uint8_t speed) { if(speed > 0 && speed < 80) spi_write_speed = speed; } @@ -438,27 +351,6 @@ void TFT_eSPI::resetViewport() { _vpH = _yHeight = height(); } -bool TFT_eSPI::clipAddrWindow(int32_t *x, int32_t *y, int32_t *w, int32_t *h) -{ - if (_vpOoB) return false; // Area is outside of viewport - - *x+= _xDatum; - *y+= _yDatum; - - if ((*x >= _vpW) || (*y >= _vpH)) return false; // Area is outside of viewport - - // Crop drawing area bounds - if (*x < _vpX) { *w -= _vpX - *x; *x = _vpX; } - if (*y < _vpY) { *h -= _vpY - *y; *y = _vpY; } - - if ((*x + *w) > _vpW ) *w = _vpW - *x; - if ((*y + *h) > _vpH ) *h = _vpH - *y; - - if (*w < 1 || *h < 1) return false; // No area is inside viewport - - return true; // Area is wholly or partially inside viewport -} - bool TFT_eSPI::clipWindow(int32_t *xs, int32_t *ys, int32_t *xe, int32_t *ye) { if (_vpOoB) return false; // Area is outside of viewport @@ -534,12 +426,10 @@ if (TOUCH_CS >= 0) { } #endif -#ifdef TFT_RST if (TFT_RST >= 0) { pinMode(TFT_RST, OUTPUT); digitalWrite(TFT_RST, HIGH); // Set high, do not share pin with another SPI device } -#endif } void TFT_eSPI::init() @@ -579,12 +469,8 @@ void TFT_eSPI::init() } // end of: if just _booted // Toggle RST low to reset -#ifdef TFT_RST - // Set to output once again in case MISO is used for TFT_RST if (TFT_RST >= 0) { pinMode(TFT_RST, OUTPUT); - } - if (TFT_RST >= 0) { writecommand(0x00); // Put SPI bus in known state for TFT with CS tied low digitalWrite(TFT_RST, HIGH); delay(3); @@ -592,10 +478,6 @@ void TFT_eSPI::init() delay(12); digitalWrite(TFT_RST, HIGH); } - else writecommand(TFT_SWRST); // Software reset -#else - writecommand(TFT_SWRST); // Software reset -#endif delay(50); // Wait for reset to complete @@ -603,32 +485,9 @@ void TFT_eSPI::init() #include "ILI9341_Init.h" -#ifdef TFT_INVERSION_ON - writecommand(TFT_INVON); -#endif - -#ifdef TFT_INVERSION_OFF - writecommand(TFT_INVOFF); -#endif - end_tft_write(); setRotation(rotation); - -#if defined (TFT_BL) && defined (TFT_BACKLIGHT_ON) - if (TFT_BL >= 0) { - pinMode(TFT_BL, OUTPUT); - digitalWrite(TFT_BL, TFT_BACKLIGHT_ON); - } -#else - #if defined (TFT_BL) && defined (M5STACK) - // Turn on the back-light LED - if (TFT_BL >= 0) { - pinMode(TFT_BL, OUTPUT); - digitalWrite(TFT_BL, HIGH); - } - #endif -#endif } void TFT_eSPI::setRotation(uint8_t m) { @@ -646,103 +505,33 @@ void TFT_eSPI::setRotation(uint8_t m) { resetViewport(); } -void TFT_eSPI::commandList (const uint8_t *addr) -{ - uint8_t numCommands = pgm_read_byte(addr++), numArgs, ms; - while (numCommands--) { - writecommand(pgm_read_byte(addr++)); // Read, issue command - numArgs = pgm_read_byte(addr++); // Number of args to follow - ms = numArgs & TFT_INIT_DELAY; // If high bit set, delay follows args - numArgs &= ~TFT_INIT_DELAY; // Mask out delay bit - - while (numArgs--) { - writedata(pgm_read_byte(addr++)); // Read, issue argument - } - - if (ms) { - ms = pgm_read_byte(addr++); // Read post-command delay time (ms) - delay( (ms==255 ? 500 : ms) ); - } - } - -} - -void TFT_eSPI::spiwrite(uint8_t c) -{ +void TFT_eSPI::spiwrite(uint8_t c) { begin_tft_write(); tft_Write_8(c); end_tft_write(); } -void TFT_eSPI::writecommand(uint8_t c) -{ +void TFT_eSPI::writecommand(uint8_t c) { begin_tft_write(); DC_C; - tft_Write_8(c); - DC_D; end_tft_write(); } -void TFT_eSPI::writedata(uint8_t d) -{ +void TFT_eSPI::writedata(uint8_t d) { begin_tft_write(); - DC_D; // Play safe, but should already be in data mode - + DC_D; tft_Write_8(d); - - CS_L; // Allow more hold time for low VDI rail + CS_L; end_tft_write(); } -uint8_t TFT_eSPI::readcommand8(uint8_t cmd_function, uint8_t index) -{ - uint8_t reg = 0; - begin_tft_read(); - index = 0x10 + (index & 0x0F); - - DC_C; tft_Write_8(0xD9); - DC_D; tft_Write_8(index); - - CS_H; // Some displays seem to need CS to be pulsed here, or is just a delay needed? - CS_L; - - DC_C; tft_Write_8(cmd_function); - DC_D; - reg = tft_Read_8(); - - end_tft_read(); - return reg; -} - -uint16_t TFT_eSPI::readcommand16(uint8_t cmd_function, uint8_t index) { - uint32_t reg; - - reg = (readcommand8(cmd_function, index + 0) << 8); - reg |= (readcommand8(cmd_function, index + 1) << 0); - - return reg; -} - - -uint32_t TFT_eSPI::readcommand32(uint8_t cmd_function, uint8_t index) { - uint32_t reg; - - reg = ((uint32_t)readcommand8(cmd_function, index + 0) << 24); - reg |= ((uint32_t)readcommand8(cmd_function, index + 1) << 16); - reg |= ((uint32_t)readcommand8(cmd_function, index + 2) << 8); - reg |= ((uint32_t)readcommand8(cmd_function, index + 3) << 0); - - return reg; -} - -uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0) -{ +uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0) { if (_vpOoB) return 0; x0+= _xDatum; @@ -761,10 +550,6 @@ uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0) readAddrWindow(x0, y0, 1, 1); - #ifdef TFT_SDA_READ - begin_SDA_Read(); - #endif - // Dummy read to throw away don't care value tft_Read_8(); @@ -776,10 +561,6 @@ uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0) color = color565(r, g, b); CS_H; - #ifdef TFT_SDA_READ - end_SDA_Read(); - #endif - end_tft_read(); // Reinstate the transaction if one was in progress @@ -788,19 +569,7 @@ uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0) return color; } -void TFT_eSPI::setCallback(getColorCallback getCol) { - getColor = getCol; -} - -void TFT_eSPI::pushRect(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data) -{ - bool swap = _swapBytes; _swapBytes = false; - pushImage(x, y, w, h, data); - _swapBytes = swap; -} - -void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data) -{ +void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data) { PI_CLIP; begin_tft_write(); @@ -824,8 +593,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *d end_tft_write(); } -void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data, uint16_t transp) -{ +void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data, uint16_t transp) { PI_CLIP; begin_tft_write(); @@ -873,9 +641,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *d end_tft_write(); } -void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data) -{ - // Requires 32-bit aligned access, so use PROGMEM 16-bit word functions +void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data) { PI_CLIP; begin_tft_write(); @@ -897,8 +663,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint1 end_tft_write(); } -void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data, uint16_t transp) -{ +void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data, uint16_t transp) { PI_CLIP; begin_tft_write(); @@ -946,12 +711,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint1 end_tft_write(); } -/*************************************************************************************** -** Function name: pushImage -** Description: plot 8-bit or 4-bit or 1 bit image or sprite using a line buffer -***************************************************************************************/ -void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8_t *data, bool bpp8, uint16_t *cmap) -{ +void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8_t *data, bool bpp8, uint16_t *cmap) { PI_CLIP; begin_tft_write(); @@ -1001,21 +761,14 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8 data += w; } _swapBytes = swap; // Restore old value - } - else if (cmap != nullptr) // Must be 4bpp - { + } else if (cmap != nullptr) { _swapBytes = true; w = (w+1) & 0xFFFE; // if this is a sprite, w will already be even; this does no harm. bool splitFirst = (dx & 0x01) != 0; // split first means we have to push a single px from the left of the sprite / image - if (splitFirst) { - data += ((dx - 1 + dy * w) >> 1); - } - else { - data += ((dx + dy * w) >> 1); - } - + if (splitFirst) data += ((dx - 1 + dy * w) >> 1); + else data += ((dx + dy * w) >> 1); while (dh--) { uint32_t len = dw; uint8_t * ptr = (uint8_t*)data; @@ -1048,8 +801,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8 data += (w >> 1); } _swapBytes = swap; // Restore old value - } - else { + } else { _swapBytes = false; uint8_t * ptr = (uint8_t*)data; uint32_t ww = (w+7)>>3; // Width of source image line in bytes @@ -1058,7 +810,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8 for (int32_t xp = dx; xp < dx + dw; xp++) { uint16_t col = (pgm_read_byte(ptr + (xp>>3)) & (0x80 >> (xp & 0x7)) ); if (col) {*linePtr++ = bitmap_fg>>8; *linePtr++ = (uint8_t) bitmap_fg;} - else {*linePtr++ = bitmap_bg>>8; *linePtr++ = (uint8_t) bitmap_bg;} + else {*linePtr++ = bitmap_bg>>8; *linePtr++ = (uint8_t) bitmap_bg;} } ptr += ww; pushPixels(lineBuf, dw); @@ -1080,11 +832,9 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da setWindow(x, y, x + dw - 1, y + dh - 1); // Sets CS low and sent RAMWR - // Line buffer makes plotting faster uint16_t lineBuf[dw]; - if (bpp8) - { + if (bpp8) { _swapBytes = false; uint8_t blue[] = {0, 11, 21, 31}; // blue 2 to 5-bit colour lookup table @@ -1122,20 +872,14 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da data += w; } _swapBytes = swap; // Restore old value - } - else if (cmap != nullptr) // Must be 4bpp - { + } else if (cmap != nullptr) { _swapBytes = true; w = (w+1) & 0xFFFE; // if this is a sprite, w will already be even; this does no harm. bool splitFirst = (dx & 0x01) != 0; // split first means we have to push a single px from the left of the sprite / image - if (splitFirst) { - data += ((dx - 1 + dy * w) >> 1); - } - else { - data += ((dx + dy * w) >> 1); - } + if (splitFirst) data += ((dx - 1 + dy * w) >> 1); + else data += ((dx + dy * w) >> 1); while (dh--) { uint32_t len = dw; @@ -1158,13 +902,10 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da index = ((colors & 0xF0) >> 4) & 0x0F; *linePtr++ = cmap[index]; - if (len--) - { + if (len--) { index = colors & 0x0F; *linePtr++ = cmap[index]; - } else { - break; // nothing to do here - } + } else break; ptr++; } @@ -1173,9 +914,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da data += (w >> 1); } _swapBytes = swap; // Restore old value - } - else // Must be 1bpp - { + } else { _swapBytes = false; uint32_t ww = (w+7)>>3; // Width of source image line in bytes @@ -1186,7 +925,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da { uint16_t col = (data[(xp>>3)] & (0x80 >> (xp & 0x7)) ); if (col) {*linePtr++ = bitmap_fg>>8; *linePtr++ = (uint8_t) bitmap_fg;} - else {*linePtr++ = bitmap_bg>>8; *linePtr++ = (uint8_t) bitmap_bg;} + else {*linePtr++ = bitmap_bg>>8; *linePtr++ = (uint8_t) bitmap_bg;} } data += ww; pushPixels(lineBuf, dw); @@ -1198,11 +937,6 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da end_tft_write(); } - -/*************************************************************************************** -** Function name: pushImage -** Description: plot 8 or 4 or 1 bit image or sprite with a transparent colour -***************************************************************************************/ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *data, uint8_t transp, bool bpp8, uint16_t *cmap) { PI_CLIP; @@ -1271,9 +1005,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da y++; data += w; } - } - else if (cmap != nullptr) // 4bpp with color map - { + } else if (cmap != nullptr) { _swapBytes = true; w = (w+1) & 0xFFFE; // here we try to recreate iwidth from dwidth. @@ -1306,8 +1038,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da len--; } - while (len--) - { + while (len--) { uint8_t color = *ptr; // find the actual color you care about. There will be two pixels here! @@ -1330,8 +1061,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da } px++; - if (len--) - { + if (len--) { index = color & 0x0F; // the odd number is 3 .. 0 if (index != transp) { if (move) { @@ -1339,8 +1069,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da } lineBuf[np] = cmap[index]; np++; - } - else { + } else { move = true; if (np) { setWindow(sx, y, sx + np - 1, y); @@ -1349,10 +1078,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da } } px++; - } - else { - break; // we are done with this row. - } + } else break; ptr++; // we only increment ptr once in the loop (deliberate) } @@ -1364,8 +1090,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da data += (w>>1); y++; } - } - else { // 1 bit per pixel + } else { // 1 bit per pixel _swapBytes = false; uint32_t ww = (w+7)>>3; // Width of source image line in bytes @@ -1404,8 +1129,7 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *da end_tft_write(); } -void TFT_eSPI::setSwapBytes(bool swap) -{ +void TFT_eSPI::setSwapBytes(bool swap) { _swapBytes = swap; } @@ -1413,46 +1137,7 @@ bool TFT_eSPI::getSwapBytes() { return _swapBytes; } -void TFT_eSPI::readRectRGB(int32_t x0, int32_t y0, int32_t w, int32_t h, uint8_t *data) { - begin_tft_read(); - - readAddrWindow(x0, y0, w, h); // Sets CS low - - #ifdef TFT_SDA_READ - begin_SDA_Read(); - #endif - - // Dummy read to throw away don't care value - tft_Read_8(); - - // Read window pixel 24-bit RGB values, buffer must be set in sketch to 3 * w * h - uint32_t len = w * h; - while (len--) { - // Read the 3 RGB bytes, colour is actually only in the top 6 bits of each byte - // as the TFT stores colours as 18 bits - *data++ = tft_Read_8(); - *data++ = tft_Read_8(); - *data++ = tft_Read_8(); - - // The 6 colour bits are in MS 6 bits of each byte, but the ILI9488 needs an extra clock pulse - // so bits appear shifted right 1 bit, so mask the middle 6 bits then shift 1 place left - *data++ = (tft_Read_8()&0x7E)<<1; - *data++ = (tft_Read_8()&0x7E)<<1; - *data++ = (tft_Read_8()&0x7E)<<1; - - } - - CS_H; - - #ifdef TFT_SDA_READ - end_SDA_Read(); - #endif - - end_tft_read(); -} - -void TFT_eSPI::drawCircleHelper( int32_t x0, int32_t y0, int32_t rr, uint8_t cornername, uint32_t color) -{ +void TFT_eSPI::drawCircleHelper( int32_t x0, int32_t y0, int32_t rr, uint8_t cornername, uint32_t color) { if (rr <= 0) return; int32_t f = 1 - rr; int32_t ddF_x = 1; @@ -1461,11 +1146,9 @@ void TFT_eSPI::drawCircleHelper( int32_t x0, int32_t y0, int32_t rr, uint8_t cor int32_t xs = 0; int32_t len = 0; - //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() inTransaction = true; - do - { + do { while (f < 0) { ++xe; f += (ddF_x += 2); @@ -1516,14 +1199,7 @@ void TFT_eSPI::drawCircleHelper( int32_t x0, int32_t y0, int32_t rr, uint8_t cor end_tft_write(); // Does nothing if Sprite class uses this function } -/*************************************************************************************** -** Function name: fillCircle -** Description: draw a filled circle -***************************************************************************************/ -// Optimised midpoint circle algorithm, changed to horizontal lines (faster in sprites) -// Improved algorithm avoids repetition of lines -void TFT_eSPI::fillCircle(int32_t x0, int32_t y0, int32_t r, uint32_t color) -{ +void TFT_eSPI::fillCircle(int32_t x0, int32_t y0, int32_t r, uint32_t color) { int32_t x = 0; int32_t dx = 1; int32_t dy = r+r; @@ -1557,13 +1233,7 @@ void TFT_eSPI::fillCircle(int32_t x0, int32_t y0, int32_t r, uint32_t color) end_tft_write(); // Does nothing if Sprite class uses this function } -/*************************************************************************************** -** Function name: fillCircleHelper -** Description: Support function for fillRoundRect() -***************************************************************************************/ -// Support drawing roundrects, changed to horizontal lines (faster in sprites) -void TFT_eSPI::fillCircleHelper(int32_t x0, int32_t y0, int32_t r, uint8_t cornername, int32_t delta, uint32_t color) -{ +void TFT_eSPI::fillCircleHelper(int32_t x0, int32_t y0, int32_t r, uint8_t cornername, int32_t delta, uint32_t color) { int32_t f = 1 - r; int32_t ddF_x = 1; int32_t ddF_y = -r - r; @@ -1577,25 +1247,19 @@ void TFT_eSPI::fillCircleHelper(int32_t x0, int32_t y0, int32_t r, uint8_t corne if (cornername & 0x2) drawFastHLine(x0 - y, y0 - r, y + y + delta, color); r--; ddF_y += 2; - f += ddF_y; + f += ddF_y; } y++; ddF_x += 2; - f += ddF_x; + f += ddF_x; if (cornername & 0x1) drawFastHLine(x0 - r, y0 + y, r + r + delta, color); if (cornername & 0x2) drawFastHLine(x0 - r, y0 - y, r + r + delta, color); } } - -/*************************************************************************************** -** Function name: drawEllipse -** Description: Draw a ellipse outline -***************************************************************************************/ -void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint16_t color) -{ +void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint16_t color) { if (rx<2) return; if (ry<2) return; int32_t x, y; @@ -1605,7 +1269,6 @@ void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint1 int32_t fy2 = 4 * ry2; int32_t s; - //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() inTransaction = true; for (x = 0, y = ry, s = 2*ry2+rx2*(1-2*ry); ry2*x <= rx2*y; x++) { @@ -1629,8 +1292,7 @@ void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint1 drawPixel(x0 - x, y0 + y, color); drawPixel(x0 - x, y0 - y, color); drawPixel(x0 + x, y0 - y, color); - if (s >= 0) - { + if (s >= 0) { s += fy2 * (1 - x); x--; } @@ -1641,11 +1303,6 @@ void TFT_eSPI::drawEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint1 end_tft_write(); // Does nothing if Sprite class uses this function } - -/*************************************************************************************** -** Function name: fillEllipse -** Description: draw a filled ellipse -***************************************************************************************/ void TFT_eSPI::fillEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint16_t color) { if (rx<2) return; @@ -1657,7 +1314,6 @@ void TFT_eSPI::fillEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint1 int32_t fy2 = 4 * ry2; int32_t s; - //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() inTransaction = true; for (x = 0, y = ry, s = 2*ry2+rx2*(1-2*ry); ry2*x <= rx2*y; x++) { @@ -1687,29 +1343,16 @@ void TFT_eSPI::fillEllipse(int16_t x0, int16_t y0, int32_t rx, int32_t ry, uint1 } -/*************************************************************************************** -** Function name: fillScreen -** Description: Clear the screen to defined colour -***************************************************************************************/ -void TFT_eSPI::fillScreen(uint32_t color) -{ +void TFT_eSPI::fillScreen(uint32_t color) { fillRect(0, 0, _width, _height, color); } - -/*************************************************************************************** -** Function name: drawRect -** Description: Draw a rectangle outline -***************************************************************************************/ -// Draw a rectangle void TFT_eSPI::drawRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color) { - //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() inTransaction = true; drawFastHLine(x, y, w, color); drawFastHLine(x, y + h - 1, w, color); - // Avoid drawing corner pixels twice drawFastVLine(x, y+1, h-2, color); drawFastVLine(x + w - 1, y+1, h-2, color); @@ -1717,12 +1360,6 @@ void TFT_eSPI::drawRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t col end_tft_write(); // Does nothing if Sprite class uses this function } - -/*************************************************************************************** -** Function name: drawRoundRect -** Description: Draw a rounded corner rectangle outline -***************************************************************************************/ -// Draw a rounded rectangle void TFT_eSPI::drawRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t r, uint32_t color) { //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() @@ -1743,12 +1380,6 @@ void TFT_eSPI::drawRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t end_tft_write(); // Does nothing if Sprite class uses this function } - -/*************************************************************************************** -** Function name: fillRoundRect -** Description: Draw a rounded corner filled rectangle -***************************************************************************************/ -// Fill a rounded rectangle, changed to horizontal lines (faster in sprites) void TFT_eSPI::fillRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t r, uint32_t color) { //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() @@ -1846,11 +1477,6 @@ void TFT_eSPI::fillTriangle ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, in end_tft_write(); // Does nothing if Sprite class uses this function } - -/*************************************************************************************** -** Function name: drawBitmap -** Description: Draw an image stored in an array on the TFT -***************************************************************************************/ void TFT_eSPI::drawBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color) { //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() @@ -1860,9 +1486,7 @@ void TFT_eSPI::drawBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w for (j = 0; j < h; j++) { for (i = 0; i < w; i++ ) { - if (pgm_read_byte(bitmap + j * byteWidth + i / 8) & (128 >> (i & 7))) { - drawPixel(x + i, y + j, color); - } + if (pgm_read_byte(bitmap + j * byteWidth + i / 8) & (128 >> (i & 7))) drawPixel(x + i, y + j, color); } } @@ -1889,53 +1513,12 @@ void TFT_eSPI::drawBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w end_tft_write(); // Does nothing if Sprite class uses this function } -void TFT_eSPI::drawXBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color) -{ - //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() - inTransaction = true; - - int32_t i, j, byteWidth = (w + 7) / 8; - - for (j = 0; j < h; j++) { - for (i = 0; i < w; i++ ) { - if (pgm_read_byte(bitmap + j * byteWidth + i / 8) & (1 << (i & 7))) { - drawPixel(x + i, y + j, color); - } - } - } - - inTransaction = lockTransaction; - end_tft_write(); // Does nothing if Sprite class uses this function -} - - -void TFT_eSPI::drawXBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color, uint16_t bgcolor) -{ - //begin_tft_write(); // Sprite class can use this function, avoiding begin_tft_write() - inTransaction = true; - - int32_t i, j, byteWidth = (w + 7) / 8; - - for (j = 0; j < h; j++) { - for (i = 0; i < w; i++ ) { - if (pgm_read_byte(bitmap + j * byteWidth + i / 8) & (1 << (i & 7))) - drawPixel(x + i, y + j, color); - else drawPixel(x + i, y + j, bgcolor); - } - } - - inTransaction = lockTransaction; - end_tft_write(); // Does nothing if Sprite class uses this function -} - -void TFT_eSPI::setCursor(int16_t x, int16_t y) -{ +void TFT_eSPI::setCursor(int16_t x, int16_t y) { cursor_x = x; cursor_y = y; } -void TFT_eSPI::setCursor(int16_t x, int16_t y, uint8_t font) -{ +void TFT_eSPI::setCursor(int16_t x, int16_t y, uint8_t font) { setTextFont(font); cursor_x = x; cursor_y = y; @@ -1949,8 +1532,6 @@ void TFT_eSPI::setTextSize(uint8_t s) void TFT_eSPI::setTextColor(uint16_t c) { - // For 'transparent' background, we'll set the bg - // to the same as fg instead of using a flag textcolor = textbgcolor = c; } @@ -2655,15 +2236,7 @@ void TFT_eSPI::fillSmoothRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, i end_tft_write(); } -// Coordinates are floating point to achieve sub-pixel positioning -void TFT_eSPI::drawSpot(float ax, float ay, float r, uint32_t fg_color, uint32_t bg_color) -{ - // Filled circle can be created by the wide line function with zero line length - drawWedgeLine( ax, ay, ax, ay, r, r, fg_color, bg_color); -} - -void TFT_eSPI::drawWedgeLine(float ax, float ay, float bx, float by, float ar, float br, uint32_t fg_color, uint32_t bg_color) -{ +void TFT_eSPI::drawWedgeLine(float ax, float ay, float bx, float by, float ar, float br, uint32_t fg_color, uint32_t bg_color) { if ( (ar < 0.0) || (br < 0.0) )return; if ( (fabsf(ax - bx) < 0.01f) && (fabsf(ay - by) < 0.01f) ) bx += 0.01f; // Avoid divide by zero @@ -2747,15 +2320,13 @@ void TFT_eSPI::drawWedgeLine(float ax, float ay, float bx, float by, float ar, f end_nin_write(); } -inline float TFT_eSPI::wedgeLineDistance(float xpax, float ypay, float bax, float bay, float dr) -{ +inline float TFT_eSPI::wedgeLineDistance(float xpax, float ypay, float bax, float bay, float dr) { float h = fmaxf(fminf((xpax * bax + ypay * bay) / (bax * bax + bay * bay), 1.0f), 0.0f); float dx = xpax - bax * h, dy = ypay - bay * h; return sqrtf(dx * dx + dy * dy) + h * dr; } -void TFT_eSPI::drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color) -{ +void TFT_eSPI::drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color) { if (_vpOoB) return; x+= _xDatum; @@ -2779,8 +2350,7 @@ void TFT_eSPI::drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color) end_tft_write(); } -void TFT_eSPI::drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color) -{ +void TFT_eSPI::drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color) { if (_vpOoB) return; x+= _xDatum; @@ -2878,8 +2448,7 @@ uint16_t TFT_eSPI::decodeUTF8(uint8_t c) { return c; // fall-back to extended ASCII } -uint16_t TFT_eSPI::decodeUTF8(uint8_t *buf, uint16_t *index, uint16_t remaining) -{ +uint16_t TFT_eSPI::decodeUTF8(uint8_t *buf, uint16_t *index, uint16_t remaining) { uint16_t c = buf[(*index)++]; if ((c & 0x80) == 0x00) return c; @@ -2895,8 +2464,7 @@ uint16_t TFT_eSPI::decodeUTF8(uint8_t *buf, uint16_t *index, uint16_t remaining) return c; // fall-back to extended ASCII } -uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc) -{ +uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc) { // Split out and blend 5-bit red and blue channels uint32_t rxb = bgc & 0xF81F; rxb += ((fgc & 0xF81F) - rxb) * (alpha >> 2) >> 6; @@ -2907,8 +2475,7 @@ uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc) return (rxb & 0xF81F) | (xgx & 0x07E0); } -uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither) -{ +uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither) { if (dither) { int16_t alphaDither = (int16_t)alpha - dither + random(2*dither+1); // +/-4 randomised alpha = (uint8_t)alphaDither; @@ -2919,31 +2486,11 @@ uint16_t TFT_eSPI::alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t return alphaBlend(alpha, fgc, bgc); } -uint32_t TFT_eSPI::alphaBlend24(uint8_t alpha, uint32_t fgc, uint32_t bgc, uint8_t dither) -{ - - if (dither) { - int16_t alphaDither = (int16_t)alpha - dither + random(2*dither+1); // +/-dither randomised - alpha = (uint8_t)alphaDither; - if (alphaDither < 0) alpha = 0; - if (alphaDither >255) alpha = 255; - } - - uint32_t rxx = bgc & 0xFF0000; - rxx += ((fgc & 0xFF0000) - rxx) * alpha >> 8; - uint32_t xgx = bgc & 0x00FF00; - xgx += ((fgc & 0x00FF00) - xgx) * alpha >> 8; - uint32_t xxb = bgc & 0x0000FF; - xxb += ((fgc & 0x0000FF) - xxb) * alpha >> 8; - return (rxx & 0xFF0000) | (xgx & 0x00FF00) | (xxb & 0x0000FF); -} - int16_t TFT_eSPI::drawChar(uint16_t uniCode, int32_t x, int32_t y) { return drawChar(uniCode, x, y, textfont); } -int16_t TFT_eSPI::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t font) -{ +int16_t TFT_eSPI::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t font) { if (_vpOoB || !uniCode) return 0; if (font == 1) return 0; @@ -2975,16 +2522,14 @@ int16_t TFT_eSPI::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t font) return width * textsize; } -int16_t TFT_eSPI::drawString(const String& string, int32_t poX, int32_t poY) -{ +int16_t TFT_eSPI::drawString(const String& string, int32_t poX, int32_t poY) { int16_t len = string.length() + 2; char buffer[len]; string.toCharArray(buffer, len); return drawString(buffer, poX, poY, textfont); } -int16_t TFT_eSPI::drawString(const String& string, int32_t poX, int32_t poY, uint8_t font) -{ +int16_t TFT_eSPI::drawString(const String& string, int32_t poX, int32_t poY, uint8_t font) { int16_t len = string.length() + 2; char buffer[len]; string.toCharArray(buffer, len); @@ -3097,24 +2642,21 @@ int16_t TFT_eSPI::drawString(const char *string, int32_t poX, int32_t poY, uint8 return sumX; } -int16_t TFT_eSPI::drawNumber(long long_num, int32_t poX, int32_t poY) -{ +int16_t TFT_eSPI::drawNumber(long long_num, int32_t poX, int32_t poY) { isDigits = true; // Eliminate jiggle in monospaced fonts char str[12]; ltoa(long_num, str, 10); return drawString(str, poX, poY, textfont); } -int16_t TFT_eSPI::drawNumber(long long_num, int32_t poX, int32_t poY, uint8_t font) -{ +int16_t TFT_eSPI::drawNumber(long long_num, int32_t poX, int32_t poY, uint8_t font) { isDigits = true; // Eliminate jiggle in monospaced fonts char str[12]; ltoa(long_num, str, 10); return drawString(str, poX, poY, font); } -int16_t TFT_eSPI::drawFloat(float floatNumber, uint8_t dp, int32_t poX, int32_t poY) -{ +int16_t TFT_eSPI::drawFloat(float floatNumber, uint8_t dp, int32_t poX, int32_t poY) { return drawFloat(floatNumber, dp, poX, poY, textfont); } @@ -3177,16 +2719,10 @@ int16_t TFT_eSPI::drawFloat(float floatNumber, uint8_t dp, int32_t poX, int32_t return drawString(str, poX, poY, font); } -void TFT_eSPI::setTextFont(uint8_t f) -{ +void TFT_eSPI::setTextFont(uint8_t f) { textfont = (f > 7) ? 1 : f; // Don't allow font > 7 } -SPIClass& TFT_eSPI::getSPIinstance() -{ - return spi; -} - void TFT_eSPI::loadFont(const uint8_t array[], uint8_t font) { if (array == nullptr) return; @@ -3402,10 +2938,7 @@ void TFT_eSPI::drawGlyph(uint16_t code, uint16_t font) // Could be negative if (fillheight > 0) fillRect(bg_cursor_x, cursor_y, fillwidth, fillheight, textbgcolor); } - else { - // Could be negative - fillwidth = 0; - } + else fillwidth = 0; // Fill any area to left of glyph if (bg_cursor_x < cx) fillRect(bg_cursor_x, cy, cx - bg_cursor_x, gHeight[font][gNum], textbgcolor); diff --git a/lib/TFT_eSPI/TFT_eSPI.h b/lib/TFT_eSPI/TFT_eSPI.h index e523ee8..acf1db3 100644 --- a/lib/TFT_eSPI/TFT_eSPI.h +++ b/lib/TFT_eSPI/TFT_eSPI.h @@ -3,7 +3,6 @@ #define TFT_ESPI_VERSION "2.5.43" #include -#include #include #include @@ -187,9 +186,7 @@ class TFT_eSPI { friend class TFT_eSprite; void invertDisplay(bool i); void setAddrWindow(int32_t xs, int32_t ys, int32_t w, int32_t h); void setViewport(int32_t x, int32_t y, int32_t w, int32_t h, bool vpDatum = true); - bool checkViewport(int32_t x, int32_t y, int32_t w, int32_t h); void resetViewport(); - bool clipAddrWindow(int32_t* x, int32_t* y, int32_t* w, int32_t* h); bool clipWindow(int32_t* xs, int32_t* ys, int32_t* xe, int32_t* ye); void pushColor(uint16_t color, uint32_t len); void pushColors(uint16_t *data, uint32_t len, bool swap = true); @@ -211,17 +208,13 @@ class TFT_eSPI { friend class TFT_eSprite; void fillSmoothCircle(int32_t x, int32_t y, int32_t r, uint32_t color, uint32_t bg_color = 0x00FFFFFF); void drawSmoothRoundRect(int32_t x, int32_t y, int32_t r, int32_t ir, int32_t w, int32_t h, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF, uint8_t quadrants = 0xF); void fillSmoothRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t radius, uint32_t color, uint32_t bg_color = 0x00FFFFFF); - void drawSpot(float ax, float ay, float r, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF); void drawWedgeLine(float ax, float ay, float bx, float by, float aw, float bw, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF); void setSwapBytes(bool swap); bool getSwapBytes(); void drawBitmap( int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t fgcolor), drawBitmap( int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t fgcolor, uint16_t bgcolor), - drawXBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t fgcolor), - drawXBitmap(int16_t x, int16_t y, const uint8_t *bitmap, int16_t w, int16_t h, uint16_t fgcolor, uint16_t bgcolor), setBitmapColor(uint16_t fgcolor, uint16_t bgcolor); void setPivot(int16_t x, int16_t y); - void pushRect(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data); void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data); void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *data, uint16_t transparent); void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data, uint16_t transparent); @@ -229,8 +222,6 @@ class TFT_eSPI { friend class TFT_eSprite; void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *data, bool bpp8 = true, uint16_t *cmap = nullptr); void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *data, uint8_t transparent, bool bpp8 = true, uint16_t *cmap = nullptr); void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8_t *data, bool bpp8, uint16_t *cmap = nullptr); - void readRectRGB(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t *data); - // Text rendering - value returned is the pixel width of the rendered text int16_t drawNumber(long intNumber, int32_t x, int32_t y, uint8_t font), // Draw integer using specified font number @@ -249,8 +240,8 @@ class TFT_eSPI { friend class TFT_eSprite; drawString(const String& string, int32_t x, int32_t y); // Draw string using current font // Text rendering and font handling support functions - void setCursor(int16_t x, int16_t y), // Set cursor for tft.print() - setCursor(int16_t x, int16_t y, uint8_t font); // Set cursor and font number for tft.print() + void setCursor(int16_t x, int16_t y), + setCursor(int16_t x, int16_t y, uint8_t font); void setTextColor(uint16_t color), // Set character (glyph) color only (background not over-written) setTextColor(uint16_t fgcolor, uint16_t bgcolor, bool bgfill = false), // Set character (glyph) foreground and background colour, optional background fill for smooth fonts @@ -274,20 +265,10 @@ class TFT_eSPI { friend class TFT_eSprite; uint16_t decodeUTF8(uint8_t *buf, uint16_t *index, uint16_t remaining), decodeUTF8(uint8_t c); - // Used by Smooth font class to fetch a pixel colour for the anti-aliasing - void setCallback(getColorCallback getCol); - void spiwrite(uint8_t); // legacy support only void writecommand(uint8_t c); // Send an 8-bit command, function resets DC/RS high ready for data void writedata(uint8_t d); // Send data with DC/RS set high - void commandList(const uint8_t *addr); // Send a initialisation sequence to TFT stored in FLASH - - uint8_t readcommand8( uint8_t cmd_function, uint8_t index = 0); // read 8 bits from TFT - uint16_t readcommand16(uint8_t cmd_function, uint8_t index = 0); // read 16 bits from TFT - uint32_t readcommand32(uint8_t cmd_function, uint8_t index = 0); // read 32 bits from TFT - - // Colour conversion // Convert 8-bit red, green and blue to 16 bits uint16_t color565(uint8_t red, uint8_t green, uint8_t blue); @@ -299,15 +280,8 @@ class TFT_eSPI { friend class TFT_eSprite; // 16-bit colour alphaBlend with alpha dither (dither reduces colour banding) uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither); - // 24-bit colour alphaBlend with optional alpha dither - uint32_t alphaBlend24(uint8_t alpha, uint32_t fgc, uint32_t bgc, uint8_t dither = 0); bool initDMA(bool ctrl_cs = false); // Initialise the DMA engine and attach to SPI bus - typically used in setup() - // Push a block of pixels into a window set up using setAddrWindow() - void pushPixelsDMA(uint16_t* image, uint32_t len); - - // Check if the DMA is complete - use while(tft.dmaBusy); for a blocking wait - bool dmaBusy(); // returns true if DMA is still in progress void dmaWait(); // wait until DMA is complete bool DMA_Enabled = false; // Flag for DMA enabled state @@ -319,7 +293,6 @@ class TFT_eSPI { friend class TFT_eSprite; void endWrite(); // End SPI transaction // Global variables - static SPIClass& getSPIinstance(); // Get SPI class handle uint32_t textcolor, textbgcolor; // Text foreground and background colours uint32_t bitmap_fg, bitmap_bg; // Bitmap foreground (bit=1) and background (bit=0) colours diff --git a/lib/TFT_eSPI/User_Setup_Select.h b/lib/TFT_eSPI/User_Setup_Select.h index 5cf3acb..eede178 100644 --- a/lib/TFT_eSPI/User_Setup_Select.h +++ b/lib/TFT_eSPI/User_Setup_Select.h @@ -9,31 +9,7 @@ #define SPI_READ_FREQUENCY 20000000 #define SPI_TOUCH_FREQUENCY 2500000 -#define TFT_BGR 0 // Colour order Blue-Green-Red -#define TFT_RGB 1 // Colour order Red-Green-Blue - #define TFT_WIDTH 240 #define TFT_HEIGHT 320 #include -#define TFT_DRIVER 0x9341 - -#define PIN_D0 16 // GPIO16 WAKE -#define PIN_D1 5 // GPIO5 User purpose -#define PIN_D2 4 // GPIO4 User purpose -#define PIN_D3 0 // GPIO0 Low on boot means enter FLASH mode -#define PIN_D4 2 // GPIO2 TXD1 (must be high on boot to go to UART0 FLASH mode) -#define PIN_D5 14 // GPIO14 HSCLK -#define PIN_D6 12 // GPIO12 HMISO -#define PIN_D7 13 // GPIO13 HMOSI RXD2 -#define PIN_D8 15 // GPIO15 HCS TXD0 (must be low on boot to enter UART0 FLASH mode) -#define PIN_D9 3 // RXD0 -#define PIN_D10 1 // TXD0 - -#define PIN_MOSI 8 // SD1 -#define PIN_MISO 7 // SD0 -#define PIN_SCLK 6 // CLK -#define PIN_HWCS 0 // D3 - -#define PIN_D11 9 // SD2 -#define PIN_D12 10 // SD4 diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp index 4a1a72b..8f20a0b 100644 --- a/src/TEF6686.cpp +++ b/src/TEF6686.cpp @@ -1104,13 +1104,13 @@ void TEF6686::readRDS(byte showrdserrors) { memset(rt_buffer, 0x20, 64); rt_buffer[64] = '\0'; - memset(segments_received, 3, sizeof(segments_received)); + memset(segments_received, 99, sizeof(segments_received)); rtABold = rds.rtAB; } uint8_t segment_address = (rds.rdsB & 0xf); - if(segments_received[segment_address] > (rds.rdsCerror + rds.rdsBerror)) { + if(segments_received[segment_address] >= (rds.rdsCerror + rds.rdsBerror)) { segments_received[segment_address] = rds.rdsCerror + rds.rdsBerror; uint8_t offset = segment_address * 4; @@ -1625,7 +1625,7 @@ void TEF6686::clearRDS(bool fullsearchrds) { rds.aid_counter = af_number = 0; afmethodBprobe = afmethodBtrigger = _hasEnhancedRT = false; rds.ps12error = rds.ps34error = rds.ps56error = rds.ps78error = true; - memset(segments_received, 3, sizeof(segments_received)); + memset(segments_received, 99, sizeof(segments_received)); } void TEF6686::tone(uint16_t time, int16_t amplitude, uint16_t frequency) { diff --git a/src/main.cpp b/src/main.cpp index 256db6f..609f84e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1393,19 +1393,9 @@ void setup() { rtc.setTime(0); if(rx_rtc_avail) { - bool reset = rx_rtc.initModule(); // initModule, not initAdapter, adapter also reinits wire - if(reset) { - RX8010SJ::DateTime defaulttime = RX8010SJ::DateTime(); - defaulttime.second = 0; - defaulttime.minute = 0; - defaulttime.hour = 0; - defaulttime.dayOfWeek = 2; - defaulttime.dayOfMonth = 14; - defaulttime.month = 1; - defaulttime.year = 26; - rx_rtc.writeDateTime(defaulttime); - console.print("RX8010SJ was reset, no time"); - } else { + bool reset = init_rtc(); + if(reset) console.print("RX8010SJ was reset, no time"); + else { rtcset = true; console.print("RX8010SJ is used as a time source"); sync_from_rx_rtc(); diff --git a/src/rtc.cpp b/src/rtc.cpp index 87fbdf1..dc9c110 100644 --- a/src/rtc.cpp +++ b/src/rtc.cpp @@ -1,45 +1,114 @@ #include "rtc.hpp" +// the hardware rtc driver was made with the support of Wh1teRabbitHU's implementation + bool rtcset; bool NTPupdated; ESP32Time rtc(0); bool rx_rtc_avail = false; -RX8010SJ::Adapter rx_rtc = RX8010SJ::Adapter(RX8010SJ_ADDRESS); -void timeToDateTime(time_t t, struct RX8010SJ::DateTime* dateTime) { - struct tm* timeinfo = gmtime(&t); - dateTime->second = timeinfo->tm_sec; - dateTime->minute = timeinfo->tm_min; - dateTime->hour = timeinfo->tm_hour; - dateTime->dayOfWeek = (timeinfo->tm_wday + 6) % 7; - dateTime->dayOfMonth = timeinfo->tm_mday; - dateTime->month = timeinfo->tm_mon + 1; - dateTime->year = (timeinfo->tm_year + 1900) % 100; +byte readFromModule(byte address) { + Wire.beginTransmission(RX8010SJ_ADDRESS); + Wire.write(address); + Wire.endTransmission(); + Wire.requestFrom(RX8010SJ_ADDRESS, 1); + if (Wire.available()) return Wire.read(); + return -1; } -time_t dateTimeToTime(const struct RX8010SJ::DateTime* dateTime) { - struct tm timeinfo; - timeinfo.tm_sec = dateTime->second; - timeinfo.tm_min = dateTime->minute; - timeinfo.tm_hour = dateTime->hour; - timeinfo.tm_mday = dateTime->dayOfMonth; - timeinfo.tm_mon = dateTime->month - 1; - timeinfo.tm_year = dateTime->year + 100; - timeinfo.tm_isdst = 0; - return mktime(&timeinfo); +inline void writeToModule(byte address, byte data) { + Wire.beginTransmission(RX8010SJ_ADDRESS); + Wire.write(address); + Wire.write(data); + Wire.endTransmission(); +} + +inline byte toBCD(byte val) { + return ((val / 10) << 4) | (val % 10); +} + +inline byte sumValueFromBinary(byte binary, byte length) { + byte sum = 0; + + for (byte i = 0; i < length; i++) { + byte value; + + if (i < 4 ) value = 1 << i; + else value = 10 * (1 << (i - 4)); + + sum += ((binary >> i) & 1) == 1 ? value : 0; + } + + return sum; +} + +bool init_rtc() { + rtc.setTime(0); + byte flagregister = readFromModule(0x1E); + if((flagregister >> 1) & 1) { + while((flagregister >> 1) & 1) { + writeToModule(0x1E, 0); // clear VLF + flagregister = readFromModule(0x1E); + } + writeToModule(0x17, 216); // Reserved register + writeToModule(0x1F, 0); // Control register + writeToModule(0x31, 8); // Reserved register + writeToModule(0x32, 0); // IRQ control register + + Wire.beginTransmission(RX8010SJ_ADDRESS); + Wire.write(0x10); + Wire.write(0); + Wire.write(0); + Wire.write(toBCD(12)); + Wire.write(1 << 2); + Wire.write(toBCD(14)); + Wire.write(1); + Wire.write(toBCD(26)); + Wire.endTransmission(); + return true; + } + return false; } void sync_from_rx_rtc(int32_t offset) { if(!rx_rtc_avail) return; - RX8010SJ::DateTime dateTime = rx_rtc.readDateTime(); - rtc.setTime(dateTimeToTime(&dateTime) + offset); + struct tm timeinfo; + + Wire.beginTransmission(RX8010SJ_ADDRESS); + Wire.write(0x10); + Wire.endTransmission(); + Wire.requestFrom(RX8010SJ_ADDRESS, 7); + if (Wire.available()) { + timeinfo.tm_sec = sumValueFromBinary(Wire.read(), 7); + timeinfo.tm_min = sumValueFromBinary(Wire.read(), 7); + timeinfo.tm_hour = sumValueFromBinary(Wire.read(), 6); + + auto dayOfWeekBin = Wire.read(); + for (int i = 0; i < 7; i++) { + if (dayOfWeekBin & (1u << i)) timeinfo.tm_wday += i; + } + + timeinfo.tm_mday = sumValueFromBinary(Wire.read(), 6); + timeinfo.tm_mon = sumValueFromBinary(Wire.read(), 5) - 1; + timeinfo.tm_year = sumValueFromBinary(Wire.read(), 8) + 100; + + rtc.setTime(mktime(&timeinfo) + offset); + } } void set_time(time_t time) { rtc.setTime(time); if(!rx_rtc_avail) return; - RX8010SJ::DateTime rx_currenttime = RX8010SJ::DateTime(); - timeToDateTime(time, &rx_currenttime); - rx_rtc.writeDateTime(rx_currenttime); + struct tm* timeinfo = gmtime(&time); + Wire.beginTransmission(RX8010SJ_ADDRESS); + Wire.write(0x10); + Wire.write(toBCD(timeinfo->tm_sec)); + Wire.write(toBCD(timeinfo->tm_min)); + Wire.write(toBCD(timeinfo->tm_hour)); + Wire.write(1 << timeinfo->tm_wday); + Wire.write(toBCD(timeinfo->tm_mday)); + Wire.write(toBCD(timeinfo->tm_mon + 1)); + Wire.write(toBCD((1900 + timeinfo->tm_year) % 100)); + Wire.endTransmission(); } \ No newline at end of file