diff --git a/Devices/lilygo-tlora-pager/Source/devices/SdCard.cpp b/Devices/lilygo-tlora-pager/Source/devices/SdCard.cpp index 7ce5e8857..eb8f48e9c 100644 --- a/Devices/lilygo-tlora-pager/Source/devices/SdCard.cpp +++ b/Devices/lilygo-tlora-pager/Source/devices/SdCard.cpp @@ -9,6 +9,7 @@ using tt::hal::sdcard::SpiSdCardDevice; constexpr auto TPAGER_SDCARD_PIN_CS = GPIO_NUM_21; constexpr auto TPAGER_LCD_PIN_CS = GPIO_NUM_38; constexpr auto TPAGER_RADIO_PIN_CS = GPIO_NUM_36; +constexpr auto TPAGER_NFC_PIN_CS = GPIO_NUM_39; std::shared_ptr createTpagerSdCard() { auto configuration = std::make_unique( @@ -20,7 +21,8 @@ std::shared_ptr createTpagerSdCard() { tt::lvgl::getSyncLock(), std::vector { TPAGER_RADIO_PIN_CS, - TPAGER_LCD_PIN_CS + TPAGER_LCD_PIN_CS, + TPAGER_NFC_PIN_CS } ); diff --git a/Modules/hal-device-module/README.md b/Modules/hal-device-module/README.md index 183590a8d..5814a0e74 100644 --- a/Modules/hal-device-module/README.md +++ b/Modules/hal-device-module/README.md @@ -1,3 +1,5 @@ +# hal-device-module + **WARNING: This module contains deprecated code** This module is the basis for the old Tactility HAL. @@ -5,4 +7,4 @@ This HAL existed before TactilityKernel. The C++ `tt::hal::Device` class is replaced by `struct Device` from TactilityKernel. -License: Apache v2.0 \ No newline at end of file +License: [Apache v2.0](LICENSE-Apache-2.0.md) diff --git a/Modules/lvgl-module/LICENSE-Apache-2.0.md b/Modules/lvgl-module/LICENSE-Apache-2.0.md new file mode 100644 index 000000000..f5f4b8b5e --- /dev/null +++ b/Modules/lvgl-module/LICENSE-Apache-2.0.md @@ -0,0 +1,195 @@ +Apache License +============== + +_Version 2.0, January 2004_ +_<>_ + +### Terms and Conditions for use, reproduction, and distribution + +#### 1. Definitions + +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +#### 2. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +#### 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +#### 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +* **(a)** You must give any other recipients of the Work or Derivative Works a copy of +this License; and +* **(b)** You must cause any modified files to carry prominent notices stating that You +changed the files; and +* **(c)** You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +#### 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +#### 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +#### 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +#### 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +#### 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +_END OF TERMS AND CONDITIONS_ + +### APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets `[]` replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same “printed page” as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/Modules/lvgl-module/LICENSE-GPL-3.0.md b/Modules/lvgl-module/LICENSE-GPL-3.0.md deleted file mode 100644 index 496acdb2a..000000000 --- a/Modules/lvgl-module/LICENSE-GPL-3.0.md +++ /dev/null @@ -1,675 +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 . diff --git a/Modules/lvgl-module/README.md b/Modules/lvgl-module/README.md index 183590a8d..121062d4e 100644 --- a/Modules/lvgl-module/README.md +++ b/Modules/lvgl-module/README.md @@ -1,8 +1,42 @@ -**WARNING: This module contains deprecated code** +# lvgl-module -This module is the basis for the old Tactility HAL. -This HAL existed before TactilityKernel. +This module manages the lifecycle of the [LVGL](https://lvgl.io/) library within the Tactility ecosystem. -The C++ `tt::hal::Device` class is replaced by `struct Device` from TactilityKernel. +## What the library does -License: Apache v2.0 \ No newline at end of file +The `lvgl-module` provides: +- **Lifecycle Management**: Handles initialization and termination of the LVGL library. +- **Task Management**: Manages the LVGL main loop task. +- **Thread-Safety**: Provides mutex-based locking mechanisms (`lvgl_lock`, `lvgl_unlock`) to ensure safe access to LVGL APIs from multiple tasks. +- **Font Access**: Provides a unified interface to access pre-configured text and icon fonts. + +## Different types of fonts + +The module supports two main categories of fonts: + +### Text Fonts + +Standard text rendering uses the **Montserrat** font. Three sizes are pre-configured: +- `FONT_SIZE_SMALL` +- `FONT_SIZE_DEFAULT` +- `FONT_SIZE_LARGE` + +### Icon Fonts + +Icons are provided by the **Material Symbols** font, divided into three usage-specific sets: +- **Statusbar Icons**: Optimized for the system status bar. +- **Launcher Icons**: Sized for application launchers. +- **Shared Icons**: General purpose icons used across the system. + +## How to update the fonts + +Font sizes and symbols are configurable: + +- **On ESP32 (IDF)**: Sizes can be updated via `menuconfig` or by editing `sdkconfig`. Look for `CONFIG_TT_LVGL_FONT_SIZE_*` and `CONFIG_TT_LVGL_*_ICON_SIZE` parameters. +- **On Simulator/POSIX**: Default sizes are defined in `Modules/lvgl-module/CMakeLists.txt`. + +If you change an icon font size, ensure that a corresponding C file exists in `source-fonts/` (e.g., `material_symbols_shared_24.c`). These files are generated from TTF/OTF fonts using the LVGL font converter. + +## License + +This module is licensed under the [Apache v2.0](LICENSE-Apache-2.0.md) license. \ No newline at end of file diff --git a/Modules/lvgl-module/assets/generate-all.py b/Modules/lvgl-module/assets/generate-all.py index d24403972..483a55c50 100644 --- a/Modules/lvgl-module/assets/generate-all.py +++ b/Modules/lvgl-module/assets/generate-all.py @@ -43,7 +43,8 @@ def generate_icon_fonts(font_file, font_sizes, symbols, output): for size in font_sizes: generate(2, size, font_file, symbols, output) -def generate_icon_names(codepoint_map: dict, codepoint_names: list, filename: str): +def generate_icon_names(codepoint_map: dict, codepoint_names: list, variable_name: str): + filename = f"lvgl_icon_{variable_name}.h" print(f"Generating {filename}") output_path = os.path.join("..", "include", "tactility", filename) with open(output_path, 'w') as f: @@ -58,12 +59,13 @@ def generate_icon_names(codepoint_map: dict, codepoint_names: list, filename: st utf8_bytes = chr(val).encode('utf-8') escaped_str = "".join(f"\\x{b:02X}" for b in utf8_bytes) - f.write(f'#define LVGL_SYMBOL_{safe_name.upper()} "{escaped_str}"\n') + f.write(f'#define LVGL_ICON_{variable_name.upper()}_{safe_name.upper()} "{escaped_str}"\n') else: print(f"Warning: {safe_name} not found in codepoint map") # --------------- Symbol Fonts --------------- +# Get more from https://fonts.google.com/icons?icon.set=Material+Symbols&icon.style=Rounded shared_symbol_code_point_names = [ "add", "apps", @@ -109,6 +111,7 @@ def generate_icon_names(codepoint_map: dict, codepoint_names: list, filename: st "wifi", # WiFi (settings) app ] +# Get more from https://fonts.google.com/icons?icon.set=Material+Symbols&icon.style=Rounded statusbar_symbol_code_point_names = [ # Location tracking "location_on", @@ -138,6 +141,7 @@ def generate_icon_names(codepoint_map: dict, codepoint_names: list, filename: st "battery_android_frame_bolt" ] +# Get more from https://fonts.google.com/icons?icon.set=Material+Symbols&icon.style=Rounded launcher_symbol_code_point_names = [ "apps", "folder", @@ -188,15 +192,15 @@ def generate_icon_names(codepoint_map: dict, codepoint_names: list, filename: st # Shared symbols shared_symbol_code_points = get_code_points(codepoints_map, shared_symbol_code_point_names) generate_icon_fonts(ttf_filename, shared_symbol_sizes, shared_symbol_code_points, "material_symbols_shared") -generate_icon_names(codepoints_map, shared_symbol_code_point_names, "lvgl_symbols_shared.h") +generate_icon_names(codepoints_map, shared_symbol_code_point_names, "shared") # Statusbar symbols statusbar_symbol_code_points = get_code_points(codepoints_map, statusbar_symbol_code_point_names) generate_icon_fonts(ttf_filename, statusbar_symbol_sizes, statusbar_symbol_code_points, "material_symbols_statusbar") -generate_icon_names(codepoints_map, statusbar_symbol_code_point_names, "lvgl_symbols_statusbar.h") +generate_icon_names(codepoints_map, statusbar_symbol_code_point_names, "statusbar") # Launcher symbols launcher_symbol_code_points = get_code_points(codepoints_map, launcher_symbol_code_point_names) generate_icon_fonts(ttf_filename, launcher_symbol_sizes, launcher_symbol_code_points, "material_symbols_launcher") -generate_icon_names(codepoints_map, launcher_symbol_code_point_names, "lvgl_symbols_launcher.h") +generate_icon_names(codepoints_map, launcher_symbol_code_point_names, "launcher") diff --git a/Modules/lvgl-module/include/tactility/lvgl_fonts.h b/Modules/lvgl-module/include/tactility/lvgl_fonts.h index 44ea3b139..2420235bf 100644 --- a/Modules/lvgl-module/include/tactility/lvgl_fonts.h +++ b/Modules/lvgl-module/include/tactility/lvgl_fonts.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 #pragma once #include diff --git a/Modules/lvgl-module/include/tactility/lvgl_icon_launcher.h b/Modules/lvgl-module/include/tactility/lvgl_icon_launcher.h new file mode 100644 index 000000000..000f4abd4 --- /dev/null +++ b/Modules/lvgl-module/include/tactility/lvgl_icon_launcher.h @@ -0,0 +1,5 @@ +#pragma once + +#define LVGL_ICON_LAUNCHER_APPS "\xEE\x97\x83" +#define LVGL_ICON_LAUNCHER_FOLDER "\xEE\x8B\x87" +#define LVGL_ICON_LAUNCHER_SETTINGS "\xEE\xA2\xB8" diff --git a/Modules/lvgl-module/include/tactility/lvgl_icon_shared.h b/Modules/lvgl-module/include/tactility/lvgl_icon_shared.h new file mode 100644 index 000000000..41dd1bf9f --- /dev/null +++ b/Modules/lvgl-module/include/tactility/lvgl_icon_shared.h @@ -0,0 +1,44 @@ +#pragma once + +#define LVGL_ICON_SHARED_ADD "\xEE\x85\x85" +#define LVGL_ICON_SHARED_APPS "\xEE\x97\x83" +#define LVGL_ICON_SHARED_AREA_CHART "\xEE\x9D\xB0" +#define LVGL_ICON_SHARED_APP_REGISTRATION "\xEE\xBD\x80" +#define LVGL_ICON_SHARED_CALENDAR_MONTH "\xEE\xAF\x8C" +#define LVGL_ICON_SHARED_CABLE "\xEE\xBF\xA6" +#define LVGL_ICON_SHARED_CIRCLE "\xEE\xBD\x8A" +#define LVGL_ICON_SHARED_CLOSE "\xEE\x97\x8D" +#define LVGL_ICON_SHARED_CLOUD "\xEF\x85\x9C" +#define LVGL_ICON_SHARED_CHECK "\xEE\x97\x8A" +#define LVGL_ICON_SHARED_DELETE "\xEE\xA4\xAE" +#define LVGL_ICON_SHARED_DEVICES "\xEE\x8C\xA6" +#define LVGL_ICON_SHARED_DISPLAY_SETTINGS "\xEE\xAE\x97" +#define LVGL_ICON_SHARED_EDIT_NOTE "\xEE\x9D\x85" +#define LVGL_ICON_SHARED_ELECTRIC_BOLT "\xEE\xB0\x9C" +#define LVGL_ICON_SHARED_FOLDER "\xEE\x8B\x87" +#define LVGL_ICON_SHARED_DEPLOYED_CODE "\xEF\x9C\xA0" +#define LVGL_ICON_SHARED_DOWNLOAD "\xEF\x82\x90" +#define LVGL_ICON_SHARED_FORUM "\xEE\xA2\xAF" +#define LVGL_ICON_SHARED_GAMEPAD "\xEE\x8C\x8F" +#define LVGL_ICON_SHARED_HELP "\xEE\xA3\xBD" +#define LVGL_ICON_SHARED_HUB "\xEE\xA7\xB4" +#define LVGL_ICON_SHARED_IMAGE "\xEE\x8F\xB4" +#define LVGL_ICON_SHARED_KEYBOARD_ARROW_UP "\xEE\x8C\x96" +#define LVGL_ICON_SHARED_LIGHTBULB "\xEE\xA4\x8F" +#define LVGL_ICON_SHARED_LANGUAGE "\xEE\xA2\x94" +#define LVGL_ICON_SHARED_LISTS "\xEE\xA6\xB9" +#define LVGL_ICON_SHARED_MAIL "\xEE\x85\x99" +#define LVGL_ICON_SHARED_MENU "\xEE\x97\x92" +#define LVGL_ICON_SHARED_MOP "\xEE\x8A\x8D" +#define LVGL_ICON_SHARED_MORE_VERT "\xEE\x97\x94" +#define LVGL_ICON_SHARED_MUSIC_NOTE "\xEE\x90\x85" +#define LVGL_ICON_SHARED_NOTE_ADD "\xEE\xA2\x9C" +#define LVGL_ICON_SHARED_POWER_SETTINGS_NEW "\xEF\xA3\x87" +#define LVGL_ICON_SHARED_REFRESH "\xEE\x97\x95" +#define LVGL_ICON_SHARED_SEARCH "\xEE\xA2\xB6" +#define LVGL_ICON_SHARED_SETTINGS "\xEE\xA2\xB8" +#define LVGL_ICON_SHARED_TOOLBAR "\xEE\xA7\xB7" +#define LVGL_ICON_SHARED_NAVIGATION "\xEE\x95\x9D" +#define LVGL_ICON_SHARED_KEYBOARD_ALT "\xEF\x80\xA8" +#define LVGL_ICON_SHARED_USB "\xEE\x87\xA0" +#define LVGL_ICON_SHARED_WIFI "\xEE\x98\xBE" diff --git a/Modules/lvgl-module/include/tactility/lvgl_icon_statusbar.h b/Modules/lvgl-module/include/tactility/lvgl_icon_statusbar.h new file mode 100644 index 000000000..bf82eedfc --- /dev/null +++ b/Modules/lvgl-module/include/tactility/lvgl_icon_statusbar.h @@ -0,0 +1,22 @@ +#pragma once + +#define LVGL_ICON_STATUSBAR_LOCATION_ON "\xEF\x87\x9B" +#define LVGL_ICON_STATUSBAR_CLOUD "\xEF\x85\x9C" +#define LVGL_ICON_STATUSBAR_MEMORY "\xEE\x8C\xA2" +#define LVGL_ICON_STATUSBAR_SD_CARD "\xEE\x98\xA3" +#define LVGL_ICON_STATUSBAR_SD_CARD_ALERT "\xEF\x81\x97" +#define LVGL_ICON_STATUSBAR_SIGNAL_WIFI_0_BAR "\xEF\x82\xB0" +#define LVGL_ICON_STATUSBAR_NETWORK_WIFI_1_BAR "\xEE\xAF\xA4" +#define LVGL_ICON_STATUSBAR_NETWORK_WIFI_2_BAR "\xEE\xAF\x96" +#define LVGL_ICON_STATUSBAR_NETWORK_WIFI_3_BAR "\xEE\xAF\xA1" +#define LVGL_ICON_STATUSBAR_SIGNAL_WIFI_4_BAR "\xEF\x81\xA5" +#define LVGL_ICON_STATUSBAR_SIGNAL_WIFI_OFF "\xEE\x87\x9A" +#define LVGL_ICON_STATUSBAR_SIGNAL_WIFI_BAD "\xEF\x81\xA4" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_1 "\xEF\x89\x97" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_2 "\xEF\x89\x96" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_3 "\xEF\x89\x95" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_4 "\xEF\x89\x94" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_5 "\xEF\x89\x93" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_6 "\xEF\x89\x92" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_FULL "\xEF\x89\x8F" +#define LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_BOLT "\xEF\x89\x90" diff --git a/Modules/lvgl-module/include/tactility/lvgl_module.h b/Modules/lvgl-module/include/tactility/lvgl_module.h index 381aaa52f..62e631e50 100644 --- a/Modules/lvgl-module/include/tactility/lvgl_module.h +++ b/Modules/lvgl-module/include/tactility/lvgl_module.h @@ -72,7 +72,7 @@ bool lvgl_lock(void); * @param timeout Timeout in ticks * @return true if the lock was acquired, false otherwise. */ -bool lvgl_try_lock_timed(uint32_t timeout); +bool lvgl_try_lock(uint32_t timeout); /** * @brief Unlocks the LVGL mutex. diff --git a/Modules/lvgl-module/include/tactility/lvgl_symbols_launcher.h b/Modules/lvgl-module/include/tactility/lvgl_symbols_launcher.h deleted file mode 100644 index 686ac2c2a..000000000 --- a/Modules/lvgl-module/include/tactility/lvgl_symbols_launcher.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define LVGL_SYMBOL_APPS "\xEE\x97\x83" -#define LVGL_SYMBOL_FOLDER "\xEE\x8B\x87" -#define LVGL_SYMBOL_SETTINGS "\xEE\xA2\xB8" diff --git a/Modules/lvgl-module/include/tactility/lvgl_symbols_shared.h b/Modules/lvgl-module/include/tactility/lvgl_symbols_shared.h deleted file mode 100644 index cac48dfc7..000000000 --- a/Modules/lvgl-module/include/tactility/lvgl_symbols_shared.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -#define LVGL_SYMBOL_ADD "\xEE\x85\x85" -#define LVGL_SYMBOL_APPS "\xEE\x97\x83" -#define LVGL_SYMBOL_AREA_CHART "\xEE\x9D\xB0" -#define LVGL_SYMBOL_APP_REGISTRATION "\xEE\xBD\x80" -#define LVGL_SYMBOL_CALENDAR_MONTH "\xEE\xAF\x8C" -#define LVGL_SYMBOL_CABLE "\xEE\xBF\xA6" -#define LVGL_SYMBOL_CIRCLE "\xEE\xBD\x8A" -#define LVGL_SYMBOL_CLOSE "\xEE\x97\x8D" -#define LVGL_SYMBOL_CLOUD "\xEF\x85\x9C" -#define LVGL_SYMBOL_CHECK "\xEE\x97\x8A" -#define LVGL_SYMBOL_DELETE "\xEE\xA4\xAE" -#define LVGL_SYMBOL_DEVICES "\xEE\x8C\xA6" -#define LVGL_SYMBOL_DISPLAY_SETTINGS "\xEE\xAE\x97" -#define LVGL_SYMBOL_EDIT_NOTE "\xEE\x9D\x85" -#define LVGL_SYMBOL_ELECTRIC_BOLT "\xEE\xB0\x9C" -#define LVGL_SYMBOL_FOLDER "\xEE\x8B\x87" -#define LVGL_SYMBOL_DEPLOYED_CODE "\xEF\x9C\xA0" -#define LVGL_SYMBOL_DOWNLOAD "\xEF\x82\x90" -#define LVGL_SYMBOL_FORUM "\xEE\xA2\xAF" -#define LVGL_SYMBOL_GAMEPAD "\xEE\x8C\x8F" -#define LVGL_SYMBOL_HELP "\xEE\xA3\xBD" -#define LVGL_SYMBOL_HUB "\xEE\xA7\xB4" -#define LVGL_SYMBOL_IMAGE "\xEE\x8F\xB4" -#define LVGL_SYMBOL_KEYBOARD_ARROW_UP "\xEE\x8C\x96" -#define LVGL_SYMBOL_LIGHTBULB "\xEE\xA4\x8F" -#define LVGL_SYMBOL_LANGUAGE "\xEE\xA2\x94" -#define LVGL_SYMBOL_LISTS "\xEE\xA6\xB9" -#define LVGL_SYMBOL_MAIL "\xEE\x85\x99" -#define LVGL_SYMBOL_MENU "\xEE\x97\x92" -#define LVGL_SYMBOL_MOP "\xEE\x8A\x8D" -#define LVGL_SYMBOL_MORE_VERT "\xEE\x97\x94" -#define LVGL_SYMBOL_MUSIC_NOTE "\xEE\x90\x85" -#define LVGL_SYMBOL_NOTE_ADD "\xEE\xA2\x9C" -#define LVGL_SYMBOL_POWER_SETTINGS_NEW "\xEF\xA3\x87" -#define LVGL_SYMBOL_REFRESH "\xEE\x97\x95" -#define LVGL_SYMBOL_SEARCH "\xEE\xA2\xB6" -#define LVGL_SYMBOL_SETTINGS "\xEE\xA2\xB8" -#define LVGL_SYMBOL_TOOLBAR "\xEE\xA7\xB7" -#define LVGL_SYMBOL_NAVIGATION "\xEE\x95\x9D" -#define LVGL_SYMBOL_KEYBOARD_ALT "\xEF\x80\xA8" -#define LVGL_SYMBOL_USB "\xEE\x87\xA0" -#define LVGL_SYMBOL_WIFI "\xEE\x98\xBE" diff --git a/Modules/lvgl-module/include/tactility/lvgl_symbols_statusbar.h b/Modules/lvgl-module/include/tactility/lvgl_symbols_statusbar.h deleted file mode 100644 index e1c40cef6..000000000 --- a/Modules/lvgl-module/include/tactility/lvgl_symbols_statusbar.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#define LVGL_SYMBOL_LOCATION_ON "\xEF\x87\x9B" -#define LVGL_SYMBOL_CLOUD "\xEF\x85\x9C" -#define LVGL_SYMBOL_MEMORY "\xEE\x8C\xA2" -#define LVGL_SYMBOL_SD_CARD "\xEE\x98\xA3" -#define LVGL_SYMBOL_SD_CARD_ALERT "\xEF\x81\x97" -#define LVGL_SYMBOL_SIGNAL_WIFI_0_BAR "\xEF\x82\xB0" -#define LVGL_SYMBOL_NETWORK_WIFI_1_BAR "\xEE\xAF\xA4" -#define LVGL_SYMBOL_NETWORK_WIFI_2_BAR "\xEE\xAF\x96" -#define LVGL_SYMBOL_NETWORK_WIFI_3_BAR "\xEE\xAF\xA1" -#define LVGL_SYMBOL_SIGNAL_WIFI_4_BAR "\xEF\x81\xA5" -#define LVGL_SYMBOL_SIGNAL_WIFI_OFF "\xEE\x87\x9A" -#define LVGL_SYMBOL_SIGNAL_WIFI_BAD "\xEF\x81\xA4" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_1 "\xEF\x89\x97" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_2 "\xEF\x89\x96" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_3 "\xEF\x89\x95" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_4 "\xEF\x89\x94" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_5 "\xEF\x89\x93" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_6 "\xEF\x89\x92" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_FULL "\xEF\x89\x8F" -#define LVGL_SYMBOL_BATTERY_ANDROID_FRAME_BOLT "\xEF\x89\x90" diff --git a/Modules/lvgl-module/source/arch/lvgl_esp32.c b/Modules/lvgl-module/source/arch/lvgl_esp32.c index 231564b09..dd2b93d9e 100644 --- a/Modules/lvgl-module/source/arch/lvgl_esp32.c +++ b/Modules/lvgl-module/source/arch/lvgl_esp32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0-only +// SPDX-License-Identifier: Apache-2.0 #ifdef ESP_PLATFORM #include @@ -16,7 +16,7 @@ bool lvgl_lock(void) { return lvgl_port_lock(portMAX_DELAY); } -bool lvgl_try_lock_timed(uint32_t timeout) { +bool lvgl_try_lock(uint32_t timeout) { if (!initialized) return true; // We allow (fake) locking because it's safe to do so as LVGL is not running yet return lvgl_port_lock(millis_to_ticks(timeout)); } diff --git a/Modules/lvgl-module/source/arch/lvgl_posix.c b/Modules/lvgl-module/source/arch/lvgl_posix.c index b9ebe268d..0efcbb6f3 100644 --- a/Modules/lvgl-module/source/arch/lvgl_posix.c +++ b/Modules/lvgl-module/source/arch/lvgl_posix.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0-only +// SPDX-License-Identifier: Apache-2.0 #ifndef ESP_PLATFORM #include @@ -43,7 +43,7 @@ bool lvgl_lock(void) { return true; } -bool lvgl_try_lock_timed(uint32_t timeout) { +bool lvgl_try_lock(uint32_t timeout) { if (!lvgl_mutex_initialised) return false; return recursive_mutex_try_lock(&lvgl_mutex, millis_to_ticks(timeout)); } @@ -75,7 +75,7 @@ static void lvgl_task(void* arg) { if (lvgl_module_config.on_start) lvgl_module_config.on_start(); while (!lvgl_task_is_interrupt_requested()) { - if (lvgl_try_lock_timed(10)) { + if (lvgl_try_lock(10)) { task_delay_ms = lv_timer_handler(); lvgl_unlock(); } diff --git a/Modules/lvgl-module/source/lvgl_fonts.c b/Modules/lvgl-module/source/lvgl_fonts.c index 184c6fda0..aab972111 100644 --- a/Modules/lvgl-module/source/lvgl_fonts.c +++ b/Modules/lvgl-module/source/lvgl_fonts.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 #include #include #include diff --git a/Modules/lvgl-module/source/module.c b/Modules/lvgl-module/source/module.c index b8bcd9c7c..6dce36944 100644 --- a/Modules/lvgl-module/source/module.c +++ b/Modules/lvgl-module/source/module.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0-only +// SPDX-License-Identifier: Apache-2.0 #include #include #include diff --git a/Modules/lvgl-module/source/symbols.c b/Modules/lvgl-module/source/symbols.c index 69de48df9..b542d0c96 100644 --- a/Modules/lvgl-module/source/symbols.c +++ b/Modules/lvgl-module/source/symbols.c @@ -1,7 +1,25 @@ -#include +// SPDX-License-Identifier: Apache-2.0 +#include +#include + #include +#include const struct ModuleSymbol lvgl_module_symbols[] = { + // lvgl_module + DEFINE_MODULE_SYMBOL(lvgl_lock), + DEFINE_MODULE_SYMBOL(lvgl_try_lock), + DEFINE_MODULE_SYMBOL(lvgl_unlock), + DEFINE_MODULE_SYMBOL(lvgl_is_running), + // lvgl_fonts + DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font), + DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font_height), + DEFINE_MODULE_SYMBOL(lvgl_get_text_font), + DEFINE_MODULE_SYMBOL(lvgl_get_text_font_height), + DEFINE_MODULE_SYMBOL(lvgl_get_launcher_icon_font), + DEFINE_MODULE_SYMBOL(lvgl_get_launcher_icon_font_height), + DEFINE_MODULE_SYMBOL(lvgl_get_statusbar_icon_font), + DEFINE_MODULE_SYMBOL(lvgl_get_statusbar_icon_font_height), // lv_event DEFINE_MODULE_SYMBOL(lv_event_get_code), DEFINE_MODULE_SYMBOL(lv_event_get_indev), diff --git a/Tactility/Source/app/addgps/AddGps.cpp b/Tactility/Source/app/addgps/AddGps.cpp index 783e97855..d1f1cf6a2 100644 --- a/Tactility/Source/app/addgps/AddGps.cpp +++ b/Tactility/Source/app/addgps/AddGps.cpp @@ -10,7 +10,7 @@ #include "tactility/drivers/uart_controller.h" #include #include -#include +#include namespace tt::app::addgps { @@ -194,7 +194,7 @@ class AddGpsApp final : public App { extern const AppManifest manifest = { .appId = "AddGps", .appName = "Add GPS", - .appIcon = LVGL_SYMBOL_NAVIGATION, + .appIcon = LVGL_ICON_SHARED_NAVIGATION, .appCategory = Category::System, .appFlags = AppManifest::Flags::Hidden, .createApp = create diff --git a/Tactility/Source/app/apphub/AppHubApp.cpp b/Tactility/Source/app/apphub/AppHubApp.cpp index f151986d8..bc7cf9193 100644 --- a/Tactility/Source/app/apphub/AppHubApp.cpp +++ b/Tactility/Source/app/apphub/AppHubApp.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -179,7 +179,7 @@ class AppHubApp final : public App { extern const AppManifest manifest = { .appId = "AppHub", .appName = "App Hub", - .appIcon = LVGL_SYMBOL_HUB, + .appIcon = LVGL_ICON_SHARED_HUB, .appCategory = Category::System, .createApp = create, }; diff --git a/Tactility/Source/app/applist/AppList.cpp b/Tactility/Source/app/applist/AppList.cpp index dda699cab..bdc35ff2b 100644 --- a/Tactility/Source/app/applist/AppList.cpp +++ b/Tactility/Source/app/applist/AppList.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include namespace tt::app::applist { @@ -18,7 +18,7 @@ class AppListApp final : public App { } static void createAppWidget(const std::shared_ptr& manifest, lv_obj_t* list) { - const void* icon = !manifest->appIcon.empty() ? manifest->appIcon.c_str() : LVGL_SYMBOL_TOOLBAR; + const void* icon = !manifest->appIcon.empty() ? manifest->appIcon.c_str() : LVGL_ICON_SHARED_TOOLBAR; lv_obj_t* btn = lv_list_add_button(list, icon, manifest->appName.c_str()); lv_obj_t* image = lv_obj_get_child(btn, 0); lv_obj_set_style_text_font(image, lvgl_get_shared_icon_font(), LV_PART_MAIN); diff --git a/Tactility/Source/app/appsettings/AppSettings.cpp b/Tactility/Source/app/appsettings/AppSettings.cpp index c34441b4a..8a4210d9d 100644 --- a/Tactility/Source/app/appsettings/AppSettings.cpp +++ b/Tactility/Source/app/appsettings/AppSettings.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -19,7 +19,7 @@ class AppSettingsApp final : public App { } static void createAppWidget(const std::shared_ptr& manifest, lv_obj_t* list) { - const void* icon = !manifest->appIcon.empty() ? manifest->appIcon.c_str() : LVGL_SYMBOL_TOOLBAR; + const void* icon = !manifest->appIcon.empty() ? manifest->appIcon.c_str() : LVGL_ICON_SHARED_TOOLBAR; lv_obj_t* btn = lv_list_add_button(list, icon, manifest->appName.c_str()); lv_obj_t* image = lv_obj_get_child(btn, 0); lv_obj_set_style_text_font(image, lvgl_get_shared_icon_font(), LV_PART_MAIN); @@ -62,7 +62,7 @@ class AppSettingsApp final : public App { extern const AppManifest manifest = { .appId = "AppSettings", .appName = "Apps", - .appIcon = LVGL_SYMBOL_APPS, + .appIcon = LVGL_ICON_SHARED_APPS, .appCategory = Category::Settings, .createApp = create, }; diff --git a/Tactility/Source/app/chat/ChatApp.cpp b/Tactility/Source/app/chat/ChatApp.cpp index 25a3d0f77..28ecbfd17 100644 --- a/Tactility/Source/app/chat/ChatApp.cpp +++ b/Tactility/Source/app/chat/ChatApp.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include namespace tt::app::chat { @@ -181,7 +181,7 @@ void ChatApp::switchChannel(const std::string& chatChannel) { extern const AppManifest manifest = { .appId = "Chat", .appName = "Chat", - .appIcon = LVGL_SYMBOL_FORUM, + .appIcon = LVGL_ICON_SHARED_FORUM, .createApp = create }; diff --git a/Tactility/Source/app/development/Development.cpp b/Tactility/Source/app/development/Development.cpp index 21b9c71bd..fa6701c14 100644 --- a/Tactility/Source/app/development/Development.cpp +++ b/Tactility/Source/app/development/Development.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include @@ -165,7 +165,7 @@ class DevelopmentApp final : public App { extern const AppManifest manifest = { .appId = "Development", .appName = "Development", - .appIcon = LVGL_SYMBOL_DEVICES, + .appIcon = LVGL_ICON_SHARED_DEVICES, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/display/Display.cpp b/Tactility/Source/app/display/Display.cpp index 9476913ff..0e9a95070 100644 --- a/Tactility/Source/app/display/Display.cpp +++ b/Tactility/Source/app/display/Display.cpp @@ -1,6 +1,6 @@ #include -#include +#include #ifdef ESP_PLATFORM #include @@ -306,7 +306,7 @@ class DisplayApp final : public App { extern const AppManifest manifest = { .appId = "Display", .appName = "Display", - .appIcon = LVGL_SYMBOL_DISPLAY_SETTINGS, + .appIcon = LVGL_ICON_SHARED_DISPLAY_SETTINGS, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/gpssettings/GpsSettings.cpp b/Tactility/Source/app/gpssettings/GpsSettings.cpp index 396acbdc3..9c3e7d8e6 100644 --- a/Tactility/Source/app/gpssettings/GpsSettings.cpp +++ b/Tactility/Source/app/gpssettings/GpsSettings.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include @@ -455,7 +455,7 @@ class GpsSettingsApp final : public App { extern const AppManifest manifest = { .appId = "GpsSettings", .appName = "GPS", - .appIcon = LVGL_SYMBOL_NAVIGATION, + .appIcon = LVGL_ICON_SHARED_NAVIGATION, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/i2cscanner/I2cScanner.cpp b/Tactility/Source/app/i2cscanner/I2cScanner.cpp index 52d0d92ec..a9664388e 100644 --- a/Tactility/Source/app/i2cscanner/I2cScanner.cpp +++ b/Tactility/Source/app/i2cscanner/I2cScanner.cpp @@ -15,7 +15,7 @@ #include -#include +#include namespace tt::app::i2cscanner { @@ -411,7 +411,7 @@ void I2cScannerApp::onScanTimerFinished() { extern const AppManifest manifest = { .appId = "I2cScanner", .appName = "I2C Scanner", - .appIcon = LVGL_SYMBOL_SEARCH, + .appIcon = LVGL_ICON_SHARED_SEARCH, .appCategory = Category::System, .createApp = create }; diff --git a/Tactility/Source/app/keyboard/KeyboardSettings.cpp b/Tactility/Source/app/keyboard/KeyboardSettings.cpp index a343a89be..3e6223d23 100644 --- a/Tactility/Source/app/keyboard/KeyboardSettings.cpp +++ b/Tactility/Source/app/keyboard/KeyboardSettings.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include @@ -183,7 +183,7 @@ class KeyboardSettingsApp final : public App { extern const AppManifest manifest = { .appId = "KeyboardSettings", .appName = "Keyboard", - .appIcon = LVGL_SYMBOL_KEYBOARD_ALT, + .appIcon = LVGL_ICON_SHARED_KEYBOARD_ALT, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/launcher/Launcher.cpp b/Tactility/Source/app/launcher/Launcher.cpp index 81ef95e98..3b6cc8d25 100644 --- a/Tactility/Source/app/launcher/Launcher.cpp +++ b/Tactility/Source/app/launcher/Launcher.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include namespace tt::app::launcher { @@ -151,9 +151,9 @@ class LauncherApp final : public App { margin = std::min(available_height / 16, total_button_size / 2); } - createAppButton(buttons_wrapper, ui_density, LVGL_SYMBOL_APPS, "AppList", margin, is_landscape_display); - createAppButton(buttons_wrapper, ui_density, LVGL_SYMBOL_FOLDER, "Files", margin, is_landscape_display); - createAppButton(buttons_wrapper, ui_density, LVGL_SYMBOL_SETTINGS, "Settings", margin, is_landscape_display); + createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_APPS, "AppList", margin, is_landscape_display); + createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_FOLDER, "Files", margin, is_landscape_display); + createAppButton(buttons_wrapper, ui_density, LVGL_ICON_LAUNCHER_SETTINGS, "Settings", margin, is_landscape_display); if (shouldShowPowerButton()) { auto* power_button = lv_btn_create(parent); diff --git a/Tactility/Source/app/localesettings/LocaleSettings.cpp b/Tactility/Source/app/localesettings/LocaleSettings.cpp index 6edd0de9d..f9523d00f 100644 --- a/Tactility/Source/app/localesettings/LocaleSettings.cpp +++ b/Tactility/Source/app/localesettings/LocaleSettings.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include @@ -160,7 +160,7 @@ class LocaleSettingsApp final : public App { extern const AppManifest manifest = { .appId = "LocaleSettings", .appName = "Region & Language", - .appIcon = LVGL_SYMBOL_LANGUAGE, + .appIcon = LVGL_ICON_SHARED_LANGUAGE, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/notes/Notes.cpp b/Tactility/Source/app/notes/Notes.cpp index 217ec7c1d..7cd56571a 100644 --- a/Tactility/Source/app/notes/Notes.cpp +++ b/Tactility/Source/app/notes/Notes.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include namespace tt::app::notes { @@ -209,7 +209,7 @@ class NotesApp final : public App { extern const AppManifest manifest = { .appId = "Notes", .appName = "Notes", - .appIcon = LVGL_SYMBOL_EDIT_NOTE, + .appIcon = LVGL_ICON_SHARED_EDIT_NOTE, .createApp = create }; diff --git a/Tactility/Source/app/power/Power.cpp b/Tactility/Source/app/power/Power.cpp index a08135535..6d7065097 100644 --- a/Tactility/Source/app/power/Power.cpp +++ b/Tactility/Source/app/power/Power.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include @@ -192,7 +192,7 @@ class PowerApp : public App { extern const AppManifest manifest = { .appId = "Power", .appName = "Power", - .appIcon = LVGL_SYMBOL_ELECTRIC_BOLT, + .appIcon = LVGL_ICON_SHARED_ELECTRIC_BOLT, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/screenshot/Screenshot.cpp b/Tactility/Source/app/screenshot/Screenshot.cpp index 8593d898a..8394b80da 100644 --- a/Tactility/Source/app/screenshot/Screenshot.cpp +++ b/Tactility/Source/app/screenshot/Screenshot.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include namespace tt::app::screenshot { @@ -285,7 +285,7 @@ void ScreenshotApp::onShow(AppContext& appContext, lv_obj_t* parent) { extern const AppManifest manifest = { .appId = "Screenshot", .appName = "Screenshot", - .appIcon = LVGL_SYMBOL_IMAGE, + .appIcon = LVGL_ICON_SHARED_IMAGE, .appCategory = Category::System, .createApp = create }; diff --git a/Tactility/Source/app/settings/Settings.cpp b/Tactility/Source/app/settings/Settings.cpp index d174fb2e8..f641195f4 100644 --- a/Tactility/Source/app/settings/Settings.cpp +++ b/Tactility/Source/app/settings/Settings.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include @@ -20,7 +20,7 @@ static void onAppPressed(lv_event_t* e) { static void createWidget(const std::shared_ptr& manifest, void* parent) { check(parent); auto* list = static_cast(parent); - const void* icon = !manifest->appIcon.empty() ? manifest->appIcon.c_str() : LVGL_SYMBOL_TOOLBAR; + const void* icon = !manifest->appIcon.empty() ? manifest->appIcon.c_str() : LVGL_ICON_SHARED_TOOLBAR; auto* btn = lv_list_add_button(list, icon, manifest->appName.c_str()); lv_obj_t* image = lv_obj_get_child(btn, 0); lv_obj_set_style_text_font(image, lvgl_get_shared_icon_font(), LV_PART_MAIN); @@ -52,7 +52,7 @@ class SettingsApp final : public App { extern const AppManifest manifest = { .appId = "Settings", .appName = "Settings", - .appIcon = LVGL_SYMBOL_SETTINGS, + .appIcon = LVGL_ICON_SHARED_SETTINGS, .appCategory = Category::System, .appFlags = AppManifest::Flags::Hidden, .createApp = create diff --git a/Tactility/Source/app/systeminfo/SystemInfo.cpp b/Tactility/Source/app/systeminfo/SystemInfo.cpp index 76bf93d66..c42cece2e 100644 --- a/Tactility/Source/app/systeminfo/SystemInfo.cpp +++ b/Tactility/Source/app/systeminfo/SystemInfo.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include @@ -700,7 +700,7 @@ class SystemInfoApp final : public App { extern const AppManifest manifest = { .appId = "SystemInfo", .appName = "System Info", - .appIcon = LVGL_SYMBOL_AREA_CHART, + .appIcon = LVGL_ICON_SHARED_AREA_CHART, .appCategory = Category::System, .createApp = create }; diff --git a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp index b9d520358..bbf87fb01 100644 --- a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp +++ b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp @@ -10,7 +10,7 @@ #include -#include +#include namespace tt::app::timedatesettings { @@ -155,7 +155,7 @@ class TimeDateSettingsApp final : public App { extern const AppManifest manifest = { .appId = "TimeDateSettings", .appName = "Time & Date", - .appIcon = LVGL_SYMBOL_CALENDAR_MONTH, + .appIcon = LVGL_ICON_SHARED_CALENDAR_MONTH, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/timezone/TimeZone.cpp b/Tactility/Source/app/timezone/TimeZone.cpp index c015eb203..77a351706 100644 --- a/Tactility/Source/app/timezone/TimeZone.cpp +++ b/Tactility/Source/app/timezone/TimeZone.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -205,7 +205,7 @@ class TimeZoneApp final : public App { lv_obj_set_style_image_recolor_opa(icon, 255, 0); lv_obj_set_style_image_recolor(icon, lv_theme_get_color_primary(parent), 0); lv_obj_set_style_text_font(icon, lvgl_get_shared_icon_font(), LV_STATE_DEFAULT); - lv_image_set_src(icon, LVGL_SYMBOL_SEARCH); + lv_image_set_src(icon, LVGL_ICON_SHARED_SEARCH); auto* textarea = lv_textarea_create(search_wrapper); lv_textarea_set_placeholder_text(textarea, "e.g. Europe/Amsterdam"); diff --git a/Tactility/Source/app/trackball/TrackballSettings.cpp b/Tactility/Source/app/trackball/TrackballSettings.cpp index f2a93a6c4..477fed7e6 100644 --- a/Tactility/Source/app/trackball/TrackballSettings.cpp +++ b/Tactility/Source/app/trackball/TrackballSettings.cpp @@ -7,7 +7,7 @@ #include -#include +#include // Forward declare driver functions namespace trackball { @@ -210,7 +210,7 @@ class TrackballSettingsApp final : public App { extern const AppManifest manifest = { .appId = "TrackballSettings", .appName = "Trackball", - .appIcon = LVGL_SYMBOL_CIRCLE, + .appIcon = LVGL_ICON_SHARED_CIRCLE, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/usbsettings/UsbSettings.cpp b/Tactility/Source/app/usbsettings/UsbSettings.cpp index c16109b35..ae8aacfbb 100644 --- a/Tactility/Source/app/usbsettings/UsbSettings.cpp +++ b/Tactility/Source/app/usbsettings/UsbSettings.cpp @@ -5,7 +5,7 @@ #include -#include +#include #define TAG "usb_settings" @@ -62,7 +62,7 @@ class UsbSettingsApp : public App { extern const AppManifest manifest = { .appId = "UsbSettings", .appName = "USB", - .appIcon = LVGL_SYMBOL_USB, + .appIcon = LVGL_ICON_SHARED_USB, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/app/webserversettings/WebServerSettings.cpp b/Tactility/Source/app/webserversettings/WebServerSettings.cpp index fda795543..f2acdaf8f 100644 --- a/Tactility/Source/app/webserversettings/WebServerSettings.cpp +++ b/Tactility/Source/app/webserversettings/WebServerSettings.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -418,7 +418,7 @@ class WebServerSettingsApp final : public App { extern const AppManifest manifest = { .appId = "WebServerSettings", .appName = "Web Server", - .appIcon = LVGL_SYMBOL_CLOUD, + .appIcon = LVGL_ICON_SHARED_CLOUD, .appCategory = Category::System, .createApp = create }; diff --git a/Tactility/Source/app/wifimanage/WifiManage.cpp b/Tactility/Source/app/wifimanage/WifiManage.cpp index a890fbf12..d70593b72 100644 --- a/Tactility/Source/app/wifimanage/WifiManage.cpp +++ b/Tactility/Source/app/wifimanage/WifiManage.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include namespace tt::app::wifimanage { @@ -144,7 +144,7 @@ void WifiManage::onHide(AppContext& app) { extern const AppManifest manifest = { .appId = "WifiManage", .appName = "Wi-Fi", - .appIcon = LVGL_SYMBOL_WIFI, + .appIcon = LVGL_ICON_SHARED_WIFI, .appCategory = Category::Settings, .createApp = create }; diff --git a/Tactility/Source/lvgl/LvglSync.cpp b/Tactility/Source/lvgl/LvglSync.cpp index 9d6f4fc5f..e28ac4f70 100644 --- a/Tactility/Source/lvgl/LvglSync.cpp +++ b/Tactility/Source/lvgl/LvglSync.cpp @@ -6,7 +6,7 @@ namespace tt::lvgl { bool lock(TickType_t timeout) { - return lvgl_try_lock_timed(timeout); + return lvgl_try_lock(timeout); } void unlock() { @@ -18,7 +18,7 @@ class LvglSync : public Lock { ~LvglSync() override = default; bool lock(TickType_t timeoutTicks) const override { - return lvgl_try_lock_timed(timeoutTicks); + return lvgl_try_lock(timeoutTicks); } void unlock() const override { diff --git a/Tactility/Source/service/memorychecker/MemoryCheckerService.cpp b/Tactility/Source/service/memorychecker/MemoryCheckerService.cpp index 7c3708a2c..d017520b1 100644 --- a/Tactility/Source/service/memorychecker/MemoryCheckerService.cpp +++ b/Tactility/Source/service/memorychecker/MemoryCheckerService.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include namespace tt::service::memorychecker { @@ -54,7 +54,7 @@ bool MemoryCheckerService::onStart(ServiceContext& service) { auto lock = mutex.asScopedLock(); lock.lock(); - statusbarIconId = lvgl::statusbar_icon_add(LVGL_SYMBOL_MEMORY, false); + statusbarIconId = lvgl::statusbar_icon_add(LVGL_ICON_STATUSBAR_MEMORY, false); lvgl::statusbar_icon_set_visibility(statusbarIconId, false); timer.setCallbackPriority(Thread::Priority::Lower); diff --git a/Tactility/Source/service/statusbar/Statusbar.cpp b/Tactility/Source/service/statusbar/Statusbar.cpp index 705a967e2..23c440731 100644 --- a/Tactility/Source/service/statusbar/Statusbar.cpp +++ b/Tactility/Source/service/statusbar/Statusbar.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include namespace tt::service::statusbar { @@ -25,15 +25,15 @@ extern const ServiceManifest manifest; const char* getWifiStatusIconForRssi(int rssi) { if (rssi >= -60) { - return LVGL_SYMBOL_SIGNAL_WIFI_4_BAR; + return LVGL_ICON_STATUSBAR_SIGNAL_WIFI_4_BAR; } else if (rssi >= -70) { - return LVGL_SYMBOL_NETWORK_WIFI_3_BAR; + return LVGL_ICON_STATUSBAR_NETWORK_WIFI_3_BAR; } else if (rssi >= -80) { - return LVGL_SYMBOL_NETWORK_WIFI_2_BAR; + return LVGL_ICON_STATUSBAR_NETWORK_WIFI_2_BAR; } else if (rssi >= -90) { - return LVGL_SYMBOL_NETWORK_WIFI_1_BAR; + return LVGL_ICON_STATUSBAR_NETWORK_WIFI_1_BAR; } else { - return LVGL_SYMBOL_SIGNAL_WIFI_BAD; + return LVGL_ICON_STATUSBAR_SIGNAL_WIFI_BAD; } } @@ -44,10 +44,10 @@ static const char* getWifiStatusIcon(wifi::RadioState state) { case On: case OnPending: case ConnectionPending: - return LVGL_SYMBOL_SIGNAL_WIFI_0_BAR; + return LVGL_ICON_STATUSBAR_SIGNAL_WIFI_0_BAR; case OffPending: case Off: - return LVGL_SYMBOL_SIGNAL_WIFI_OFF; + return LVGL_ICON_STATUSBAR_SIGNAL_WIFI_OFF; case ConnectionActive: rssi = wifi::getRssi(); return getWifiStatusIconForRssi(rssi); @@ -60,11 +60,11 @@ static const char* getSdCardStatusIcon(hal::sdcard::SdCardDevice::State state) { switch (state) { using enum hal::sdcard::SdCardDevice::State; case Mounted: - return LVGL_SYMBOL_SD_CARD; + return LVGL_ICON_STATUSBAR_SD_CARD; case Error: case Unmounted: case Timeout: - return LVGL_SYMBOL_SD_CARD_ALERT; + return LVGL_ICON_STATUSBAR_SD_CARD_ALERT; default: check(false, "Unhandled SdCard state"); } @@ -93,19 +93,19 @@ static const char* getPowerStatusIcon() { uint8_t charge = charge_level.valueAsUint8; if (charge >= 95) { - return LVGL_SYMBOL_BATTERY_ANDROID_FRAME_FULL; + return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_FULL; } else if (charge >= 80) { - return LVGL_SYMBOL_BATTERY_ANDROID_FRAME_6; + return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_6; } else if (charge >= 64) { - return LVGL_SYMBOL_BATTERY_ANDROID_FRAME_5; + return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_5; } else if (charge >= 48) { - return LVGL_SYMBOL_BATTERY_ANDROID_FRAME_4; + return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_4; } else if (charge >= 32) { - return LVGL_SYMBOL_BATTERY_ANDROID_FRAME_3; + return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_3; } else if (charge >= 16) { - return LVGL_SYMBOL_BATTERY_ANDROID_FRAME_2; + return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_2; } else { - return LVGL_SYMBOL_BATTERY_ANDROID_FRAME_1; + return LVGL_ICON_STATUSBAR_BATTERY_ANDROID_FRAME_1; } } @@ -135,7 +135,7 @@ class StatusbarService final : public Service { bool show_icon = (gps_state == gps::State::OnPending) || (gps_state == gps::State::On); if (gps_last_state != show_icon) { if (show_icon) { - lvgl::statusbar_icon_set_image(gps_icon_id, LVGL_SYMBOL_LOCATION_ON); + lvgl::statusbar_icon_set_image(gps_icon_id, LVGL_ICON_STATUSBAR_LOCATION_ON); lvgl::statusbar_icon_set_visibility(gps_icon_id, true); } else { lvgl::statusbar_icon_set_visibility(gps_icon_id, false); diff --git a/Tactility/Source/service/webserver/WebServerService.cpp b/Tactility/Source/service/webserver/WebServerService.cpp index bc78335e9..6c34b7c78 100644 --- a/Tactility/Source/service/webserver/WebServerService.cpp +++ b/Tactility/Source/service/webserver/WebServerService.cpp @@ -31,7 +31,7 @@ #include #endif -#include +#include #include #include @@ -522,7 +522,7 @@ bool WebServerService::startServer() { // Show statusbar icon if (statusbarIconId >= 0) { - lvgl::statusbar_icon_set_image(statusbarIconId, LVGL_SYMBOL_CLOUD); + lvgl::statusbar_icon_set_image(statusbarIconId, LVGL_ICON_STATUSBAR_CLOUD); lvgl::statusbar_icon_set_visibility(statusbarIconId, true); LOGGER.info("WebServer statusbar icon shown ({} mode)", settings.wifiMode == settings::webserver::WiFiMode::AccessPoint ? "AP" : "Station");