From 56852c21def2b90dac61934ce589f2c19b1d71ae Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 14:51:07 +0200 Subject: [PATCH 01/46] Initial import --- COPYING | 674 +++++++++++++++++ Pipfile | 13 + Pipfile.lock | 80 ++ README.md | 47 ++ .../sq2lv_layouts.c | 186 +++++ .../sq2lv_layouts.h | 46 ++ examples/us/sq2lv_layouts.c | 89 +++ examples/us/sq2lv_layouts.h | 46 ++ regenerate-examples.sh | 29 + squeek2lvgl.py | 699 ++++++++++++++++++ 10 files changed, 1909 insertions(+) create mode 100644 COPYING create mode 100644 Pipfile create mode 100644 Pipfile.lock create mode 100644 README.md create mode 100644 examples/us-terminal-with-scancodes/sq2lv_layouts.c create mode 100644 examples/us-terminal-with-scancodes/sq2lv_layouts.h create mode 100644 examples/us/sq2lv_layouts.c create mode 100644 examples/us/sq2lv_layouts.h create mode 100755 regenerate-examples.sh create mode 100644 squeek2lvgl.py diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..1438471 --- /dev/null +++ b/Pipfile @@ -0,0 +1,13 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +pyyaml = "*" +gitpython = "*" + +[dev-packages] + +[requires] +python_version = "3.8" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..2c9eabd --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,80 @@ +{ + "_meta": { + "hash": { + "sha256": "2d598f1754849a1e6f92a1ee95baaf2ced919bf20e44a4eec871521e772b0127" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.8" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "gitdb": { + "hashes": [ + "sha256:6c4cc71933456991da20917998acbe6cf4fb41eeaab7d6d67fbc05ecd4c865b0", + "sha256:96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005" + ], + "markers": "python_version >= '3.4'", + "version": "==4.0.7" + }, + "gitpython": { + "hashes": [ + "sha256:b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b", + "sha256:fce760879cd2aebd2991b3542876dc5c4a909b30c9d69dfc488e504a8db37ee8" + ], + "index": "pypi", + "version": "==3.1.18" + }, + "pyyaml": { + "hashes": [ + "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf", + "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696", + "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393", + "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77", + "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922", + "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5", + "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8", + "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10", + "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc", + "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", + "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", + "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", + "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", + "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", + "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", + "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", + "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", + "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", + "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", + "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", + "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", + "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", + "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", + "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", + "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", + "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", + "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", + "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", + "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" + ], + "index": "pypi", + "version": "==5.4.1" + }, + "smmap": { + "hashes": [ + "sha256:7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182", + "sha256:a9a7479e4c572e2e775c404dcd3080c8dc49f39918c2cf74913d30c4c478e3c2" + ], + "markers": "python_version >= '3.5'", + "version": "==4.0.0" + } + }, + "develop": {} +} diff --git a/README.md b/README.md new file mode 100644 index 0000000..60856cf --- /dev/null +++ b/README.md @@ -0,0 +1,47 @@ +# squeek2lvgl + +squeek2lvgl is a Python script that makes it possible to use [squeekboard] keyboard layouts with [LVGL]'s keyboard widget. To achieve this, [squeekboard]'s YAML syntax for layout definitions is converted into a C file (with an accompanying header) that can then be added to an [LVGL] project. + +To access [squeekboard]'s layout files, squeek2lvgl shallowly clones the [squeekboard] git repository into a temporary directory and purges it before exiting. + +## Usage + +First, set up the virtual Python environment and install the dependencies with + +``` +$ pipenv install +``` + +Afterwards you can execute the script with `pipenv run`. Use the `-h` / `--help` flag to print detailed usage instructions. + +``` +$ pipenv run python squeek2lvgl.py --help +usage: squeek2lvgl.py [-h] --input INPUT [--generate-scancodes] [--output OUTPUT] + +Convert squeekboard layouts to LVGL-compatible C code. + +optional arguments: + -h, --help show this help message and exit + --input INPUT squeekboard layout to use as input for generation. Has to be a YAML file path relative to data/keyboards. Can be specified + multiple times. + --generate-scancodes also generate scancode tables (only works for US layout currently + --output OUTPUT output directory for generated files +``` + +As an example, the following command converts [squeekboard]'s US layout to C + +``` +$ pipenv run python squeek2lvgl.py --input us.yaml --output . +``` + +When the process has finished, `sq2lv_layouts.h` and `sq2lv_layouts.c` will have been written into the current directory. Check the [examples] folder for further details about the generated files. + +## License + +squeek2lvgl Generator is licensed under 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. + +[squeekboard] and its keyboard layouts are licensed under the GNU General Public License version 3.0. + +[LVGL]: https://github.com/lvgl/lvgl +[squeekboard]: https://gitlab.gnome.org/World/Phosh/squeekboard +[examples]: ./examples diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c new file mode 100644 index 0000000..c235790 --- /dev/null +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -0,0 +1,186 @@ +/** + * Auto-generated with unsqu33kr + **/ + +#include "sq2lv_layouts.h" +#include + +/** + * Layout: US English (Terminal) - generated from terminal/us + **/ + +static const char * const name_terminal_us = "terminal/us"; + +/* Layer: Lowercase letters - generated from base */ + +static const char * const keycaps_lower_terminal_us[] = { \ + "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ + "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ + "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_scancodes_lower_terminal_us = 5; + +static const int scancodes_lower_terminal_us[] = { \ + KEY_LEFTCTRL, KEY_LEFTALT, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, \ + KEY_Q, KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, \ + KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, \ + KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_BACKSPACE, \ + KEY_LEFT, KEY_SPACE, KEY_RIGHT, KEY_ENTER \ +}; + +static const int scancode_idxs_lower_terminal_us[] = { \ + 0, 1, 2, 3, 4, 5, \ + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \ + 16, 17, 18, 19, 20, 21, 22, 23, 24, \ + -1, 25, 26, 27, 28, 29, 30, 31, 32, \ + -1, 33, 34, 35, 36 \ +}; + +static const int scancode_nums_lower_terminal_us[] = { \ + 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 0, 1, 1, 1, 1, 1, 1, 1, 1, \ + 0, 1, 1, 1, 1 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const char * const keycaps_upper_terminal_us[] = { \ + "Ctrl", "Alt", "PgUp", "PgDn", "Home", "End", "\n", \ + "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ + "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_scancodes_upper_terminal_us = 5; + +static const int scancodes_upper_terminal_us[] = { \ + KEY_LEFTCTRL, KEY_LEFTALT, KEY_PAGEUP, KEY_PAGEDOWN, KEY_HOME, KEY_END, \ + KEY_LEFTSHIFT, KEY_Q, KEY_LEFTSHIFT, KEY_W, KEY_LEFTSHIFT, KEY_E, KEY_LEFTSHIFT, KEY_R, KEY_LEFTSHIFT, KEY_T, KEY_LEFTSHIFT, KEY_Y, KEY_LEFTSHIFT, KEY_U, KEY_LEFTSHIFT, KEY_I, KEY_LEFTSHIFT, KEY_O, KEY_LEFTSHIFT, KEY_P, \ + KEY_LEFTSHIFT, KEY_A, KEY_LEFTSHIFT, KEY_S, KEY_LEFTSHIFT, KEY_D, KEY_LEFTSHIFT, KEY_F, KEY_LEFTSHIFT, KEY_G, KEY_LEFTSHIFT, KEY_H, KEY_LEFTSHIFT, KEY_J, KEY_LEFTSHIFT, KEY_K, KEY_LEFTSHIFT, KEY_L, \ + KEY_LEFTSHIFT, KEY_Z, KEY_LEFTSHIFT, KEY_X, KEY_LEFTSHIFT, KEY_C, KEY_LEFTSHIFT, KEY_V, KEY_LEFTSHIFT, KEY_B, KEY_LEFTSHIFT, KEY_N, KEY_LEFTSHIFT, KEY_M, KEY_BACKSPACE, \ + KEY_LEFT, KEY_SPACE, KEY_RIGHT, KEY_ENTER \ +}; + +static const int scancode_idxs_upper_terminal_us[] = { \ + 0, 1, 2, 3, 4, 5, \ + 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, \ + 26, 28, 30, 32, 34, 36, 38, 40, 42, \ + -1, 44, 46, 48, 50, 52, 54, 56, 58, \ + -1, 59, 60, 61, 62 \ +}; + +static const int scancode_nums_upper_terminal_us[] = { \ + 1, 1, 1, 1, 1, 1, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 0, 2, 2, 2, 2, 2, 2, 2, 1, \ + 0, 1, 1, 1, 1 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const char * const keycaps_numbers_terminal_us[] = { \ + "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \ + ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_scancodes_numbers_terminal_us = 5; + +static const int scancodes_numbers_terminal_us[] = { \ + KEY_LEFTCTRL, KEY_LEFTALT, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, \ + KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, \ + KEY_LEFTSHIFT, KEY_8, KEY_LEFTSHIFT, KEY_3, KEY_LEFTSHIFT, KEY_4, KEY_LEFTSHIFT, KEY_QUESTION, KEY_LEFTSHIFT, KEY_7, KEY_MINUS, KEY_LEFTSHIFT, KEY_MINUS, KEY_LEFTSHIFT, KEY_EQUAL, KEY_LEFTSHIFT, KEY_9, KEY_LEFTSHIFT, KEY_0, \ + KEY_COMMA, KEY_LEFTSHIFT, KEY_APOSTROPHE, KEY_APOSTROPHE, KEY_LEFTSHIFT, KEY_SEMICOLON, KEY_SEMICOLON, KEY_LEFTSHIFT, KEY_1, KEY_QUESTION, KEY_BACKSPACE, \ + KEY_LEFT, KEY_SPACE, KEY_RIGHT, KEY_DOT, KEY_ENTER \ +}; + +static const int scancode_idxs_numbers_terminal_us[] = { \ + 0, 1, 2, 3, 4, 5, \ + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \ + 16, 18, 20, 22, 24, 26, 27, 29, 31, 33, \ + 35, 36, 38, 39, 41, 42, 44, 45, \ + -1, 46, 47, 48, 49, 50 \ +}; + +static const int scancode_nums_numbers_terminal_us[] = { \ + 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, \ + 1, 2, 1, 2, 1, 2, 1, 1, \ + 0, 1, 1, 1, 1, 1 \ +}; + +/** + * Public interface + **/ + +const sq2lv_layout_t sq2lv_layouts[] = { + /* US English (Terminal) */ + { + .layers = (sq2lv_layer_t[]){ + { + .keycaps = keycaps_lower_terminal_us, + .attributes = attributes_lower_terminal_us, + .num_scancodes = num_scancodes_lower_terminal_us, + .scancodes = scancodes_lower_terminal_us, + .scancode_idxs = scancode_idxs_lower_terminal_us, + .scancode_nums = scancode_nums_lower_terminal_us + }, + { + .keycaps = keycaps_upper_terminal_us, + .attributes = attributes_upper_terminal_us, + .num_scancodes = num_scancodes_upper_terminal_us, + .scancodes = scancodes_upper_terminal_us, + .scancode_idxs = scancode_idxs_upper_terminal_us, + .scancode_nums = scancode_nums_upper_terminal_us + }, + { + .keycaps = keycaps_numbers_terminal_us, + .attributes = attributes_numbers_terminal_us, + .num_scancodes = num_scancodes_numbers_terminal_us, + .scancodes = scancodes_numbers_terminal_us, + .scancode_idxs = scancode_idxs_numbers_terminal_us, + .scancode_nums = scancode_nums_numbers_terminal_us + } + }, + .num_layers = 3 + } +}; + +const int sq2lv_num_layouts = 1; + +const char * const sq2lv_layout_names = + "US English (Terminal)"; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h new file mode 100644 index 0000000..1fe044e --- /dev/null +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -0,0 +1,46 @@ +/** + * Auto-generated with unsqu33kr + **/ + +#ifndef SQ2LV_LAYOUTS_H +#define SQ2LV_LAYOUTS_H + +#include "../lvgl/lvgl.h" + +/* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ +typedef enum { + SQ2LV_LAYOUT_TERMINAL_US = 0 +} sq2lv_layout_id_t; + +/* Layout type */ +typedef struct { + /* Layers array */ + const sq2lv_layer_t * const layers; + /* Total number of layers */ + const int num_layers; +} sq2lv_layout_t; + +/* Layer type */ +typedef struct { + /* Key caps */ + const char ** const keycaps; + /* Button matrix attributes */ + const lv_btnmatrix_ctrl_t * const attributes; + /* Total number of scancodes */ + const int const num_scancodes; + /* Flat array of scancodes */ + const int * const scancodes; + /* Start index in scancodes array for key cap */ + const int * const scancode_idxs; + /* Number of scancodes for key cap */ + const int * const scancode_nums; +} sq2lv_layer_t; + +/* Layouts */ +extern const sq2lv_layout_t sq2lv_layouts[]; +extern const int sq2lv_num_layouts; + +/* Layout names (suitable for use in lv_dropdown_t */ +extern const char * const sq2lv_layout_names; + +#endif /* SQ2LV_LAYOUTS_H */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c new file mode 100644 index 0000000..ed209d5 --- /dev/null +++ b/examples/us/sq2lv_layouts.c @@ -0,0 +1,89 @@ +/** + * Auto-generated with unsqu33kr + **/ + +#include "sq2lv_layouts.h" + +/** + * Layout: US English - generated from us + **/ + +static const char * const name_us = "us"; + +/* Layer: Lowercase letters - generated from base */ + +static const char * const keycaps_lower_us[] = { \ + "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ + "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const char * const keycaps_upper_us[] = { \ + "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ + "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const char * const keycaps_numbers_us[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +/** + * Public interface + **/ + +const sq2lv_layout_t sq2lv_layouts[] = { + /* US English */ + { + .layers = (sq2lv_layer_t[]){ + { + .keycaps = keycaps_lower_us, + .attributes = attributes_lower_us + }, + { + .keycaps = keycaps_upper_us, + .attributes = attributes_upper_us + }, + { + .keycaps = keycaps_numbers_us, + .attributes = attributes_numbers_us + } + }, + .num_layers = 3 + } +}; + +const int sq2lv_num_layouts = 1; + +const char * const sq2lv_layout_names = + "US English"; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h new file mode 100644 index 0000000..540ecdd --- /dev/null +++ b/examples/us/sq2lv_layouts.h @@ -0,0 +1,46 @@ +/** + * Auto-generated with unsqu33kr + **/ + +#ifndef SQ2LV_LAYOUTS_H +#define SQ2LV_LAYOUTS_H + +#include "../lvgl/lvgl.h" + +/* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ +typedef enum { + SQ2LV_LAYOUT_US = 0 +} sq2lv_layout_id_t; + +/* Layout type */ +typedef struct { + /* Layers array */ + const sq2lv_layer_t * const layers; + /* Total number of layers */ + const int num_layers; +} sq2lv_layout_t; + +/* Layer type */ +typedef struct { + /* Key caps */ + const char ** const keycaps; + /* Button matrix attributes */ + const lv_btnmatrix_ctrl_t * const attributes; + /* Total number of scancodes */ + const int const num_scancodes; + /* Flat array of scancodes */ + const int * const scancodes; + /* Start index in scancodes array for key cap */ + const int * const scancode_idxs; + /* Number of scancodes for key cap */ + const int * const scancode_nums; +} sq2lv_layer_t; + +/* Layouts */ +extern const sq2lv_layout_t sq2lv_layouts[]; +extern const int sq2lv_num_layouts; + +/* Layout names (suitable for use in lv_dropdown_t */ +extern const char * const sq2lv_layout_names; + +#endif /* SQ2LV_LAYOUTS_H */ diff --git a/regenerate-examples.sh b/regenerate-examples.sh new file mode 100755 index 0000000..91132dc --- /dev/null +++ b/regenerate-examples.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright 2021 Johannes Marbach +# +# This file is part of squeek2lvgl, hereafter referred to as the program. +# +# 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 . + +pipenv install + +pipenv run python squeek2lvgl.py \ + --input us.yaml \ + --output examples/us + +pipenv run python squeek2lvgl.py \ + --input terminal/us.yaml \ + --output examples/us-terminal-with-scancodes \ + --generate-scancodes diff --git a/squeek2lvgl.py b/squeek2lvgl.py new file mode 100644 index 0000000..ed25c77 --- /dev/null +++ b/squeek2lvgl.py @@ -0,0 +1,699 @@ +#!/usr/bin/env python3 + +# Copyright 2021 Johannes Marbach +# +# This file is part of squeek2lvgl, hereafter referred to as the program. +# +# 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 . + +import argparse +import git +import os +import sys +import tempfile +import yaml + + +### +# Global constants + +outfile_c = 'sq2lv_layouts.c' +outfile_h = 'sq2lv_layouts.h' + +repository_url = 'https://gitlab.gnome.org/World/Phosh/squeekboard.git' +rel_layouts_dir = 'data/keyboards' + +typedef_layer_t = [ + 'typedef struct {', + ' /* Key caps */', + ' const char ** const keycaps;', + ' /* Button matrix attributes */', + ' const lv_btnmatrix_ctrl_t * const attributes;', + # ' /* Number of buttons that trigger a layer switch */', + # ' const int num_triggers;', + # ' /* Button indexes that trigger a layer switch */', + # ' const int * const trigger_idxs;', + # ' /* Indexes of layers to jump to when hitting trigger */', + # ' const int * const trigger_targets;', + ' /* Total number of scancodes */', + ' const int const num_scancodes;', + ' /* Flat array of scancodes */', + ' const int * const scancodes;', + ' /* Start index in scancodes array for key cap */', + ' const int * const scancode_idxs;', + ' /* Number of scancodes for key cap */', + ' const int * const scancode_nums;', + '} sq2lv_layer_t;' +] + +typedef_layout_t = [ + 'typedef struct {', + ' /* Layers array */', + ' const sq2lv_layer_t * const layers;', + ' /* Total number of layers */', + ' const int num_layers;', + '} sq2lv_layout_t;' +] + + +### +# General helpers +## + +def die(msg): + """Print an error message to STDERR and exit with a non-zero code. + + msg -- message to output on STDERR + """ + sys.stderr.write(msg if msg.endswith('\n') else msg + '\n') + sys.exit(1) + + +def warn(msg): + """Print a warning message to STDERR. + + msg -- message to output on STDERR + """ + sys.stderr.write(msg if msg.endswith('\n') else msg + '\n') + + +def parse_arguments(): + """ Parse commandline arguments. + """ + parser = argparse.ArgumentParser(description='Convert squeekboard layouts to LVGL-compatible C code.') + parser.add_argument('--input', dest='input', action='append', required=True, help='squeekboard layout to ' + + 'use as input for generation. Has to be a YAML file path relative to data/keyboards. ' + + 'Can be specified multiple times.') + parser.add_argument('--generate-scancodes', action='store_true', dest='generate_scancodes', help='also ' + + 'generate scancode tables (only works for US layout currently') + parser.add_argument('--output', dest='output', type=str, help='output directory for generated files') + args = parser.parse_args() + + if not args.output or not os.path.isdir(args.output): + die('Error: no valid output directory specified') + + return args + + +def clone_squeekboard_repo(destination): + """ Clone the squeekboard git repository. + + destination -- directory path to clone to + """ + git.Repo.clone_from(repository_url, destination, depth=1) + + +def load_yaml(rel_path): + """ Load a YAML file and return its dictionary representation. + + rel_path -- path of the YAML file relative to the layouts root directory + """ + path = os.path.join(layouts_dir, rel_path) + if not os.path.isfile(path): + die(f'could not find input file {path}') + + data = None + with open(path, 'r') as stream: + try: + data = yaml.safe_load(stream) + except yaml.YAMLError as exc: + die(f'Could not load YAML file {path}: {exc}') + if not data: + die(f'could not load input file {path}') + if not 'views' in data: + die(f'no "views" element in YAML data loaded from input file {path}') + + return data + + +def write_files(lines_c, lines_h): + """Write accumulated output to C and header file, respectively. + + lines_c -- sequence of lines to write to C file + lines_h -- sequence of lines to write to header + """ + with open(os.path.join(args.output, outfile_c), 'w') as fp: + fp.write('\n'.join(lines_c)) + with open(os.path.join(args.output, outfile_h), 'w') as fp: + fp.write('\n'.join(lines_h)) + + +def comma_if_needed(sequence, idx): + """Return a comma unless idx points to the last element in sequence. + + sequence -- a sequence of elements + idx -- an index into the sequence + """ + return ',' if idx < len(sequence) - 1 else '' + + +### +# SourceFileBuilder +## + +class SourceFileBuilder(object): + """Builder for .c and .h files. + """ + + def __init__(self): + """Constructor. + """ + self.lines = [] + self._add_header_comment() + + def add_line(self, line=None): + """Add a single line and return the builder. + + line - string representing the line to add (if None, an empty line will be added) + """ + self.lines.append(line if line else '') + return self + + def add_lines(self, lines): + """Add multiple lines and return the builder. + + lines - a list of strings representing the lines to add + """ + self.lines += lines + return self + + def wrap_in_ifndef(self, macro): + """Wrap all of the current content in a macro check to prevent double inclusion and + return the builder. + + macro -- name of the macro to use + """ + idx = 0 + while self.lines[idx][:2] in ['/*', ' *']: + idx += 1 + self.lines.insert(idx, '') + self.lines.insert(idx + 1, f'#ifndef {macro}') + self.lines.insert(idx + 2, f'#define {macro}') + self.add_lines(['', f'#endif /* {macro} */']) + + def _add_header_comment(self): + """Add the generator header comment and return the builder. + """ + self.add_lines(['/**', ' * Auto-generated with unsqu33kr', ' **/', '']) + return self + + def add_include(self, header): + """Add an include statement and return the builder. + + header -- path to file to be included + """ + self.add_line(f'#include "{header}"') + return self + + def add_system_include(self, header): + """Add a system include statement and return the builder. + + header -- path to file to be included + """ + self.add_line(f'#include <{header}>') + return self + + def add_section_comment(self, title): + """Add a comment marking the beginning of a section and return the builder. + + title -- title of the section + """ + self.add_lines(['/**', f' * {title}', ' **/']) + return self + + def add_subsection_comment(self, title): + """Add a comment marking the beginning of a subsection and return the builder. + + title -- title of the subsection + """ + self.add_line(f'/* {title} */') + return self + + def add_array(self, static, type, identifier, values, row_terminator, array_terminator): + """Add a C array and return the builder. + + static -- True if the variable is static + type -- variable type + identifier -- variable identifier + values -- values per row as a list of lists, + row_terminator -- element to append to each row except the last + array_terminator -- element to append to the last row + """ + prefix = 'static ' if static else '' + self.add_line(f'{prefix}{type} {identifier}[] = ' + '{ \\') + for i, values_in_row in enumerate(values): + elements = values_in_row + if i < len(values) - 1 and row_terminator: + elements.append(row_terminator) + if i == len(values) - 1 and array_terminator: + elements.append(array_terminator) + joined = ', '.join([f'{e}' for e in elements]) + self.add_line(f' {joined}{comma_if_needed(values, i)} \\') + self.add_line('};') + return self + + +### +# Layout processing +## + +layout_name_for_layout_id = { + 'terminal/us': 'US English (Terminal)', + 'de': 'German', + 'es': 'Spanish', + 'fr': 'French', + 'us': 'US English' +} + +def layout_id_to_layout_name(layout_id): + """Return a descriptive name for a layout. + + layout_id -- ID of the layout + """ + return layout_name_for_layout_id[layout_id] + + +def layout_id_to_c_identifier(layout_id): + """Return a string for a layout that is suitable to be used in a C identifier. + + layout_id -- ID of the layout + """ + return layout_id.lower().replace('/', '_') + + +layer_name_for_view_id = { + 'base': 'Lowercase letters', + 'upper': 'Uppercase letters', + 'numbers': 'Numbers / symbols', + 'eschars': 'Special characters' +} + +def view_id_to_layer_name(view_id): + """Return a descriptive name for a layer based on its view ID. + + view_id -- the ID of the view representing the layer + """ + if view_id not in layer_name_for_view_id: + return None + return layer_name_for_view_id[view_id] + + +layer_identifier_for_view_id = { + 'base': 'lower', + 'eschars': 'special' +} + +def view_id_to_c_identifier(view_id): + """Return a string for a view that is suitable to be used in a C identifier. + + view_id -- ID of the view + """ + return layer_identifier_for_view_id[view_id] if view_id in layer_identifier_for_view_id else view_id + + +keycap_for_key = { + '\\': '\\\\', + '"': '\\"', + '↑': 'LV_SYMBOL_UP', + '↓': 'LV_SYMBOL_DOWN', + '←': 'LV_SYMBOL_LEFT', + '→': 'LV_SYMBOL_RIGHT', + 'BackSpace': 'LV_SYMBOL_BACKSPACE', + 'colon': ':', + 'period': '.', + 'preferences': None, + 'Shift_L': { + 'base': 'ABC', + 'upper': 'abc' + }, + 'show_actions': None, + 'show_eschars': { + 'de': 'äöü', + 'es': 'áéí', + 'fr': 'àéô' + }, + 'show_letters': 'abc', + 'show_numbers': '1#', + 'show_numbers_from_symbols': '1#', + 'show_symbols': None, + 'space': ['LV_SYMBOL_LEFT', ' ', 'LV_SYMBOL_RIGHT'], + 'Return': 'LV_SYMBOL_OK', +} + +def key_to_keycap(key, view_id, layout_id): + """Return the list of keycaps for a key + + key -- the key + view_id -- ID of the view the key appears on + layout_id -- ID of the layout the view is part of + """ + keycap = keycap_for_key[key] if key in keycap_for_key else key + if isinstance(keycap, dict): + if view_id in keycap: + keycap = keycap[view_id] + elif layout_id in keycap: + keycap = keycap[layout_id] + else: + keycap = None + if not keycap: + return [] + if isinstance(keycap, list): + return keycap + return [keycap] + + +def key_to_attributes(key, data_buttons): + """Return the LVGL button attributes for a key. + + key -- the key in question + data_buttons -- the "buttons" object from the layout's YAML file + """ + if key in ['period', 'colon', '"'] or key not in data_buttons: + return '2' + width = 7 if key == 'space' else 3 + return f'LV_KEYBOARD_CTRL_BTN_FLAGS | {width}' + + +def keycap_to_c_value(keycap): + """Return the right-hand side C value for a keycap + """ + return keycap if keycap.startswith('LV_') else f'"{keycap}"' + + +scancodes_for_keycap = { + '0': ['KEY_0'], + '1': ['KEY_1'], + '2': ['KEY_2'], + '3': ['KEY_3'], + '4': ['KEY_4'], + '5': ['KEY_5'], + '6': ['KEY_6'], + '7': ['KEY_7'], + '8': ['KEY_8'], + '9': ['KEY_9'], + 'a': ['KEY_A'], + 'b': ['KEY_B'], + 'c': ['KEY_C'], + 'd': ['KEY_D'], + 'e': ['KEY_E'], + 'f': ['KEY_F'], + 'g': ['KEY_G'], + 'h': ['KEY_H'], + 'i': ['KEY_I'], + 'j': ['KEY_J'], + 'k': ['KEY_K'], + 'l': ['KEY_L'], + 'm': ['KEY_M'], + 'n': ['KEY_N'], + 'o': ['KEY_O'], + 'p': ['KEY_P'], + 'q': ['KEY_Q'], + 'r': ['KEY_R'], + 's': ['KEY_S'], + 't': ['KEY_T'], + 'u': ['KEY_U'], + 'v': ['KEY_V'], + 'w': ['KEY_W'], + 'x': ['KEY_X'], + 'y': ['KEY_Y'], + 'z': ['KEY_Z'], + 'A': ['KEY_LEFTSHIFT', 'KEY_A'], + 'B': ['KEY_LEFTSHIFT', 'KEY_B'], + 'C': ['KEY_LEFTSHIFT', 'KEY_C'], + 'D': ['KEY_LEFTSHIFT', 'KEY_D'], + 'E': ['KEY_LEFTSHIFT', 'KEY_E'], + 'F': ['KEY_LEFTSHIFT', 'KEY_F'], + 'G': ['KEY_LEFTSHIFT', 'KEY_G'], + 'H': ['KEY_LEFTSHIFT', 'KEY_H'], + 'I': ['KEY_LEFTSHIFT', 'KEY_I'], + 'J': ['KEY_LEFTSHIFT', 'KEY_J'], + 'K': ['KEY_LEFTSHIFT', 'KEY_K'], + 'L': ['KEY_LEFTSHIFT', 'KEY_L'], + 'M': ['KEY_LEFTSHIFT', 'KEY_M'], + 'N': ['KEY_LEFTSHIFT', 'KEY_N'], + 'O': ['KEY_LEFTSHIFT', 'KEY_O'], + 'P': ['KEY_LEFTSHIFT', 'KEY_P'], + 'Q': ['KEY_LEFTSHIFT', 'KEY_Q'], + 'R': ['KEY_LEFTSHIFT', 'KEY_R'], + 'S': ['KEY_LEFTSHIFT', 'KEY_S'], + 'T': ['KEY_LEFTSHIFT', 'KEY_T'], + 'U': ['KEY_LEFTSHIFT', 'KEY_U'], + 'V': ['KEY_LEFTSHIFT', 'KEY_V'], + 'W': ['KEY_LEFTSHIFT', 'KEY_W'], + 'X': ['KEY_LEFTSHIFT', 'KEY_X'], + 'Y': ['KEY_LEFTSHIFT', 'KEY_Y'], + 'Z': ['KEY_LEFTSHIFT', 'KEY_Z'], + 'Alt': ['KEY_LEFTALT'], + 'Ctrl': ['KEY_LEFTCTRL'], + 'LV_SYMBOL_UP': ['KEY_UP'], + 'LV_SYMBOL_DOWN': ['KEY_DOWN'], + 'LV_SYMBOL_LEFT': ['KEY_LEFT'], + 'LV_SYMBOL_RIGHT': ['KEY_RIGHT'], + 'LV_SYMBOL_BACKSPACE': ['KEY_BACKSPACE'], + 'LV_SYMBOL_OK': ['KEY_ENTER'], + ' ': ['KEY_SPACE'], + 'ABC': [], + 'abc': [], + '1#': [], + 'PgUp': ['KEY_PAGEUP'], + 'PgDn': ['KEY_PAGEDOWN'], + 'Home': ['KEY_HOME'], + 'End': ['KEY_END'], + '*': ['KEY_LEFTSHIFT', 'KEY_8'], + '#': ['KEY_LEFTSHIFT', 'KEY_3'], + '$': ['KEY_LEFTSHIFT', 'KEY_4'], + '/': ['KEY_LEFTSHIFT', 'KEY_QUESTION'], + '&': ['KEY_LEFTSHIFT', 'KEY_7'], + '-': ['KEY_MINUS'], + '_': ['KEY_LEFTSHIFT', 'KEY_MINUS'], + '+': ['KEY_LEFTSHIFT', 'KEY_EQUAL'], + '(': ['KEY_LEFTSHIFT', 'KEY_9'], + ')': ['KEY_LEFTSHIFT', 'KEY_0'], + ',': ['KEY_COMMA'], + '\\"': ['KEY_LEFTSHIFT', 'KEY_APOSTROPHE'], + '\'': ['KEY_APOSTROPHE'], + ':': ['KEY_LEFTSHIFT', 'KEY_SEMICOLON'], + ';': ['KEY_SEMICOLON'], + '!': ['KEY_LEFTSHIFT', 'KEY_1'], + '?': ['KEY_QUESTION'], + '.': ['KEY_DOT'] +} + +def keycap_to_scancodes(keycap): + """Return the scancodes needed to produce a keycap + + keycap -- keycap to produce + """ + if keycap not in scancodes_for_keycap: + die(f'cannot determine scancodes for unknown keycap "{keycap}"') + return scancodes_for_keycap[keycap] + + +def get_keycaps_attrs_scancodes(layout_id, view_id, data_views, data_buttons, include_scancodes): + """Return keycaps, LVGL button attributes and scancodes for a view + + layout_id -- ID of the layout + view_id -- ID of the view + data_views -- the "views" object from the layout's YAML file + data_buttons -- the "buttons" object from the layout's YAML file + include_scancodes -- True if scancodes should be included + """ + keycaps = [] + attrs = [] + scancodes = [] + + for row in data_views[view_id]: + keycaps_in_row = [] + attrs_in_row = [] + scancodes_in_row = [] + for key in row.split(): + for keycap in key_to_keycap(key, view_id, layout_id): + keycaps_in_row.append(keycap_to_c_value(keycap)) + attrs_in_row.append(key_to_attributes(key, data_buttons)) + if include_scancodes: + scancodes_in_row.append(keycap_to_scancodes(keycap)) + keycaps.append(keycaps_in_row) + attrs.append(attrs_in_row) + scancodes.append(scancodes_in_row) + + return keycaps, attrs, scancodes + + +def flatten_scancodes(scancodes): + """Process a nested list of scancodes per key and return a flattened list, a list of starting indexes and a + list of scancode counts. + + scancodes -- list (rows) of list (keys) of list (scancodes) of scancodes + """ + flat = [] + idxs = [] + nums = [] + + if args.generate_scancodes: + idx = 0 + num = 0 + + for scancodes_in_row in scancodes: + flat_in_row = [] + idxs_in_row = [] + nums_in_row = [] + + for codes in scancodes_in_row: + flat_in_row += codes + idxs_in_row.append(idx if len(codes) > 0 else -1) + nums_in_row.append(len(codes)) + idx += len(codes) + + flat.append(flat_in_row) + idxs.append(idxs_in_row) + nums.append(nums_in_row) + + return flat, idxs, nums + + +### +# Main +## + +if __name__ == '__main__': + args = parse_arguments() + + c_builder = SourceFileBuilder() + c_builder.add_include(outfile_h) + if args.generate_scancodes: + c_builder.add_system_include('linux/input.h') + c_builder.add_line() + + h_builder = SourceFileBuilder() + h_builder.add_include('../lvgl/lvgl.h') + h_builder.add_line() + + layouts = [] + + with tempfile.TemporaryDirectory() as tmp: + clone_squeekboard_repo(tmp) + + layouts_dir = os.path.join(tmp, rel_layouts_dir) + + for file in args.input: + layout_id, _ = os.path.splitext(file) + layout_identifier = layout_id_to_c_identifier(layout_id) + + data = load_yaml(file) + data_views = data['views'] + data_buttons = data['buttons'] if 'buttons' in data else {} + + c_builder.add_section_comment(f'Layout: {layout_id_to_layout_name(layout_id)} - generated from {layout_id}') + c_builder.add_line() + c_builder.add_line(f'static const char * const name_{layout_identifier} = "{layout_id}";') + c_builder.add_line() + + layer_identifiers = [] + + for view_id in data_views: + layer_name = view_id_to_layer_name(view_id) + if not layer_name: + warn(f'Ignoring unknown view_id {view_id}') + continue + + layer_identifier = f'{view_id_to_c_identifier(view_id)}_{layout_identifier}' + layer_identifiers.append(layer_identifier) + + c_builder.add_subsection_comment(f'Layer: {layer_name} - generated from {view_id}') + c_builder.add_line() + + keycaps, attrs, scancodes = get_keycaps_attrs_scancodes(layout_id, view_id, data_views, data_buttons, args.generate_scancodes) + + c_builder.add_array(True, 'const char * const', f'keycaps_{layer_identifier}', keycaps, '"\\n"', '""') + c_builder.add_line() + c_builder.add_array(True, 'const lv_btnmatrix_ctrl_t', f'attributes_{layer_identifier}', attrs, '', '') + c_builder.add_line() + + if args.generate_scancodes: + scancodes_flat, scancode_idxs, scancode_nums = flatten_scancodes(scancodes) + + c_builder.add_line(f'static const int num_scancodes_{layer_identifier} = {len(scancodes)};') + c_builder.add_line() + c_builder.add_array(True, 'const int', f'scancodes_{layer_identifier}', scancodes_flat, '', '') + c_builder.add_line() + c_builder.add_array(True, 'const int', f'scancode_idxs_{layer_identifier}', scancode_idxs, '', '') + c_builder.add_line() + c_builder.add_array(True, 'const int', f'scancode_nums_{layer_identifier}', scancode_nums, '', '') + c_builder.add_line() + + layouts.append({ + 'name': layout_id_to_layout_name(layout_id), + 'identifier': layout_identifier, + 'layer_identifiers': layer_identifiers + }) + + h_builder.add_line('/* Layout IDs, values can be used as indexes into the sq2lv_layouts array */') + h_builder.add_line('typedef enum {') + for i, layout in enumerate(layouts): + identifier = layout['identifier'].upper() + h_builder.add_line(f' SQ2LV_LAYOUT_{identifier} = {i}{comma_if_needed(layouts, i)}') + h_builder.add_line('} sq2lv_layout_id_t;') + h_builder.add_line() + + h_builder.add_line('/* Layout type */') + h_builder.add_lines(typedef_layout_t) + h_builder.add_line() + + h_builder.add_line('/* Layer type */') + h_builder.add_lines(typedef_layer_t) + h_builder.add_line() + + h_builder.add_line('/* Layouts */') + h_builder.add_line('extern const sq2lv_layout_t sq2lv_layouts[];') + h_builder.add_line('extern const int sq2lv_num_layouts;') + h_builder.add_line() + + h_builder.add_line('/* Layout names (suitable for use in lv_dropdown_t */') + h_builder.add_line('extern const char * const sq2lv_layout_names;') + + c_builder.add_section_comment('Public interface') + c_builder.add_line() + + c_builder.add_line('const sq2lv_layout_t sq2lv_layouts[] = {') + for i, layout in enumerate(layouts): + c_builder.add_line(' /* ' + layout['name'] + ' */') + c_builder.add_line(' {') + c_builder.add_line(' .layers = (sq2lv_layer_t[]){') + for j, identifier in enumerate(layout['layer_identifiers']): + c_builder.add_line(' {') + fields = ['keycaps', 'attributes'] + if args.generate_scancodes: + fields += ['num_scancodes', 'scancodes', 'scancode_idxs', 'scancode_nums'] + for k, field in enumerate(fields): + c_builder.add_line(f' .{field} = {field}_{identifier}{comma_if_needed(fields, k)}') + c_builder.add_line(' }' + comma_if_needed(layout['layer_identifiers'], j)) + c_builder.add_line(' },') + c_builder.add_line(' .num_layers = ' + str(len(layout['layer_identifiers']))) + c_builder.add_line(' }' + comma_if_needed(layouts, i)) + c_builder.add_line('};') + c_builder.add_line() + + c_builder.add_line('const int sq2lv_num_layouts = ' + str(len(layouts)) + ';') + c_builder.add_line() + + names = [layout['name'] for layout in layouts] + names = '\n ' + ' "\\n"\n '.join([f'"{name}"' for name in names]) + c_builder.add_line(f'const char * const sq2lv_layout_names = {names};') + + h_builder.wrap_in_ifndef('SQ2LV_LAYOUTS_H') + + c_builder.add_line() + h_builder.add_line() + + write_files(c_builder.lines, h_builder.lines) \ No newline at end of file From 9a85bfc0853bbec905c0ca65af68c8e50a1beee2 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 14:53:45 +0200 Subject: [PATCH 02/46] Remove leftover word --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 60856cf..62943f8 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ When the process has finished, `sq2lv_layouts.h` and `sq2lv_layouts.c` will have ## License -squeek2lvgl Generator is licensed under 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. +squeek2lvgl is licensed under 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. [squeekboard] and its keyboard layouts are licensed under the GNU General Public License version 3.0. From 2c5cad227167d87643648910241e8c73f780ae29 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 14:54:52 +0200 Subject: [PATCH 03/46] Add link to US layout --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 62943f8..787205f 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ optional arguments: --output OUTPUT output directory for generated files ``` -As an example, the following command converts [squeekboard]'s US layout to C +As an example, the following command converts [squeekboard's US layout] to C ``` $ pipenv run python squeek2lvgl.py --input us.yaml --output . @@ -44,4 +44,5 @@ squeek2lvgl is licensed under the GNU General Public License as published by the [LVGL]: https://github.com/lvgl/lvgl [squeekboard]: https://gitlab.gnome.org/World/Phosh/squeekboard +[squeekboard's US layout]: https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/data/keyboards/us.yaml [examples]: ./examples From 44f9837d403c0a371e2ba275e41760d53807bdf8 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 14:55:43 +0200 Subject: [PATCH 04/46] Add missing parentheses --- README.md | 2 +- squeek2lvgl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 787205f..5a4a912 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ optional arguments: -h, --help show this help message and exit --input INPUT squeekboard layout to use as input for generation. Has to be a YAML file path relative to data/keyboards. Can be specified multiple times. - --generate-scancodes also generate scancode tables (only works for US layout currently + --generate-scancodes also generate scancode tables (only works for US layout currently) --output OUTPUT output directory for generated files ``` diff --git a/squeek2lvgl.py b/squeek2lvgl.py index ed25c77..8336773 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -96,7 +96,7 @@ def parse_arguments(): + 'use as input for generation. Has to be a YAML file path relative to data/keyboards. ' + 'Can be specified multiple times.') parser.add_argument('--generate-scancodes', action='store_true', dest='generate_scancodes', help='also ' - + 'generate scancode tables (only works for US layout currently') + + 'generate scancode tables (only works for US layout currently)') parser.add_argument('--output', dest='output', type=str, help='output directory for generated files') args = parser.parse_args() From 0855ebeb7b26e4ee637b7a4475a71c926371f430 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 20:22:17 +0200 Subject: [PATCH 05/46] Add layer switch buttons, turn space bar arrows into CLI flag --- README.md | 4 +- .../sq2lv_layouts.c | 69 +++++-- .../sq2lv_layouts.h | 6 + examples/us/sq2lv_layouts.c | 51 +++++- examples/us/sq2lv_layouts.h | 14 +- regenerate-examples.sh | 3 +- squeek2lvgl.py | 172 ++++++++++++------ 7 files changed, 231 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 5a4a912..5d71342 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Afterwards you can execute the script with `pipenv run`. Use the `-h` / `--help` ``` $ pipenv run python squeek2lvgl.py --help -usage: squeek2lvgl.py [-h] --input INPUT [--generate-scancodes] [--output OUTPUT] +usage: squeek2lvgl.py [-h] --input INPUT [--surround-space-with-arrows] [--generate-scancodes] --output OUTPUT Convert squeekboard layouts to LVGL-compatible C code. @@ -24,6 +24,8 @@ optional arguments: -h, --help show this help message and exit --input INPUT squeekboard layout to use as input for generation. Has to be a YAML file path relative to data/keyboards. Can be specified multiple times. + --surround-space-with-arrows + insert left / right arrow before / after space key --generate-scancodes also generate scancode tables (only works for US layout currently) --output OUTPUT output directory for generated files ``` diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index c235790..e82b8a3 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -18,7 +18,7 @@ static const char * const keycaps_lower_terminal_us[] = { \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, "" \ + "1#", " ", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ @@ -26,7 +26,17 @@ static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_switchers_lower_terminal_us = 2; + +static const int switcher_idxs_lower_terminal_us[] = { \ + 25, 34 \ +}; + +static const int switcher_dests_lower_terminal_us[] = { \ + 1, 2 \ }; static const int num_scancodes_lower_terminal_us = 5; @@ -36,7 +46,7 @@ static const int scancodes_lower_terminal_us[] = { \ KEY_Q, KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, \ KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, \ KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_BACKSPACE, \ - KEY_LEFT, KEY_SPACE, KEY_RIGHT, KEY_ENTER \ + KEY_SPACE, KEY_ENTER \ }; static const int scancode_idxs_lower_terminal_us[] = { \ @@ -44,7 +54,7 @@ static const int scancode_idxs_lower_terminal_us[] = { \ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \ 16, 17, 18, 19, 20, 21, 22, 23, 24, \ -1, 25, 26, 27, 28, 29, 30, 31, 32, \ - -1, 33, 34, 35, 36 \ + -1, 33, 34 \ }; static const int scancode_nums_lower_terminal_us[] = { \ @@ -52,7 +62,7 @@ static const int scancode_nums_lower_terminal_us[] = { \ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ 1, 1, 1, 1, 1, 1, 1, 1, 1, \ 0, 1, 1, 1, 1, 1, 1, 1, 1, \ - 0, 1, 1, 1, 1 \ + 0, 1, 1 \ }; /* Layer: Uppercase letters - generated from upper */ @@ -62,7 +72,7 @@ static const char * const keycaps_upper_terminal_us[] = { \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, "" \ + "1#", " ", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ @@ -70,7 +80,17 @@ static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_switchers_upper_terminal_us = 2; + +static const int switcher_idxs_upper_terminal_us[] = { \ + 25, 34 \ +}; + +static const int switcher_dests_upper_terminal_us[] = { \ + 1, 2 \ }; static const int num_scancodes_upper_terminal_us = 5; @@ -80,7 +100,7 @@ static const int scancodes_upper_terminal_us[] = { \ KEY_LEFTSHIFT, KEY_Q, KEY_LEFTSHIFT, KEY_W, KEY_LEFTSHIFT, KEY_E, KEY_LEFTSHIFT, KEY_R, KEY_LEFTSHIFT, KEY_T, KEY_LEFTSHIFT, KEY_Y, KEY_LEFTSHIFT, KEY_U, KEY_LEFTSHIFT, KEY_I, KEY_LEFTSHIFT, KEY_O, KEY_LEFTSHIFT, KEY_P, \ KEY_LEFTSHIFT, KEY_A, KEY_LEFTSHIFT, KEY_S, KEY_LEFTSHIFT, KEY_D, KEY_LEFTSHIFT, KEY_F, KEY_LEFTSHIFT, KEY_G, KEY_LEFTSHIFT, KEY_H, KEY_LEFTSHIFT, KEY_J, KEY_LEFTSHIFT, KEY_K, KEY_LEFTSHIFT, KEY_L, \ KEY_LEFTSHIFT, KEY_Z, KEY_LEFTSHIFT, KEY_X, KEY_LEFTSHIFT, KEY_C, KEY_LEFTSHIFT, KEY_V, KEY_LEFTSHIFT, KEY_B, KEY_LEFTSHIFT, KEY_N, KEY_LEFTSHIFT, KEY_M, KEY_BACKSPACE, \ - KEY_LEFT, KEY_SPACE, KEY_RIGHT, KEY_ENTER \ + KEY_SPACE, KEY_ENTER \ }; static const int scancode_idxs_upper_terminal_us[] = { \ @@ -88,7 +108,7 @@ static const int scancode_idxs_upper_terminal_us[] = { \ 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, \ 26, 28, 30, 32, 34, 36, 38, 40, 42, \ -1, 44, 46, 48, 50, 52, 54, 56, 58, \ - -1, 59, 60, 61, 62 \ + -1, 59, 60 \ }; static const int scancode_nums_upper_terminal_us[] = { \ @@ -96,7 +116,7 @@ static const int scancode_nums_upper_terminal_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 0, 2, 2, 2, 2, 2, 2, 2, 1, \ - 0, 1, 1, 1, 1 \ + 0, 1, 1 \ }; /* Layer: Numbers / symbols - generated from numbers */ @@ -106,7 +126,7 @@ static const char * const keycaps_numbers_terminal_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \ ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ + "abc", " ", ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ @@ -114,7 +134,17 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_switchers_numbers_terminal_us = 1; + +static const int switcher_idxs_numbers_terminal_us[] = { \ + 34 \ +}; + +static const int switcher_dests_numbers_terminal_us[] = { \ + 0 \ }; static const int num_scancodes_numbers_terminal_us = 5; @@ -124,7 +154,7 @@ static const int scancodes_numbers_terminal_us[] = { \ KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, \ KEY_LEFTSHIFT, KEY_8, KEY_LEFTSHIFT, KEY_3, KEY_LEFTSHIFT, KEY_4, KEY_LEFTSHIFT, KEY_QUESTION, KEY_LEFTSHIFT, KEY_7, KEY_MINUS, KEY_LEFTSHIFT, KEY_MINUS, KEY_LEFTSHIFT, KEY_EQUAL, KEY_LEFTSHIFT, KEY_9, KEY_LEFTSHIFT, KEY_0, \ KEY_COMMA, KEY_LEFTSHIFT, KEY_APOSTROPHE, KEY_APOSTROPHE, KEY_LEFTSHIFT, KEY_SEMICOLON, KEY_SEMICOLON, KEY_LEFTSHIFT, KEY_1, KEY_QUESTION, KEY_BACKSPACE, \ - KEY_LEFT, KEY_SPACE, KEY_RIGHT, KEY_DOT, KEY_ENTER \ + KEY_SPACE, KEY_DOT, KEY_ENTER \ }; static const int scancode_idxs_numbers_terminal_us[] = { \ @@ -132,7 +162,7 @@ static const int scancode_idxs_numbers_terminal_us[] = { \ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \ 16, 18, 20, 22, 24, 26, 27, 29, 31, 33, \ 35, 36, 38, 39, 41, 42, 44, 45, \ - -1, 46, 47, 48, 49, 50 \ + -1, 46, 47, 48 \ }; static const int scancode_nums_numbers_terminal_us[] = { \ @@ -140,7 +170,7 @@ static const int scancode_nums_numbers_terminal_us[] = { \ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, \ 1, 2, 1, 2, 1, 2, 1, 1, \ - 0, 1, 1, 1, 1, 1 \ + 0, 1, 1, 1 \ }; /** @@ -154,6 +184,9 @@ const sq2lv_layout_t sq2lv_layouts[] = { { .keycaps = keycaps_lower_terminal_us, .attributes = attributes_lower_terminal_us, + .num_switchers = num_switchers_lower_terminal_us, + .switcher_idxs = switcher_idxs_lower_terminal_us, + .switcher_dests = switcher_dests_lower_terminal_us, .num_scancodes = num_scancodes_lower_terminal_us, .scancodes = scancodes_lower_terminal_us, .scancode_idxs = scancode_idxs_lower_terminal_us, @@ -162,6 +195,9 @@ const sq2lv_layout_t sq2lv_layouts[] = { { .keycaps = keycaps_upper_terminal_us, .attributes = attributes_upper_terminal_us, + .num_switchers = num_switchers_upper_terminal_us, + .switcher_idxs = switcher_idxs_upper_terminal_us, + .switcher_dests = switcher_dests_upper_terminal_us, .num_scancodes = num_scancodes_upper_terminal_us, .scancodes = scancodes_upper_terminal_us, .scancode_idxs = scancode_idxs_upper_terminal_us, @@ -170,6 +206,9 @@ const sq2lv_layout_t sq2lv_layouts[] = { { .keycaps = keycaps_numbers_terminal_us, .attributes = attributes_numbers_terminal_us, + .num_switchers = num_switchers_numbers_terminal_us, + .switcher_idxs = switcher_idxs_numbers_terminal_us, + .switcher_dests = switcher_dests_numbers_terminal_us, .num_scancodes = num_scancodes_numbers_terminal_us, .scancodes = scancodes_numbers_terminal_us, .scancode_idxs = scancode_idxs_numbers_terminal_us, diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 1fe044e..c999de5 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -26,6 +26,12 @@ typedef struct { const char ** const keycaps; /* Button matrix attributes */ const lv_btnmatrix_ctrl_t * const attributes; + /* Number of buttons that trigger a layer switch */ + const int num_switchers; + /* Button indexes that trigger a layer switch */ + const int * const switcher_idxs; + /* Indexes of layers to jump to when triggering layer switch buttons */ + const int * const switcher_dests; /* Total number of scancodes */ const int const num_scancodes; /* Flat array of scancodes */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index ed209d5..2d119c2 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -23,7 +23,17 @@ static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_switchers_lower_us = 2; + +static const int switcher_idxs_lower_us[] = { \ + 19, 28 \ +}; + +static const int switcher_dests_lower_us[] = { \ + 1, 2 \ }; /* Layer: Uppercase letters - generated from upper */ @@ -39,7 +49,17 @@ static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_switchers_upper_us = 2; + +static const int switcher_idxs_upper_us[] = { \ + 19, 28 \ +}; + +static const int switcher_dests_upper_us[] = { \ + 1, 2 \ }; /* Layer: Numbers / symbols - generated from numbers */ @@ -55,7 +75,17 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_switchers_numbers_us = 1; + +static const int switcher_idxs_numbers_us[] = { \ + 28 \ +}; + +static const int switcher_dests_numbers_us[] = { \ + 0 \ }; /** @@ -68,15 +98,24 @@ const sq2lv_layout_t sq2lv_layouts[] = { .layers = (sq2lv_layer_t[]){ { .keycaps = keycaps_lower_us, - .attributes = attributes_lower_us + .attributes = attributes_lower_us, + .num_switchers = num_switchers_lower_us, + .switcher_idxs = switcher_idxs_lower_us, + .switcher_dests = switcher_dests_lower_us }, { .keycaps = keycaps_upper_us, - .attributes = attributes_upper_us + .attributes = attributes_upper_us, + .num_switchers = num_switchers_upper_us, + .switcher_idxs = switcher_idxs_upper_us, + .switcher_dests = switcher_dests_upper_us }, { .keycaps = keycaps_numbers_us, - .attributes = attributes_numbers_us + .attributes = attributes_numbers_us, + .num_switchers = num_switchers_numbers_us, + .switcher_idxs = switcher_idxs_numbers_us, + .switcher_dests = switcher_dests_numbers_us } }, .num_layers = 3 diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 540ecdd..d68141f 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -26,14 +26,12 @@ typedef struct { const char ** const keycaps; /* Button matrix attributes */ const lv_btnmatrix_ctrl_t * const attributes; - /* Total number of scancodes */ - const int const num_scancodes; - /* Flat array of scancodes */ - const int * const scancodes; - /* Start index in scancodes array for key cap */ - const int * const scancode_idxs; - /* Number of scancodes for key cap */ - const int * const scancode_nums; + /* Number of buttons that trigger a layer switch */ + const int num_switchers; + /* Button indexes that trigger a layer switch */ + const int * const switcher_idxs; + /* Indexes of layers to jump to when triggering layer switch buttons */ + const int * const switcher_dests; } sq2lv_layer_t; /* Layouts */ diff --git a/regenerate-examples.sh b/regenerate-examples.sh index 91132dc..a84c978 100755 --- a/regenerate-examples.sh +++ b/regenerate-examples.sh @@ -21,7 +21,8 @@ pipenv install pipenv run python squeek2lvgl.py \ --input us.yaml \ - --output examples/us + --output examples/us \ + --surround-space-with-arrows pipenv run python squeek2lvgl.py \ --input terminal/us.yaml \ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 8336773..77cba59 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -34,38 +34,6 @@ outfile_h = 'sq2lv_layouts.h' repository_url = 'https://gitlab.gnome.org/World/Phosh/squeekboard.git' rel_layouts_dir = 'data/keyboards' -typedef_layer_t = [ - 'typedef struct {', - ' /* Key caps */', - ' const char ** const keycaps;', - ' /* Button matrix attributes */', - ' const lv_btnmatrix_ctrl_t * const attributes;', - # ' /* Number of buttons that trigger a layer switch */', - # ' const int num_triggers;', - # ' /* Button indexes that trigger a layer switch */', - # ' const int * const trigger_idxs;', - # ' /* Indexes of layers to jump to when hitting trigger */', - # ' const int * const trigger_targets;', - ' /* Total number of scancodes */', - ' const int const num_scancodes;', - ' /* Flat array of scancodes */', - ' const int * const scancodes;', - ' /* Start index in scancodes array for key cap */', - ' const int * const scancode_idxs;', - ' /* Number of scancodes for key cap */', - ' const int * const scancode_nums;', - '} sq2lv_layer_t;' -] - -typedef_layout_t = [ - 'typedef struct {', - ' /* Layers array */', - ' const sq2lv_layer_t * const layers;', - ' /* Total number of layers */', - ' const int num_layers;', - '} sq2lv_layout_t;' -] - ### # General helpers @@ -95,9 +63,12 @@ def parse_arguments(): parser.add_argument('--input', dest='input', action='append', required=True, help='squeekboard layout to ' + 'use as input for generation. Has to be a YAML file path relative to data/keyboards. ' + 'Can be specified multiple times.') + parser.add_argument('--surround-space-with-arrows', action='store_true', dest='arrows_around_space', + help='insert left / right arrow before / after space key') parser.add_argument('--generate-scancodes', action='store_true', dest='generate_scancodes', help='also ' + 'generate scancode tables (only works for US layout currently)') - parser.add_argument('--output', dest='output', type=str, help='output directory for generated files') + parser.add_argument('--output', dest='output', type=str, required=True, help='output directory for generated ' + + 'files') args = parser.parse_args() if not args.output or not os.path.isdir(args.output): @@ -114,7 +85,7 @@ def clone_squeekboard_repo(destination): git.Repo.clone_from(repository_url, destination, depth=1) -def load_yaml(rel_path): +def load_yaml(layouts_dir, rel_path): """ Load a YAML file and return its dictionary representation. rel_path -- path of the YAML file relative to the layouts root directory @@ -241,7 +212,7 @@ class SourceFileBuilder(object): return self def add_array(self, static, type, identifier, values, row_terminator, array_terminator): - """Add a C array and return the builder. + """Add a row-based C array and return the builder. static -- True if the variable is static type -- variable type @@ -263,6 +234,17 @@ class SourceFileBuilder(object): self.add_line('};') return self + def add_flat_array(self, static, type, identifier, values, array_terminator): + """Add a flat C array and return the builder. + + static -- True if the variable is static + type -- variable type + identifier -- variable identifier + values -- list of values, + array_terminator -- element to append after the last element + """ + return self.add_array(static, type, identifier, [values], '', array_terminator) + ### # Layout processing @@ -347,12 +329,12 @@ keycap_for_key = { 'show_numbers': '1#', 'show_numbers_from_symbols': '1#', 'show_symbols': None, - 'space': ['LV_SYMBOL_LEFT', ' ', 'LV_SYMBOL_RIGHT'], + 'space': ' ', 'Return': 'LV_SYMBOL_OK', } def key_to_keycap(key, view_id, layout_id): - """Return the list of keycaps for a key + """Return the keycap for a key key -- the key view_id -- ID of the view the key appears on @@ -366,11 +348,7 @@ def key_to_keycap(key, view_id, layout_id): keycap = keycap[layout_id] else: keycap = None - if not keycap: - return [] - if isinstance(keycap, list): - return keycap - return [keycap] + return keycap def key_to_attributes(key, data_buttons): @@ -500,34 +478,73 @@ def keycap_to_scancodes(keycap): return scancodes_for_keycap[keycap] -def get_keycaps_attrs_scancodes(layout_id, view_id, data_views, data_buttons, include_scancodes): - """Return keycaps, LVGL button attributes and scancodes for a view +def get_keycaps_attrs_switchers_scancodes(args, layout_id, view_id, data_views, data_buttons): + """Return keycaps, LVGL button attributes, layer switching key indexes, layer switching key + destinations and scancodes for a view + args -- Commandline arguments layout_id -- ID of the layout view_id -- ID of the view data_views -- the "views" object from the layout's YAML file data_buttons -- the "buttons" object from the layout's YAML file - include_scancodes -- True if scancodes should be included """ keycaps = [] attrs = [] + switcher_idxs = [] + switcher_dests = [] scancodes = [] + idx = 0 + for row in data_views[view_id]: keycaps_in_row = [] attrs_in_row = [] scancodes_in_row = [] - for key in row.split(): - for keycap in key_to_keycap(key, view_id, layout_id): - keycaps_in_row.append(keycap_to_c_value(keycap)) - attrs_in_row.append(key_to_attributes(key, data_buttons)) - if include_scancodes: - scancodes_in_row.append(keycap_to_scancodes(keycap)) + + keys = row.split() + + if args.arrows_around_space: + space_idx = None + try: + space_idx = keys.index('space') + except ValueError: + pass + if space_idx != None: + keys.insert(space_idx, '←') + keys.insert(space_idx + 2, '→') + + + for key in keys: + keycap = key_to_keycap(key, view_id, layout_id) + if not keycap: + continue + + keycaps_in_row.append(keycap_to_c_value(keycap)) + attrs_in_row.append(key_to_attributes(key, data_buttons)) + + if key in data_buttons and 'action' in data_buttons[key]: + action = data_buttons[key]['action'] + dest = None + + if 'set_view' in action: + dest = action['set_view'] + elif 'locking' in action and 'lock_view' in action['locking']: + dest = action['locking']['lock_view'] + + if dest: + switcher_idxs.append(idx) + switcher_dests.append(dest) + + if args.generate_scancodes: + scancodes_in_row.append(keycap_to_scancodes(keycap)) + + idx += 1 + keycaps.append(keycaps_in_row) attrs.append(attrs_in_row) scancodes.append(scancodes_in_row) - return keycaps, attrs, scancodes + return keycaps, attrs, switcher_idxs, switcher_dests, scancodes def flatten_scancodes(scancodes): @@ -590,7 +607,7 @@ if __name__ == '__main__': layout_id, _ = os.path.splitext(file) layout_identifier = layout_id_to_c_identifier(layout_id) - data = load_yaml(file) + data = load_yaml(layouts_dir, file) data_views = data['views'] data_buttons = data['buttons'] if 'buttons' in data else {} @@ -601,6 +618,8 @@ if __name__ == '__main__': layer_identifiers = [] + view_ids = [view_id for view_id in data_views if view_id_to_layer_name(view_id) != None] + for view_id in data_views: layer_name = view_id_to_layer_name(view_id) if not layer_name: @@ -613,13 +632,27 @@ if __name__ == '__main__': c_builder.add_subsection_comment(f'Layer: {layer_name} - generated from {view_id}') c_builder.add_line() - keycaps, attrs, scancodes = get_keycaps_attrs_scancodes(layout_id, view_id, data_views, data_buttons, args.generate_scancodes) + keycaps, attrs, switcher_idxs, switcher_dests, scancodes = get_keycaps_attrs_switchers_scancodes( + args, layout_id, view_id, data_views, data_buttons) + + for dest in switcher_dests: + if dest not in view_ids: + die(f'Unhandled layer switch destination {dest}') + switcher_dests = [view_ids.index(d) for d in switcher_dests if d in view_ids] c_builder.add_array(True, 'const char * const', f'keycaps_{layer_identifier}', keycaps, '"\\n"', '""') c_builder.add_line() c_builder.add_array(True, 'const lv_btnmatrix_ctrl_t', f'attributes_{layer_identifier}', attrs, '', '') c_builder.add_line() + + c_builder.add_line(f'static const int num_switchers_{layer_identifier} = {len(switcher_idxs)};') + c_builder.add_line() + c_builder.add_flat_array(True, 'const int', f'switcher_idxs_{layer_identifier}', switcher_idxs, '') + c_builder.add_line() + c_builder.add_flat_array(True, 'const int', f'switcher_dests_{layer_identifier}', switcher_dests, '') + c_builder.add_line() + if args.generate_scancodes: scancodes_flat, scancode_idxs, scancode_nums = flatten_scancodes(scancodes) @@ -647,11 +680,36 @@ if __name__ == '__main__': h_builder.add_line() h_builder.add_line('/* Layout type */') - h_builder.add_lines(typedef_layout_t) + h_builder.add_line('typedef struct {') + h_builder.add_line(' /* Layers array */') + h_builder.add_line(' const sq2lv_layer_t * const layers;') + h_builder.add_line(' /* Total number of layers */') + h_builder.add_line(' const int num_layers;') + h_builder.add_line('} sq2lv_layout_t;') h_builder.add_line() h_builder.add_line('/* Layer type */') - h_builder.add_lines(typedef_layer_t) + h_builder.add_line('typedef struct {') + h_builder.add_line(' /* Key caps */') + h_builder.add_line(' const char ** const keycaps;') + h_builder.add_line(' /* Button matrix attributes */') + h_builder.add_line(' const lv_btnmatrix_ctrl_t * const attributes;') + h_builder.add_line(' /* Number of buttons that trigger a layer switch */') + h_builder.add_line(' const int num_switchers;') + h_builder.add_line(' /* Button indexes that trigger a layer switch */') + h_builder.add_line(' const int * const switcher_idxs;') + h_builder.add_line(' /* Indexes of layers to jump to when triggering layer switch buttons */') + h_builder.add_line(' const int * const switcher_dests;') + if args.generate_scancodes: + h_builder.add_line(' /* Total number of scancodes */') + h_builder.add_line(' const int const num_scancodes;') + h_builder.add_line(' /* Flat array of scancodes */') + h_builder.add_line(' const int * const scancodes;') + h_builder.add_line(' /* Start index in scancodes array for key cap */') + h_builder.add_line(' const int * const scancode_idxs;') + h_builder.add_line(' /* Number of scancodes for key cap */') + h_builder.add_line(' const int * const scancode_nums;') + h_builder.add_line('} sq2lv_layer_t;') h_builder.add_line() h_builder.add_line('/* Layouts */') @@ -672,7 +730,7 @@ if __name__ == '__main__': c_builder.add_line(' .layers = (sq2lv_layer_t[]){') for j, identifier in enumerate(layout['layer_identifiers']): c_builder.add_line(' {') - fields = ['keycaps', 'attributes'] + fields = ['keycaps', 'attributes', 'num_switchers', 'switcher_idxs', 'switcher_dests'] if args.generate_scancodes: fields += ['num_scancodes', 'scancodes', 'scancode_idxs', 'scancode_nums'] for k, field in enumerate(fields): From 198219e536a06f9d0e02cb73b305f00966f36650 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 20:45:03 +0200 Subject: [PATCH 06/46] Fix LVGL include path --- examples/us-terminal-with-scancodes/sq2lv_layouts.h | 2 +- examples/us/sq2lv_layouts.h | 2 +- squeek2lvgl.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index c999de5..79681b9 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -5,7 +5,7 @@ #ifndef SQ2LV_LAYOUTS_H #define SQ2LV_LAYOUTS_H -#include "../lvgl/lvgl.h" +#include "lvgl/lvgl.h" /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index d68141f..49d3abc 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -5,7 +5,7 @@ #ifndef SQ2LV_LAYOUTS_H #define SQ2LV_LAYOUTS_H -#include "../lvgl/lvgl.h" +#include "lvgl/lvgl.h" /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 77cba59..6a02dca 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -593,7 +593,7 @@ if __name__ == '__main__': c_builder.add_line() h_builder = SourceFileBuilder() - h_builder.add_include('../lvgl/lvgl.h') + h_builder.add_include('lvgl/lvgl.h') h_builder.add_line() layouts = [] From 025caee16217fedf8379ea513531c496a06c1bc2 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 20:47:42 +0200 Subject: [PATCH 07/46] Swap order of typedefs --- .../us-terminal-with-scancodes/sq2lv_layouts.h | 16 ++++++++-------- examples/us/sq2lv_layouts.h | 16 ++++++++-------- squeek2lvgl.py | 18 +++++++++--------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 79681b9..db238fb 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -12,14 +12,6 @@ typedef enum { SQ2LV_LAYOUT_TERMINAL_US = 0 } sq2lv_layout_id_t; -/* Layout type */ -typedef struct { - /* Layers array */ - const sq2lv_layer_t * const layers; - /* Total number of layers */ - const int num_layers; -} sq2lv_layout_t; - /* Layer type */ typedef struct { /* Key caps */ @@ -42,6 +34,14 @@ typedef struct { const int * const scancode_nums; } sq2lv_layer_t; +/* Layout type */ +typedef struct { + /* Layers array */ + const sq2lv_layer_t * const layers; + /* Total number of layers */ + const int num_layers; +} sq2lv_layout_t; + /* Layouts */ extern const sq2lv_layout_t sq2lv_layouts[]; extern const int sq2lv_num_layouts; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 49d3abc..d5c070d 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -12,14 +12,6 @@ typedef enum { SQ2LV_LAYOUT_US = 0 } sq2lv_layout_id_t; -/* Layout type */ -typedef struct { - /* Layers array */ - const sq2lv_layer_t * const layers; - /* Total number of layers */ - const int num_layers; -} sq2lv_layout_t; - /* Layer type */ typedef struct { /* Key caps */ @@ -34,6 +26,14 @@ typedef struct { const int * const switcher_dests; } sq2lv_layer_t; +/* Layout type */ +typedef struct { + /* Layers array */ + const sq2lv_layer_t * const layers; + /* Total number of layers */ + const int num_layers; +} sq2lv_layout_t; + /* Layouts */ extern const sq2lv_layout_t sq2lv_layouts[]; extern const int sq2lv_num_layouts; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 6a02dca..14b6b89 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -679,15 +679,6 @@ if __name__ == '__main__': h_builder.add_line('} sq2lv_layout_id_t;') h_builder.add_line() - h_builder.add_line('/* Layout type */') - h_builder.add_line('typedef struct {') - h_builder.add_line(' /* Layers array */') - h_builder.add_line(' const sq2lv_layer_t * const layers;') - h_builder.add_line(' /* Total number of layers */') - h_builder.add_line(' const int num_layers;') - h_builder.add_line('} sq2lv_layout_t;') - h_builder.add_line() - h_builder.add_line('/* Layer type */') h_builder.add_line('typedef struct {') h_builder.add_line(' /* Key caps */') @@ -712,6 +703,15 @@ if __name__ == '__main__': h_builder.add_line('} sq2lv_layer_t;') h_builder.add_line() + h_builder.add_line('/* Layout type */') + h_builder.add_line('typedef struct {') + h_builder.add_line(' /* Layers array */') + h_builder.add_line(' const sq2lv_layer_t * const layers;') + h_builder.add_line(' /* Total number of layers */') + h_builder.add_line(' const int num_layers;') + h_builder.add_line('} sq2lv_layout_t;') + h_builder.add_line() + h_builder.add_line('/* Layouts */') h_builder.add_line('extern const sq2lv_layout_t sq2lv_layouts[];') h_builder.add_line('extern const int sq2lv_num_layouts;') From fc54baa34e0d8034a1c2d860bc2ae8e889f478eb Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 20:48:53 +0200 Subject: [PATCH 08/46] Remove duplicate const --- examples/us-terminal-with-scancodes/sq2lv_layouts.h | 2 +- squeek2lvgl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index db238fb..2fb8052 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -25,7 +25,7 @@ typedef struct { /* Indexes of layers to jump to when triggering layer switch buttons */ const int * const switcher_dests; /* Total number of scancodes */ - const int const num_scancodes; + const int num_scancodes; /* Flat array of scancodes */ const int * const scancodes; /* Start index in scancodes array for key cap */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 14b6b89..06987bf 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -693,7 +693,7 @@ if __name__ == '__main__': h_builder.add_line(' const int * const switcher_dests;') if args.generate_scancodes: h_builder.add_line(' /* Total number of scancodes */') - h_builder.add_line(' const int const num_scancodes;') + h_builder.add_line(' const int num_scancodes;') h_builder.add_line(' /* Flat array of scancodes */') h_builder.add_line(' const int * const scancodes;') h_builder.add_line(' /* Start index in scancodes array for key cap */') From 17e9b826046e1273913210b17f03a2e897f07bab Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 21:16:11 +0200 Subject: [PATCH 09/46] Store layers in separate array --- .../sq2lv_layouts.c | 78 ++++++++++--------- .../sq2lv_layouts.h | 4 +- examples/us/sq2lv_layouts.c | 54 +++++++------ examples/us/sq2lv_layouts.h | 4 +- squeek2lvgl.py | 36 +++++---- 5 files changed, 97 insertions(+), 79 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index e82b8a3..8906896 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -173,6 +173,46 @@ static const int scancode_nums_numbers_terminal_us[] = { \ 0, 1, 1, 1 \ }; +/* Layer array */ + +static const int num_layers_terminal_us = 3; + +static const sq2lv_layer_t layers_terminal_us[] = { + { + .keycaps = keycaps_lower_terminal_us, + .attributes = attributes_lower_terminal_us, + .num_switchers = num_switchers_lower_terminal_us, + .switcher_idxs = switcher_idxs_lower_terminal_us, + .switcher_dests = switcher_dests_lower_terminal_us, + .num_scancodes = num_scancodes_lower_terminal_us, + .scancodes = scancodes_lower_terminal_us, + .scancode_idxs = scancode_idxs_lower_terminal_us, + .scancode_nums = scancode_nums_lower_terminal_us + }, + { + .keycaps = keycaps_upper_terminal_us, + .attributes = attributes_upper_terminal_us, + .num_switchers = num_switchers_upper_terminal_us, + .switcher_idxs = switcher_idxs_upper_terminal_us, + .switcher_dests = switcher_dests_upper_terminal_us, + .num_scancodes = num_scancodes_upper_terminal_us, + .scancodes = scancodes_upper_terminal_us, + .scancode_idxs = scancode_idxs_upper_terminal_us, + .scancode_nums = scancode_nums_upper_terminal_us + }, + { + .keycaps = keycaps_numbers_terminal_us, + .attributes = attributes_numbers_terminal_us, + .num_switchers = num_switchers_numbers_terminal_us, + .switcher_idxs = switcher_idxs_numbers_terminal_us, + .switcher_dests = switcher_dests_numbers_terminal_us, + .num_scancodes = num_scancodes_numbers_terminal_us, + .scancodes = scancodes_numbers_terminal_us, + .scancode_idxs = scancode_idxs_numbers_terminal_us, + .scancode_nums = scancode_nums_numbers_terminal_us + } +}; + /** * Public interface **/ @@ -180,42 +220,8 @@ static const int scancode_nums_numbers_terminal_us[] = { \ const sq2lv_layout_t sq2lv_layouts[] = { /* US English (Terminal) */ { - .layers = (sq2lv_layer_t[]){ - { - .keycaps = keycaps_lower_terminal_us, - .attributes = attributes_lower_terminal_us, - .num_switchers = num_switchers_lower_terminal_us, - .switcher_idxs = switcher_idxs_lower_terminal_us, - .switcher_dests = switcher_dests_lower_terminal_us, - .num_scancodes = num_scancodes_lower_terminal_us, - .scancodes = scancodes_lower_terminal_us, - .scancode_idxs = scancode_idxs_lower_terminal_us, - .scancode_nums = scancode_nums_lower_terminal_us - }, - { - .keycaps = keycaps_upper_terminal_us, - .attributes = attributes_upper_terminal_us, - .num_switchers = num_switchers_upper_terminal_us, - .switcher_idxs = switcher_idxs_upper_terminal_us, - .switcher_dests = switcher_dests_upper_terminal_us, - .num_scancodes = num_scancodes_upper_terminal_us, - .scancodes = scancodes_upper_terminal_us, - .scancode_idxs = scancode_idxs_upper_terminal_us, - .scancode_nums = scancode_nums_upper_terminal_us - }, - { - .keycaps = keycaps_numbers_terminal_us, - .attributes = attributes_numbers_terminal_us, - .num_switchers = num_switchers_numbers_terminal_us, - .switcher_idxs = switcher_idxs_numbers_terminal_us, - .switcher_dests = switcher_dests_numbers_terminal_us, - .num_scancodes = num_scancodes_numbers_terminal_us, - .scancodes = scancodes_numbers_terminal_us, - .scancode_idxs = scancode_idxs_numbers_terminal_us, - .scancode_nums = scancode_nums_numbers_terminal_us - } - }, - .num_layers = 3 + .num_layers = num_layers_terminal_us, + .layers = layers_terminal_us } }; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 2fb8052..8b0ec30 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -36,10 +36,10 @@ typedef struct { /* Layout type */ typedef struct { - /* Layers array */ - const sq2lv_layer_t * const layers; /* Total number of layers */ const int num_layers; + /* Layers array */ + const sq2lv_layer_t * const layers; } sq2lv_layout_t; /* Layouts */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 2d119c2..57267a1 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -88,6 +88,34 @@ static const int switcher_dests_numbers_us[] = { \ 0 \ }; +/* Layer array */ + +static const int num_layers_us = 3; + +static const sq2lv_layer_t layers_us[] = { + { + .keycaps = keycaps_lower_us, + .attributes = attributes_lower_us, + .num_switchers = num_switchers_lower_us, + .switcher_idxs = switcher_idxs_lower_us, + .switcher_dests = switcher_dests_lower_us + }, + { + .keycaps = keycaps_upper_us, + .attributes = attributes_upper_us, + .num_switchers = num_switchers_upper_us, + .switcher_idxs = switcher_idxs_upper_us, + .switcher_dests = switcher_dests_upper_us + }, + { + .keycaps = keycaps_numbers_us, + .attributes = attributes_numbers_us, + .num_switchers = num_switchers_numbers_us, + .switcher_idxs = switcher_idxs_numbers_us, + .switcher_dests = switcher_dests_numbers_us + } +}; + /** * Public interface **/ @@ -95,30 +123,8 @@ static const int switcher_dests_numbers_us[] = { \ const sq2lv_layout_t sq2lv_layouts[] = { /* US English */ { - .layers = (sq2lv_layer_t[]){ - { - .keycaps = keycaps_lower_us, - .attributes = attributes_lower_us, - .num_switchers = num_switchers_lower_us, - .switcher_idxs = switcher_idxs_lower_us, - .switcher_dests = switcher_dests_lower_us - }, - { - .keycaps = keycaps_upper_us, - .attributes = attributes_upper_us, - .num_switchers = num_switchers_upper_us, - .switcher_idxs = switcher_idxs_upper_us, - .switcher_dests = switcher_dests_upper_us - }, - { - .keycaps = keycaps_numbers_us, - .attributes = attributes_numbers_us, - .num_switchers = num_switchers_numbers_us, - .switcher_idxs = switcher_idxs_numbers_us, - .switcher_dests = switcher_dests_numbers_us - } - }, - .num_layers = 3 + .num_layers = num_layers_us, + .layers = layers_us } }; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index d5c070d..f634d77 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -28,10 +28,10 @@ typedef struct { /* Layout type */ typedef struct { - /* Layers array */ - const sq2lv_layer_t * const layers; /* Total number of layers */ const int num_layers; + /* Layers array */ + const sq2lv_layer_t * const layers; } sq2lv_layout_t; /* Layouts */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 06987bf..60b84ed 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -665,10 +665,25 @@ if __name__ == '__main__': c_builder.add_array(True, 'const int', f'scancode_nums_{layer_identifier}', scancode_nums, '', '') c_builder.add_line() + c_builder.add_subsection_comment(f'Layer array') + c_builder.add_line() + c_builder.add_line(f'static const int num_layers_{layout_identifier} = {len(layer_identifiers)};') + c_builder.add_line() + c_builder.add_line(f'static const sq2lv_layer_t layers_{layout_identifier}[] = ' + '{') + for i, identifier in enumerate(layer_identifiers): + c_builder.add_line(' {') + fields = ['keycaps', 'attributes', 'num_switchers', 'switcher_idxs', 'switcher_dests'] + if args.generate_scancodes: + fields += ['num_scancodes', 'scancodes', 'scancode_idxs', 'scancode_nums'] + for k, field in enumerate(fields): + c_builder.add_line(f' .{field} = {field}_{identifier}{comma_if_needed(fields, k)}') + c_builder.add_line(' }' + comma_if_needed(layer_identifiers, i)) + c_builder.add_line('};') + c_builder.add_line() + layouts.append({ 'name': layout_id_to_layout_name(layout_id), - 'identifier': layout_identifier, - 'layer_identifiers': layer_identifiers + 'identifier': layout_identifier }) h_builder.add_line('/* Layout IDs, values can be used as indexes into the sq2lv_layouts array */') @@ -705,10 +720,10 @@ if __name__ == '__main__': h_builder.add_line('/* Layout type */') h_builder.add_line('typedef struct {') - h_builder.add_line(' /* Layers array */') - h_builder.add_line(' const sq2lv_layer_t * const layers;') h_builder.add_line(' /* Total number of layers */') h_builder.add_line(' const int num_layers;') + h_builder.add_line(' /* Layers array */') + h_builder.add_line(' const sq2lv_layer_t * const layers;') h_builder.add_line('} sq2lv_layout_t;') h_builder.add_line() @@ -727,17 +742,8 @@ if __name__ == '__main__': for i, layout in enumerate(layouts): c_builder.add_line(' /* ' + layout['name'] + ' */') c_builder.add_line(' {') - c_builder.add_line(' .layers = (sq2lv_layer_t[]){') - for j, identifier in enumerate(layout['layer_identifiers']): - c_builder.add_line(' {') - fields = ['keycaps', 'attributes', 'num_switchers', 'switcher_idxs', 'switcher_dests'] - if args.generate_scancodes: - fields += ['num_scancodes', 'scancodes', 'scancode_idxs', 'scancode_nums'] - for k, field in enumerate(fields): - c_builder.add_line(f' .{field} = {field}_{identifier}{comma_if_needed(fields, k)}') - c_builder.add_line(' }' + comma_if_needed(layout['layer_identifiers'], j)) - c_builder.add_line(' },') - c_builder.add_line(' .num_layers = ' + str(len(layout['layer_identifiers']))) + c_builder.add_line(' .num_layers = num_layers_' + layout['identifier'] + ',') + c_builder.add_line(' .layers = layers_' + layout['identifier']) c_builder.add_line(' }' + comma_if_needed(layouts, i)) c_builder.add_line('};') c_builder.add_line() From ff723623655cf573ff1c0f3c41778c5dfbd83103 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 21:58:51 +0200 Subject: [PATCH 10/46] Correctly handle layer lockers --- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 2 +- examples/us/sq2lv_layouts.c | 2 +- squeek2lvgl.py | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 8906896..46450e6 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -90,7 +90,7 @@ static const int switcher_idxs_upper_terminal_us[] = { \ }; static const int switcher_dests_upper_terminal_us[] = { \ - 1, 2 \ + 0, 2 \ }; static const int num_scancodes_upper_terminal_us = 5; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 57267a1..e2fd834 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -59,7 +59,7 @@ static const int switcher_idxs_upper_us[] = { \ }; static const int switcher_dests_upper_us[] = { \ - 1, 2 \ + 0, 2 \ }; /* Layer: Numbers / symbols - generated from numbers */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 60b84ed..9c7d1e9 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -528,9 +528,11 @@ def get_keycaps_attrs_switchers_scancodes(args, layout_id, view_id, data_views, if 'set_view' in action: dest = action['set_view'] - elif 'locking' in action and 'lock_view' in action['locking']: - dest = action['locking']['lock_view'] - + elif 'locking' in action and 'lock_view' in action['locking'] and 'unlock_view' in action['locking']: + if action['locking']['lock_view'] == view_id: + dest = action['locking']['unlock_view'] + elif action['locking']['unlock_view'] == view_id: + dest = action['locking']['lock_view'] if dest: switcher_idxs.append(idx) switcher_dests.append(dest) From 4111119320f99a3490cd496919163c23501ed67b Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 12 Sep 2021 22:24:12 +0200 Subject: [PATCH 11/46] Add unique scancodes array --- .../sq2lv_layouts.c | 15 ++++++- .../sq2lv_layouts.h | 8 +++- examples/us/sq2lv_layouts.c | 4 +- examples/us/sq2lv_layouts.h | 4 +- squeek2lvgl.py | 44 ++++++++++++++----- 5 files changed, 56 insertions(+), 19 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 46450e6..9745742 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -217,6 +217,8 @@ static const sq2lv_layer_t layers_terminal_us[] = { * Public interface **/ +const int sq2lv_num_layouts = 1; + const sq2lv_layout_t sq2lv_layouts[] = { /* US English (Terminal) */ { @@ -225,7 +227,16 @@ const sq2lv_layout_t sq2lv_layouts[] = { } }; -const int sq2lv_num_layouts = 1; - const char * const sq2lv_layout_names = "US English (Terminal)"; + +const int sq2lv_num_unique_scancodes = 57; + +const int sq2lv_unique_scancodes[] = { + KEY_LEFTCTRL, KEY_LEFTALT, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_Q, KEY_W, KEY_E, KEY_R, + KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, KEY_A, KEY_S, KEY_D, KEY_F, + KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, + KEY_N, KEY_M, KEY_BACKSPACE, KEY_SPACE, KEY_ENTER, KEY_PAGEUP, KEY_PAGEDOWN, KEY_HOME, KEY_END, KEY_LEFTSHIFT, + KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, + KEY_QUESTION, KEY_MINUS, KEY_EQUAL, KEY_COMMA, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_DOT +}; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 8b0ec30..55ba35e 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -43,10 +43,14 @@ typedef struct { } sq2lv_layout_t; /* Layouts */ -extern const sq2lv_layout_t sq2lv_layouts[]; extern const int sq2lv_num_layouts; +extern const sq2lv_layout_t sq2lv_layouts[]; -/* Layout names (suitable for use in lv_dropdown_t */ +/* Layout names (suitable for use in lv_dropdown_t) */ extern const char * const sq2lv_layout_names; +/* Unique scancodes from all layout (suitable for setting up uinput devices) */ +extern const int sq2lv_num_unique_scancodes; +extern const int sq2lv_unique_scancodes[]; + #endif /* SQ2LV_LAYOUTS_H */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index e2fd834..b883c8f 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -120,6 +120,8 @@ static const sq2lv_layer_t layers_us[] = { * Public interface **/ +const int sq2lv_num_layouts = 1; + const sq2lv_layout_t sq2lv_layouts[] = { /* US English */ { @@ -128,7 +130,5 @@ const sq2lv_layout_t sq2lv_layouts[] = { } }; -const int sq2lv_num_layouts = 1; - const char * const sq2lv_layout_names = "US English"; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index f634d77..60880f0 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -35,10 +35,10 @@ typedef struct { } sq2lv_layout_t; /* Layouts */ -extern const sq2lv_layout_t sq2lv_layouts[]; extern const int sq2lv_num_layouts; +extern const sq2lv_layout_t sq2lv_layouts[]; -/* Layout names (suitable for use in lv_dropdown_t */ +/* Layout names (suitable for use in lv_dropdown_t) */ extern const char * const sq2lv_layout_names; #endif /* SQ2LV_LAYOUTS_H */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 9c7d1e9..749420b 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -171,7 +171,7 @@ class SourceFileBuilder(object): self.lines.insert(idx, '') self.lines.insert(idx + 1, f'#ifndef {macro}') self.lines.insert(idx + 2, f'#define {macro}') - self.add_lines(['', f'#endif /* {macro} */']) + self.add_lines([f'#endif /* {macro} */', '']) def _add_header_comment(self): """Add the generator header comment and return the builder. @@ -550,8 +550,8 @@ def get_keycaps_attrs_switchers_scancodes(args, layout_id, view_id, data_views, def flatten_scancodes(scancodes): - """Process a nested list of scancodes per key and return a flattened list, a list of starting indexes and a - list of scancode counts. + """Process a nested list of scancodes per row and key and return a flattened list of scancodes per row, + a list of starting indexes and a list of scancode counts. scancodes -- list (rows) of list (keys) of list (scancodes) of scancodes """ @@ -599,6 +599,7 @@ if __name__ == '__main__': h_builder.add_line() layouts = [] + unique_scancodes = {} with tempfile.TemporaryDirectory() as tmp: clone_squeekboard_repo(tmp) @@ -658,6 +659,10 @@ if __name__ == '__main__': if args.generate_scancodes: scancodes_flat, scancode_idxs, scancode_nums = flatten_scancodes(scancodes) + for scancodes_in_row in scancodes_flat: + for scancode in scancodes_in_row: + unique_scancodes[scancode] = True + c_builder.add_line(f'static const int num_scancodes_{layer_identifier} = {len(scancodes)};') c_builder.add_line() c_builder.add_array(True, 'const int', f'scancodes_{layer_identifier}', scancodes_flat, '', '') @@ -730,16 +735,26 @@ if __name__ == '__main__': h_builder.add_line() h_builder.add_line('/* Layouts */') - h_builder.add_line('extern const sq2lv_layout_t sq2lv_layouts[];') h_builder.add_line('extern const int sq2lv_num_layouts;') + h_builder.add_line('extern const sq2lv_layout_t sq2lv_layouts[];') h_builder.add_line() - h_builder.add_line('/* Layout names (suitable for use in lv_dropdown_t */') + h_builder.add_line('/* Layout names (suitable for use in lv_dropdown_t) */') h_builder.add_line('extern const char * const sq2lv_layout_names;') + h_builder.add_line() + + if args.generate_scancodes: + h_builder.add_line('/* Unique scancodes from all layout (suitable for setting up uinput devices) */') + h_builder.add_line('extern const int sq2lv_num_unique_scancodes;') + h_builder.add_line('extern const int sq2lv_unique_scancodes[];') + h_builder.add_line() c_builder.add_section_comment('Public interface') c_builder.add_line() + c_builder.add_line('const int sq2lv_num_layouts = ' + str(len(layouts)) + ';') + c_builder.add_line() + c_builder.add_line('const sq2lv_layout_t sq2lv_layouts[] = {') for i, layout in enumerate(layouts): c_builder.add_line(' /* ' + layout['name'] + ' */') @@ -750,16 +765,23 @@ if __name__ == '__main__': c_builder.add_line('};') c_builder.add_line() - c_builder.add_line('const int sq2lv_num_layouts = ' + str(len(layouts)) + ';') - c_builder.add_line() - names = [layout['name'] for layout in layouts] names = '\n ' + ' "\\n"\n '.join([f'"{name}"' for name in names]) c_builder.add_line(f'const char * const sq2lv_layout_names = {names};') + c_builder.add_line() + + if args.generate_scancodes: + c_builder.add_line(f'const int sq2lv_num_unique_scancodes = {len(unique_scancodes)};') + c_builder.add_line() + c_builder.add_line('const int sq2lv_unique_scancodes[] = {') + scancodes = list(unique_scancodes.keys()) + chunks = [scancodes[i:i + 10] for i in range(0, len(scancodes), 10)] + for i, chunk in enumerate(chunks): + joined = ', '.join(chunk) + c_builder.add_line(f' {joined}{comma_if_needed(chunks, i)}') + c_builder.add_line('};') + c_builder.add_line() h_builder.wrap_in_ifndef('SQ2LV_LAYOUTS_H') - c_builder.add_line() - h_builder.add_line() - write_files(c_builder.lines, h_builder.lines) \ No newline at end of file From 5f10b71d79e33b86c157c21b25575c46ca25c254 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 13 Sep 2021 09:29:37 +0200 Subject: [PATCH 12/46] Add total number of keys --- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 9 +++++++++ examples/us-terminal-with-scancodes/sq2lv_layouts.h | 2 ++ examples/us/sq2lv_layouts.c | 9 +++++++++ examples/us/sq2lv_layouts.h | 2 ++ squeek2lvgl.py | 6 +++++- 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 9745742..bb290cf 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -13,6 +13,8 @@ static const char * const name_terminal_us = "terminal/us"; /* Layer: Lowercase letters - generated from base */ +static const int num_keys_lower_terminal_us = 37; + static const char * const keycaps_lower_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ @@ -67,6 +69,8 @@ static const int scancode_nums_lower_terminal_us[] = { \ /* Layer: Uppercase letters - generated from upper */ +static const int num_keys_upper_terminal_us = 37; + static const char * const keycaps_upper_terminal_us[] = { \ "Ctrl", "Alt", "PgUp", "PgDn", "Home", "End", "\n", \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ @@ -121,6 +125,8 @@ static const int scancode_nums_upper_terminal_us[] = { \ /* Layer: Numbers / symbols - generated from numbers */ +static const int num_keys_numbers_terminal_us = 38; + static const char * const keycaps_numbers_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ @@ -179,6 +185,7 @@ static const int num_layers_terminal_us = 3; static const sq2lv_layer_t layers_terminal_us[] = { { + .num_keys = num_keys_lower_terminal_us, .keycaps = keycaps_lower_terminal_us, .attributes = attributes_lower_terminal_us, .num_switchers = num_switchers_lower_terminal_us, @@ -190,6 +197,7 @@ static const sq2lv_layer_t layers_terminal_us[] = { .scancode_nums = scancode_nums_lower_terminal_us }, { + .num_keys = num_keys_upper_terminal_us, .keycaps = keycaps_upper_terminal_us, .attributes = attributes_upper_terminal_us, .num_switchers = num_switchers_upper_terminal_us, @@ -201,6 +209,7 @@ static const sq2lv_layer_t layers_terminal_us[] = { .scancode_nums = scancode_nums_upper_terminal_us }, { + .num_keys = num_keys_numbers_terminal_us, .keycaps = keycaps_numbers_terminal_us, .attributes = attributes_numbers_terminal_us, .num_switchers = num_switchers_numbers_terminal_us, diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 55ba35e..674274b 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -14,6 +14,8 @@ typedef enum { /* Layer type */ typedef struct { + /* Number of keys */ + const int num_keys; /* Key caps */ const char ** const keycaps; /* Button matrix attributes */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index b883c8f..fe4f232 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -12,6 +12,8 @@ static const char * const name_us = "us"; /* Layer: Lowercase letters - generated from base */ +static const int num_keys_lower_us = 34; + static const char * const keycaps_lower_us[] = { \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ @@ -38,6 +40,8 @@ static const int switcher_dests_lower_us[] = { \ /* Layer: Uppercase letters - generated from upper */ +static const int num_keys_upper_us = 34; + static const char * const keycaps_upper_us[] = { \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ @@ -64,6 +68,8 @@ static const int switcher_dests_upper_us[] = { \ /* Layer: Numbers / symbols - generated from numbers */ +static const int num_keys_numbers_us = 34; + static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ @@ -94,6 +100,7 @@ static const int num_layers_us = 3; static const sq2lv_layer_t layers_us[] = { { + .num_keys = num_keys_lower_us, .keycaps = keycaps_lower_us, .attributes = attributes_lower_us, .num_switchers = num_switchers_lower_us, @@ -101,6 +108,7 @@ static const sq2lv_layer_t layers_us[] = { .switcher_dests = switcher_dests_lower_us }, { + .num_keys = num_keys_upper_us, .keycaps = keycaps_upper_us, .attributes = attributes_upper_us, .num_switchers = num_switchers_upper_us, @@ -108,6 +116,7 @@ static const sq2lv_layer_t layers_us[] = { .switcher_dests = switcher_dests_upper_us }, { + .num_keys = num_keys_numbers_us, .keycaps = keycaps_numbers_us, .attributes = attributes_numbers_us, .num_switchers = num_switchers_numbers_us, diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 60880f0..0ba6115 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -14,6 +14,8 @@ typedef enum { /* Layer type */ typedef struct { + /* Number of keys */ + const int num_keys; /* Key caps */ const char ** const keycaps; /* Button matrix attributes */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 749420b..7c23f35 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -643,6 +643,8 @@ if __name__ == '__main__': die(f'Unhandled layer switch destination {dest}') switcher_dests = [view_ids.index(d) for d in switcher_dests if d in view_ids] + c_builder.add_line(f'static const int num_keys_{layer_identifier} = {sum([len(row) for row in keycaps])};') + c_builder.add_line() c_builder.add_array(True, 'const char * const', f'keycaps_{layer_identifier}', keycaps, '"\\n"', '""') c_builder.add_line() c_builder.add_array(True, 'const lv_btnmatrix_ctrl_t', f'attributes_{layer_identifier}', attrs, '', '') @@ -679,7 +681,7 @@ if __name__ == '__main__': c_builder.add_line(f'static const sq2lv_layer_t layers_{layout_identifier}[] = ' + '{') for i, identifier in enumerate(layer_identifiers): c_builder.add_line(' {') - fields = ['keycaps', 'attributes', 'num_switchers', 'switcher_idxs', 'switcher_dests'] + fields = ['num_keys', 'keycaps', 'attributes', 'num_switchers', 'switcher_idxs', 'switcher_dests'] if args.generate_scancodes: fields += ['num_scancodes', 'scancodes', 'scancode_idxs', 'scancode_nums'] for k, field in enumerate(fields): @@ -703,6 +705,8 @@ if __name__ == '__main__': h_builder.add_line('/* Layer type */') h_builder.add_line('typedef struct {') + h_builder.add_line(' /* Number of keys */') + h_builder.add_line(' const int num_keys;') h_builder.add_line(' /* Key caps */') h_builder.add_line(' const char ** const keycaps;') h_builder.add_line(' /* Button matrix attributes */') From f578456d4711ad949735acf83f4513232f9925f3 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 13 Sep 2021 14:24:25 +0200 Subject: [PATCH 13/46] Add modifiers --- .../sq2lv_layouts.c | 24 +++++++++++++++++++ .../sq2lv_layouts.h | 4 ++++ examples/us/sq2lv_layouts.c | 24 +++++++++++++++++++ examples/us/sq2lv_layouts.h | 4 ++++ squeek2lvgl.py | 24 ++++++++++++++----- 5 files changed, 74 insertions(+), 6 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index bb290cf..d4c20bf 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -31,6 +31,12 @@ static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ }; +static const int num_modifiers_lower_terminal_us = 2; + +static const int modifier_idxs_lower_terminal_us[] = { \ + 0, 1 \ +}; + static const int num_switchers_lower_terminal_us = 2; static const int switcher_idxs_lower_terminal_us[] = { \ @@ -87,6 +93,12 @@ static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ }; +static const int num_modifiers_upper_terminal_us = 2; + +static const int modifier_idxs_upper_terminal_us[] = { \ + 0, 1 \ +}; + static const int num_switchers_upper_terminal_us = 2; static const int switcher_idxs_upper_terminal_us[] = { \ @@ -143,6 +155,12 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ }; +static const int num_modifiers_numbers_terminal_us = 2; + +static const int modifier_idxs_numbers_terminal_us[] = { \ + 0, 1 \ +}; + static const int num_switchers_numbers_terminal_us = 1; static const int switcher_idxs_numbers_terminal_us[] = { \ @@ -188,6 +206,8 @@ static const sq2lv_layer_t layers_terminal_us[] = { .num_keys = num_keys_lower_terminal_us, .keycaps = keycaps_lower_terminal_us, .attributes = attributes_lower_terminal_us, + .num_modifiers = num_modifiers_lower_terminal_us, + .modifier_idxs = modifier_idxs_lower_terminal_us, .num_switchers = num_switchers_lower_terminal_us, .switcher_idxs = switcher_idxs_lower_terminal_us, .switcher_dests = switcher_dests_lower_terminal_us, @@ -200,6 +220,8 @@ static const sq2lv_layer_t layers_terminal_us[] = { .num_keys = num_keys_upper_terminal_us, .keycaps = keycaps_upper_terminal_us, .attributes = attributes_upper_terminal_us, + .num_modifiers = num_modifiers_upper_terminal_us, + .modifier_idxs = modifier_idxs_upper_terminal_us, .num_switchers = num_switchers_upper_terminal_us, .switcher_idxs = switcher_idxs_upper_terminal_us, .switcher_dests = switcher_dests_upper_terminal_us, @@ -212,6 +234,8 @@ static const sq2lv_layer_t layers_terminal_us[] = { .num_keys = num_keys_numbers_terminal_us, .keycaps = keycaps_numbers_terminal_us, .attributes = attributes_numbers_terminal_us, + .num_modifiers = num_modifiers_numbers_terminal_us, + .modifier_idxs = modifier_idxs_numbers_terminal_us, .num_switchers = num_switchers_numbers_terminal_us, .switcher_idxs = switcher_idxs_numbers_terminal_us, .switcher_dests = switcher_dests_numbers_terminal_us, diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 674274b..e8cff27 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -20,6 +20,10 @@ typedef struct { const char ** const keycaps; /* Button matrix attributes */ const lv_btnmatrix_ctrl_t * const attributes; + /* Number of modifier keys */ + const int num_modifiers; + /* Button indexes of modifier keys */ + const int * const modifier_idxs; /* Number of buttons that trigger a layer switch */ const int num_switchers; /* Button indexes that trigger a layer switch */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index fe4f232..05ed3b8 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -28,6 +28,12 @@ static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ }; +static const int num_modifiers_lower_us = 0; + +static const int modifier_idxs_lower_us[] = { \ + \ +}; + static const int num_switchers_lower_us = 2; static const int switcher_idxs_lower_us[] = { \ @@ -56,6 +62,12 @@ static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ }; +static const int num_modifiers_upper_us = 0; + +static const int modifier_idxs_upper_us[] = { \ + \ +}; + static const int num_switchers_upper_us = 2; static const int switcher_idxs_upper_us[] = { \ @@ -84,6 +96,12 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ }; +static const int num_modifiers_numbers_us = 0; + +static const int modifier_idxs_numbers_us[] = { \ + \ +}; + static const int num_switchers_numbers_us = 1; static const int switcher_idxs_numbers_us[] = { \ @@ -103,6 +121,8 @@ static const sq2lv_layer_t layers_us[] = { .num_keys = num_keys_lower_us, .keycaps = keycaps_lower_us, .attributes = attributes_lower_us, + .num_modifiers = num_modifiers_lower_us, + .modifier_idxs = modifier_idxs_lower_us, .num_switchers = num_switchers_lower_us, .switcher_idxs = switcher_idxs_lower_us, .switcher_dests = switcher_dests_lower_us @@ -111,6 +131,8 @@ static const sq2lv_layer_t layers_us[] = { .num_keys = num_keys_upper_us, .keycaps = keycaps_upper_us, .attributes = attributes_upper_us, + .num_modifiers = num_modifiers_upper_us, + .modifier_idxs = modifier_idxs_upper_us, .num_switchers = num_switchers_upper_us, .switcher_idxs = switcher_idxs_upper_us, .switcher_dests = switcher_dests_upper_us @@ -119,6 +141,8 @@ static const sq2lv_layer_t layers_us[] = { .num_keys = num_keys_numbers_us, .keycaps = keycaps_numbers_us, .attributes = attributes_numbers_us, + .num_modifiers = num_modifiers_numbers_us, + .modifier_idxs = modifier_idxs_numbers_us, .num_switchers = num_switchers_numbers_us, .switcher_idxs = switcher_idxs_numbers_us, .switcher_dests = switcher_dests_numbers_us diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 0ba6115..8ae6969 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -20,6 +20,10 @@ typedef struct { const char ** const keycaps; /* Button matrix attributes */ const lv_btnmatrix_ctrl_t * const attributes; + /* Number of modifier keys */ + const int num_modifiers; + /* Button indexes of modifier keys */ + const int * const modifier_idxs; /* Number of buttons that trigger a layer switch */ const int num_switchers; /* Button indexes that trigger a layer switch */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 7c23f35..8d3d05c 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -478,9 +478,9 @@ def keycap_to_scancodes(keycap): return scancodes_for_keycap[keycap] -def get_keycaps_attrs_switchers_scancodes(args, layout_id, view_id, data_views, data_buttons): - """Return keycaps, LVGL button attributes, layer switching key indexes, layer switching key - destinations and scancodes for a view +def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, data_views, data_buttons): + """Return keycaps, LVGL button attributes, modifier key indexes, layer switching key indexes, + layer switching key destinations and scancodes for a view args -- Commandline arguments layout_id -- ID of the layout @@ -490,6 +490,7 @@ def get_keycaps_attrs_switchers_scancodes(args, layout_id, view_id, data_views, """ keycaps = [] attrs = [] + modifier_idxs = [] switcher_idxs = [] switcher_dests = [] scancodes = [] @@ -522,6 +523,9 @@ def get_keycaps_attrs_switchers_scancodes(args, layout_id, view_id, data_views, keycaps_in_row.append(keycap_to_c_value(keycap)) attrs_in_row.append(key_to_attributes(key, data_buttons)) + if key in data_buttons and 'modifier' in data_buttons[key]: + modifier_idxs.append(idx) + if key in data_buttons and 'action' in data_buttons[key]: action = data_buttons[key]['action'] dest = None @@ -546,7 +550,7 @@ def get_keycaps_attrs_switchers_scancodes(args, layout_id, view_id, data_views, attrs.append(attrs_in_row) scancodes.append(scancodes_in_row) - return keycaps, attrs, switcher_idxs, switcher_dests, scancodes + return keycaps, attrs, modifier_idxs, switcher_idxs, switcher_dests, scancodes def flatten_scancodes(scancodes): @@ -635,7 +639,7 @@ if __name__ == '__main__': c_builder.add_subsection_comment(f'Layer: {layer_name} - generated from {view_id}') c_builder.add_line() - keycaps, attrs, switcher_idxs, switcher_dests, scancodes = get_keycaps_attrs_switchers_scancodes( + keycaps, attrs, modifier_idxs, switcher_idxs, switcher_dests, scancodes = get_keycaps_attrs_modifiers_switchers_scancodes( args, layout_id, view_id, data_views, data_buttons) for dest in switcher_dests: @@ -650,6 +654,10 @@ if __name__ == '__main__': c_builder.add_array(True, 'const lv_btnmatrix_ctrl_t', f'attributes_{layer_identifier}', attrs, '', '') c_builder.add_line() + c_builder.add_line(f'static const int num_modifiers_{layer_identifier} = {len(modifier_idxs)};') + c_builder.add_line() + c_builder.add_flat_array(True, 'const int', f'modifier_idxs_{layer_identifier}', modifier_idxs, '') + c_builder.add_line() c_builder.add_line(f'static const int num_switchers_{layer_identifier} = {len(switcher_idxs)};') c_builder.add_line() @@ -681,7 +689,7 @@ if __name__ == '__main__': c_builder.add_line(f'static const sq2lv_layer_t layers_{layout_identifier}[] = ' + '{') for i, identifier in enumerate(layer_identifiers): c_builder.add_line(' {') - fields = ['num_keys', 'keycaps', 'attributes', 'num_switchers', 'switcher_idxs', 'switcher_dests'] + fields = ['num_keys', 'keycaps', 'attributes', 'num_modifiers', 'modifier_idxs', 'num_switchers', 'switcher_idxs', 'switcher_dests'] if args.generate_scancodes: fields += ['num_scancodes', 'scancodes', 'scancode_idxs', 'scancode_nums'] for k, field in enumerate(fields): @@ -711,6 +719,10 @@ if __name__ == '__main__': h_builder.add_line(' const char ** const keycaps;') h_builder.add_line(' /* Button matrix attributes */') h_builder.add_line(' const lv_btnmatrix_ctrl_t * const attributes;') + h_builder.add_line(' /* Number of modifier keys */') + h_builder.add_line(' const int num_modifiers;') + h_builder.add_line(' /* Button indexes of modifier keys */') + h_builder.add_line(' const int * const modifier_idxs;') h_builder.add_line(' /* Number of buttons that trigger a layer switch */') h_builder.add_line(' const int num_switchers;') h_builder.add_line(' /* Button indexes that trigger a layer switch */') From c0e99da8f58e525d87de5f3c2cf5f772d827fb1f Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 13 Sep 2021 20:08:44 +0200 Subject: [PATCH 14/46] Add LV_BTNMATRIX_CTRL_CHECKABLE for modifiers --- .../sq2lv_layouts.c | 6 ++-- squeek2lvgl.py | 31 ++++++++++++++++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index d4c20bf..73c8e42 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -24,7 +24,7 @@ static const char * const keycaps_lower_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ @@ -86,7 +86,7 @@ static const char * const keycaps_upper_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ @@ -148,7 +148,7 @@ static const char * const keycaps_numbers_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 8d3d05c..9d2c4b0 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -351,16 +351,37 @@ def key_to_keycap(key, view_id, layout_id): return keycap +def key_is_modifier(key, data_buttons): + """Return true if a key acts as a modifier.. + + key -- the key in question + data_buttons -- the "buttons" object from the layout's YAML file + """ + return key in data_buttons and 'modifier' in data_buttons[key] + + def key_to_attributes(key, data_buttons): """Return the LVGL button attributes for a key. key -- the key in question data_buttons -- the "buttons" object from the layout's YAML file """ - if key in ['period', 'colon', '"'] or key not in data_buttons: - return '2' - width = 7 if key == 'space' else 3 - return f'LV_KEYBOARD_CTRL_BTN_FLAGS | {width}' + attributes = [] + + if key in data_buttons and key not in ['period', 'colon', '"']: + attributes.append('LV_KEYBOARD_CTRL_BTN_FLAGS') + + if key_is_modifier(key, data_buttons): + attributes.append('LV_BTNMATRIX_CTRL_CHECKABLE') + + if key not in data_buttons or key in ['period', 'colon', '"']: + attributes.append('2') + elif key == 'space': + attributes.append('7') + else: + attributes.append('3') + + return ' | '.join(attributes) def keycap_to_c_value(keycap): @@ -523,7 +544,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, da keycaps_in_row.append(keycap_to_c_value(keycap)) attrs_in_row.append(key_to_attributes(key, data_buttons)) - if key in data_buttons and 'modifier' in data_buttons[key]: + if key_is_modifier(key, data_buttons): modifier_idxs.append(idx) if key in data_buttons and 'action' in data_buttons[key]: From d3f62fd08f371c08aab9a6bb580a3ba220503164 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sat, 18 Sep 2021 22:00:03 +0200 Subject: [PATCH 15/46] Add minimalist C API and notes on integrating --- README.md | 31 ++- .../sq2lv_layouts.h | 2 + examples/us/sq2lv_layouts.h | 2 + sq2lv.c | 231 ++++++++++++++++++ sq2lv.h | 82 +++++++ squeek2lvgl.py | 2 + 6 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 sq2lv.c create mode 100644 sq2lv.h diff --git a/README.md b/README.md index 5d71342..5761ba5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # squeek2lvgl -squeek2lvgl is a Python script that makes it possible to use [squeekboard] keyboard layouts with [LVGL]'s keyboard widget. To achieve this, [squeekboard]'s YAML syntax for layout definitions is converted into a C file (with an accompanying header) that can then be added to an [LVGL] project. +squeek2lvgl is a Python script and an accompanying C library that make it possible to use [squeekboard] keyboard layouts with [LVGL]'s keyboard widget. To achieve this, [squeekboard]'s YAML syntax for layout definitions is converted into C files that, together with the library C files, can then be added to an [LVGL] project. To access [squeekboard]'s layout files, squeek2lvgl shallowly clones the [squeekboard] git repository into a temporary directory and purges it before exiting. @@ -38,6 +38,33 @@ $ pipenv run python squeek2lvgl.py --input us.yaml --output . When the process has finished, `sq2lv_layouts.h` and `sq2lv_layouts.c` will have been written into the current directory. Check the [examples] folder for further details about the generated files. +To facilitate usage, a minimalist C API is available in [sq2lv.h] and [sq2lv.c]. + +### Integrating into a project + +Similar to [LVGL] squeek2lvgl should be added into a project as a git submodule. The generated C files assume that you have integrated [LVGL] as a submodule in the `./lvgl` folder. The C library files in turn assume that you have imported squeek2lvgl as a submodule one folder above the location of the generated files. + +The following is an example directory hierarchy: + +``` +$ tree . +. +├── lvgl # LVGL submodule +│   ├── ... +├── main.c # Project's own source files +├── ... +├── sq2lv_layouts.c # Layouts generated with squeek2lvgl +├── sq2lv_layouts.h +├── ... +├── squeek2lvgl # squeek2lvgl submodule +│   ├── sq2lv.c # squeek2lvgl library code +│   ├── sq2lv.h +│   ├── ... +├── ... +``` + +Using the directory structure above, you can then add `sq2lv_layouts.c` and `squeek2lvgl/sq2lv.c` into your build process just like the rest of your project's sources. + ## License squeek2lvgl is licensed under 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. @@ -48,3 +75,5 @@ squeek2lvgl is licensed under the GNU General Public License as published by the [squeekboard]: https://gitlab.gnome.org/World/Phosh/squeekboard [squeekboard's US layout]: https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/data/keyboards/us.yaml [examples]: ./examples +[sq2lv.h]: ./sq2lv.h +[sq2lv.c]: ./sq2lv.c diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index e8cff27..fc7697b 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -7,6 +7,8 @@ #include "lvgl/lvgl.h" +#define SQ2LV_SCANCODES_ENABLED 1 + /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { SQ2LV_LAYOUT_TERMINAL_US = 0 diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 8ae6969..40fae3a 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -7,6 +7,8 @@ #include "lvgl/lvgl.h" +#define SQ2LV_SCANCODES_ENABLED 0 + /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { SQ2LV_LAYOUT_US = 0 diff --git a/sq2lv.c b/sq2lv.c new file mode 100644 index 0000000..66a308b --- /dev/null +++ b/sq2lv.c @@ -0,0 +1,231 @@ +/** + * Copyright 2021 Johannes Marbach + * + * This file is part of squeek2lvgl, hereafter referred to as the program. + * + * 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 . + */ + + +#include "sq2lv.h" + + +/** + * Static variables + */ + +static sq2lv_layout_id_t current_layout_id = -1; + + +/** + * Static prototypes + */ + +/** + * Convert a layer index to an LVGL keyboard mode. + * + * @param layer_index layer index to convert + * @return corresponding LVGL keyboard mode + */ +static lv_keyboard_mode_t layer_index_to_keyboard_mode(int layer_index); + +/** + * Convert an LVGL keyboard mode to a layer index. + * + * @param keyboard_mode LVGL keyboard mode to convert + * @return corresponding layer index + */ +static int keyboard_mode_to_layer_index(lv_keyboard_mode_t keyboard_mode); + +/** + * Get the layer index corresponding to a keyboard's current mode. + * + * @param keyboard keyboard widget + * @return layer index + */ +static int get_layer_index(lv_obj_t *keyboard); + +/** + * Get the index of the destination layer for a layer switcher key in the current layout. + * + * @param keyboard keyboard widget + * @param btn_id button index corresponding to the key + * @return the destination layer's index or -1 if the key is not a layer switcher + */ +static int get_destination_layer_index_for_layer_switcher(lv_obj_t *keyboard, uint16_t btn_id); + + +/** + * Static functions + */ + +static lv_keyboard_mode_t layer_index_to_keyboard_mode(int layer_index) { + switch (layer_index) { + case 0: + return LV_KEYBOARD_MODE_TEXT_LOWER; + case 1: + return LV_KEYBOARD_MODE_TEXT_UPPER; + case 2: + return LV_KEYBOARD_MODE_SPECIAL; + case 3: + return LV_KEYBOARD_MODE_NUMBER; + default: + return -1; + } +} + +static int keyboard_mode_to_layer_index(lv_keyboard_mode_t keyboard_mode) { + switch (keyboard_mode) { + case LV_KEYBOARD_MODE_TEXT_LOWER: + return 0; + case LV_KEYBOARD_MODE_TEXT_UPPER: + return 1; + case LV_KEYBOARD_MODE_SPECIAL: + return 2; + case LV_KEYBOARD_MODE_NUMBER: + return 3; + default: + return -1; + } +} + +static int get_layer_index(lv_obj_t *keyboard) { + return keyboard_mode_to_layer_index(lv_keyboard_get_mode(keyboard)); +} + +static int get_destination_layer_index_for_layer_switcher(lv_obj_t *keyboard, uint16_t btn_id) { + if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { + return -1; + } + + int layer_index = get_layer_index(keyboard); + if (layer_index < 0 || layer_index >= sq2lv_layouts[current_layout_id].num_layers) { + return -1; + } + + for (int i = 0; i < sq2lv_layouts[current_layout_id].layers[layer_index].num_switchers; ++i) { + if (sq2lv_layouts[current_layout_id].layers[layer_index].switcher_idxs[i] == btn_id) { + return sq2lv_layouts[current_layout_id].layers[layer_index].switcher_dests[i]; + } + } + + return -1; +} + + +/** + * Public functions + */ + +void sq2lv_switch_layout(lv_obj_t *keyboard, sq2lv_layout_id_t layout_id) { + if (layout_id < 0 || layout_id >= sq2lv_num_layouts) { + return; + } + + /* Assign layers */ + for (int i = 0; i < sq2lv_layouts[layout_id].num_layers; ++i) { + lv_keyboard_set_map(keyboard, layer_index_to_keyboard_mode(i), + sq2lv_layouts[layout_id].layers[i].keycaps, + sq2lv_layouts[layout_id].layers[i].attributes); + } + + /* Switch to default layer if current layer doesn't exist in new layout */ + int layer_index = get_layer_index(keyboard); + if (layer_index < 0 || layer_index >= sq2lv_layouts[layout_id].num_layers) { + lv_keyboard_set_mode(keyboard, layer_index_to_keyboard_mode(0)); + } + + current_layout_id = layout_id; +} + +bool sq2lv_is_layer_switcher(lv_obj_t *keyboard, uint16_t btn_id) { + return get_destination_layer_index_for_layer_switcher(keyboard, btn_id) >= 0; +} + +bool sq2lv_switch_layer(lv_obj_t *keyboard, uint16_t btn_id) { + int destination_layer_index = get_destination_layer_index_for_layer_switcher(keyboard, btn_id); + if (destination_layer_index < 0 || destination_layer_index >= sq2lv_layouts[current_layout_id].num_layers) { + return false; + } + + lv_keyboard_set_mode(keyboard, layer_index_to_keyboard_mode(destination_layer_index)); + return true; +} + +bool sq2lv_is_modifier(lv_obj_t *keyboard, uint16_t btn_id) { + if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { + return false; + } + + int layer_index = get_layer_index(keyboard); + if (layer_index < 0 || layer_index >= sq2lv_layouts[current_layout_id].num_layers) { + return false; + } + + for (int i = 0; i < sq2lv_layouts[current_layout_id].layers[layer_index].num_modifiers; ++i) { + if (sq2lv_layouts[current_layout_id].layers[layer_index].modifier_idxs[i] == btn_id) { + return true; + } + } + + return false; +} + +const int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers) { + if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { + *num_modifiers = 0; + return NULL; + } + + int layer_index = get_layer_index(keyboard); + if (layer_index < 0 || layer_index >= sq2lv_layouts[current_layout_id].num_layers) { + *num_modifiers = 0; + return NULL; + } + + *num_modifiers = sq2lv_layouts[current_layout_id].layers[layer_index].num_modifiers; + if (*num_modifiers == 0) { + return NULL; + } + + return &(sq2lv_layouts[current_layout_id].layers[layer_index].modifier_idxs[0]); +} + +#if SQ2LV_SCANCODES_ENABLED +const int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes) { + if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { + *num_scancodes = 0; + return NULL; + } + + int layer_index = get_layer_index(keyboard); + if (layer_index < 0 || layer_index >= sq2lv_layouts[current_layout_id].num_layers) { + *num_scancodes = 0; + return NULL; + } + + if (btn_id >= sq2lv_layouts[current_layout_id].layers[layer_index].num_keys) { + *num_scancodes = 0; + return NULL; + } + + *num_scancodes = sq2lv_layouts[current_layout_id].layers[layer_index].scancode_nums[btn_id]; + if (*num_scancodes == 0) { + return NULL; + } + + const int index = sq2lv_layouts[current_layout_id].layers[layer_index].scancode_idxs[btn_id]; + return &(sq2lv_layouts[current_layout_id].layers[layer_index].scancodes[index]); +} +#endif /* SQ2LV_SCANCODES_ENABLED */ diff --git a/sq2lv.h b/sq2lv.h new file mode 100644 index 0000000..e05e883 --- /dev/null +++ b/sq2lv.h @@ -0,0 +1,82 @@ +/** + * Copyright 2021 Johannes Marbach + * + * This file is part of squeek2lvgl, hereafter referred to as the program. + * + * 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 . + */ + + +#ifndef SQ2LV_H +#define SQ2LV_H + +#include "../sq2lv_layouts.h" + +/** + * Apply a layout to a keyboard. + * + * @param keyboard keyboard widget + * @param layout_id layout ID + */ +void sq2lv_switch_layout(lv_obj_t *keyboard, sq2lv_layout_id_t layout_id); + +/** + * Check if a key acts as a layer switcher in the current layer. + * + * @param keyboard keyboard widget + * @param btn_id button index corresponding to the key + * @return true if a layer switch would happen if the key is pressed, false otherwise + */ +bool sq2lv_is_layer_switcher(lv_obj_t *keyboard, uint16_t btn_id); + +/** + * Attempt to perform a layer switch after pressing a key in the current layer. + * + * @param keyboard keyboard widget + * @param btn_id button index corresponding to the pressed key + * @return true if a layer switch was performed, false otherwise + */ +bool sq2lv_switch_layer(lv_obj_t *keyboard, uint16_t btn_id); + +/** + * Check if a key is a modifier in the current layer. + * + * @param keyboard keyboard widget + * @param btn_id button index corresponding to the key + * @return true if the key is a modifier, false otherwise + */ +bool sq2lv_is_modifier(lv_obj_t *keyboard, uint16_t btn_id); + +/** + * Get the button indexes for all modifier keys in the current layer. + * + * @param keyboard keyboard widget + * @param num_modifiers pointer to an integer into which the number of modifiers will be written + * @return pointer to the array of button indexes corresponding to modifier keys + */ +const int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers); + +#if SQ2LV_SCANCODES_ENABLED +/** + * Get scancodes associated with a key in the current layer. + * + * @param keyboard keyboard widget + * @param btn_id button index corresponding to the key + * @param num_scancodes pointer to an integer into which the number of scancodes will be written + * @return pointer into an array of scancodes at the appropriate index + */ +const int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes); +#endif /* SQ2LV_SCANCODES_ENABLED */ + +#endif /* SQ2LV_H */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 9d2c4b0..7266df0 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -622,6 +622,8 @@ if __name__ == '__main__': h_builder = SourceFileBuilder() h_builder.add_include('lvgl/lvgl.h') h_builder.add_line() + h_builder.add_line(f'#define SQ2LV_SCANCODES_ENABLED {1 if args.generate_scancodes else 0}') + h_builder.add_line() layouts = [] unique_scancodes = {} From aebc90ccd49e2ca8c6156568fac0f0e3619a7e6e Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 12:58:45 +0200 Subject: [PATCH 16/46] Add us+de example --- examples/us+de/sq2lv_layouts.c | 362 +++++++++++++++++++++++++++++++++ examples/us+de/sq2lv_layouts.h | 53 +++++ regenerate-examples.sh | 6 + 3 files changed, 421 insertions(+) create mode 100644 examples/us+de/sq2lv_layouts.c create mode 100644 examples/us+de/sq2lv_layouts.h diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c new file mode 100644 index 0000000..d0753df --- /dev/null +++ b/examples/us+de/sq2lv_layouts.c @@ -0,0 +1,362 @@ +/** + * Auto-generated with unsqu33kr + **/ + +#include "sq2lv_layouts.h" + +/** + * Layout: US English - generated from us + **/ + +static const char * const name_us = "us"; + +/* Layer: Lowercase letters - generated from base */ + +static const int num_keys_lower_us = 34; + +static const char * const keycaps_lower_us[] = { \ + "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ + "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_lower_us = 0; + +static const int modifier_idxs_lower_us[] = { \ + \ +}; + +static const int num_switchers_lower_us = 2; + +static const int switcher_idxs_lower_us[] = { \ + 19, 28 \ +}; + +static const int switcher_dests_lower_us[] = { \ + 1, 2 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const int num_keys_upper_us = 34; + +static const char * const keycaps_upper_us[] = { \ + "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ + "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_upper_us = 0; + +static const int modifier_idxs_upper_us[] = { \ + \ +}; + +static const int num_switchers_upper_us = 2; + +static const int switcher_idxs_upper_us[] = { \ + 19, 28 \ +}; + +static const int switcher_dests_upper_us[] = { \ + 0, 2 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const int num_keys_numbers_us = 34; + +static const char * const keycaps_numbers_us[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_numbers_us = 0; + +static const int modifier_idxs_numbers_us[] = { \ + \ +}; + +static const int num_switchers_numbers_us = 1; + +static const int switcher_idxs_numbers_us[] = { \ + 28 \ +}; + +static const int switcher_dests_numbers_us[] = { \ + 0 \ +}; + +/* Layer array */ + +static const int num_layers_us = 3; + +static const sq2lv_layer_t layers_us[] = { + { + .num_keys = num_keys_lower_us, + .keycaps = keycaps_lower_us, + .attributes = attributes_lower_us, + .num_modifiers = num_modifiers_lower_us, + .modifier_idxs = modifier_idxs_lower_us, + .num_switchers = num_switchers_lower_us, + .switcher_idxs = switcher_idxs_lower_us, + .switcher_dests = switcher_dests_lower_us + }, + { + .num_keys = num_keys_upper_us, + .keycaps = keycaps_upper_us, + .attributes = attributes_upper_us, + .num_modifiers = num_modifiers_upper_us, + .modifier_idxs = modifier_idxs_upper_us, + .num_switchers = num_switchers_upper_us, + .switcher_idxs = switcher_idxs_upper_us, + .switcher_dests = switcher_dests_upper_us + }, + { + .num_keys = num_keys_numbers_us, + .keycaps = keycaps_numbers_us, + .attributes = attributes_numbers_us, + .num_modifiers = num_modifiers_numbers_us, + .modifier_idxs = modifier_idxs_numbers_us, + .num_switchers = num_switchers_numbers_us, + .switcher_idxs = switcher_idxs_numbers_us, + .switcher_dests = switcher_dests_numbers_us + } +}; + +/** + * Layout: German - generated from de + **/ + +static const char * const name_de = "de"; + +/* Layer: Lowercase letters - generated from base */ + +static const int num_keys_lower_de = 36; + +static const char * const keycaps_lower_de[] = { \ + "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ + "ABC", "y", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_lower_de = 0; + +static const int modifier_idxs_lower_de[] = { \ + \ +}; + +static const int num_switchers_lower_de = 3; + +static const int switcher_idxs_lower_de[] = { \ + 19, 28, 29 \ +}; + +static const int switcher_dests_lower_de[] = { \ + 1, 2, 3 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const int num_keys_upper_de = 36; + +static const char * const keycaps_upper_de[] = { \ + "Q", "W", "E", "R", "T", "Z", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ + "abc", "Y", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "1#", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "!", "?", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_upper_de = 0; + +static const int modifier_idxs_upper_de[] = { \ + \ +}; + +static const int num_switchers_upper_de = 2; + +static const int switcher_idxs_upper_de[] = { \ + 19, 28 \ +}; + +static const int switcher_dests_upper_de[] = { \ + 0, 2 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const int num_keys_numbers_de = 36; + +static const char * const keycaps_numbers_de[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_numbers_de = 0; + +static const int modifier_idxs_numbers_de[] = { \ + \ +}; + +static const int num_switchers_numbers_de = 1; + +static const int switcher_idxs_numbers_de[] = { \ + 28 \ +}; + +static const int switcher_dests_numbers_de[] = { \ + 0 \ +}; + +/* Layer: Special characters - generated from eschars */ + +static const int num_keys_special_de = 37; + +static const char * const keycaps_special_de[] = { \ + "ä", "è", "é", "ö", "ü", "Ä", "È", "É", "Ö", "Ü", "\n", \ + "à", "â", "ê", "î", "ô", "À", "Â", "È", "Î", "Ô", "\n", \ + "1#", "«", "»", "ç", "Ç", "æ", "œ", "ß", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "„", "“", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_special_de = 0; + +static const int modifier_idxs_special_de[] = { \ + \ +}; + +static const int num_switchers_special_de = 3; + +static const int switcher_idxs_special_de[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_special_de[] = { \ + 2, 0, 0 \ +}; + +/* Layer array */ + +static const int num_layers_de = 4; + +static const sq2lv_layer_t layers_de[] = { + { + .num_keys = num_keys_lower_de, + .keycaps = keycaps_lower_de, + .attributes = attributes_lower_de, + .num_modifiers = num_modifiers_lower_de, + .modifier_idxs = modifier_idxs_lower_de, + .num_switchers = num_switchers_lower_de, + .switcher_idxs = switcher_idxs_lower_de, + .switcher_dests = switcher_dests_lower_de + }, + { + .num_keys = num_keys_upper_de, + .keycaps = keycaps_upper_de, + .attributes = attributes_upper_de, + .num_modifiers = num_modifiers_upper_de, + .modifier_idxs = modifier_idxs_upper_de, + .num_switchers = num_switchers_upper_de, + .switcher_idxs = switcher_idxs_upper_de, + .switcher_dests = switcher_dests_upper_de + }, + { + .num_keys = num_keys_numbers_de, + .keycaps = keycaps_numbers_de, + .attributes = attributes_numbers_de, + .num_modifiers = num_modifiers_numbers_de, + .modifier_idxs = modifier_idxs_numbers_de, + .num_switchers = num_switchers_numbers_de, + .switcher_idxs = switcher_idxs_numbers_de, + .switcher_dests = switcher_dests_numbers_de + }, + { + .num_keys = num_keys_special_de, + .keycaps = keycaps_special_de, + .attributes = attributes_special_de, + .num_modifiers = num_modifiers_special_de, + .modifier_idxs = modifier_idxs_special_de, + .num_switchers = num_switchers_special_de, + .switcher_idxs = switcher_idxs_special_de, + .switcher_dests = switcher_dests_special_de + } +}; + +/** + * Public interface + **/ + +const int sq2lv_num_layouts = 2; + +const sq2lv_layout_t sq2lv_layouts[] = { + /* US English */ + { + .num_layers = num_layers_us, + .layers = layers_us + }, + /* German */ + { + .num_layers = num_layers_de, + .layers = layers_de + } +}; + +const char * const sq2lv_layout_names = + "US English" "\n" + "German"; diff --git a/examples/us+de/sq2lv_layouts.h b/examples/us+de/sq2lv_layouts.h new file mode 100644 index 0000000..918bc67 --- /dev/null +++ b/examples/us+de/sq2lv_layouts.h @@ -0,0 +1,53 @@ +/** + * Auto-generated with unsqu33kr + **/ + +#ifndef SQ2LV_LAYOUTS_H +#define SQ2LV_LAYOUTS_H + +#include "lvgl/lvgl.h" + +#define SQ2LV_SCANCODES_ENABLED 0 + +/* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ +typedef enum { + SQ2LV_LAYOUT_US = 0, + SQ2LV_LAYOUT_DE = 1 +} sq2lv_layout_id_t; + +/* Layer type */ +typedef struct { + /* Number of keys */ + const int num_keys; + /* Key caps */ + const char ** const keycaps; + /* Button matrix attributes */ + const lv_btnmatrix_ctrl_t * const attributes; + /* Number of modifier keys */ + const int num_modifiers; + /* Button indexes of modifier keys */ + const int * const modifier_idxs; + /* Number of buttons that trigger a layer switch */ + const int num_switchers; + /* Button indexes that trigger a layer switch */ + const int * const switcher_idxs; + /* Indexes of layers to jump to when triggering layer switch buttons */ + const int * const switcher_dests; +} sq2lv_layer_t; + +/* Layout type */ +typedef struct { + /* Total number of layers */ + const int num_layers; + /* Layers array */ + const sq2lv_layer_t * const layers; +} sq2lv_layout_t; + +/* Layouts */ +extern const int sq2lv_num_layouts; +extern const sq2lv_layout_t sq2lv_layouts[]; + +/* Layout names (suitable for use in lv_dropdown_t) */ +extern const char * const sq2lv_layout_names; + +#endif /* SQ2LV_LAYOUTS_H */ diff --git a/regenerate-examples.sh b/regenerate-examples.sh index a84c978..3f4ef22 100755 --- a/regenerate-examples.sh +++ b/regenerate-examples.sh @@ -24,6 +24,12 @@ pipenv run python squeek2lvgl.py \ --output examples/us \ --surround-space-with-arrows +pipenv run python squeek2lvgl.py \ + --input us.yaml \ + --input de.yaml \ + --output examples/us+de \ + --surround-space-with-arrows + pipenv run python squeek2lvgl.py \ --input terminal/us.yaml \ --output examples/us-terminal-with-scancodes \ From aa74bcf04f14d761d22dad881804d5a7210c20f7 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 13:06:16 +0200 Subject: [PATCH 17/46] Add name to layout struct --- examples/us+de/sq2lv_layouts.c | 2 ++ examples/us+de/sq2lv_layouts.h | 2 ++ examples/us-terminal-with-scancodes/sq2lv_layouts.c | 1 + examples/us-terminal-with-scancodes/sq2lv_layouts.h | 2 ++ examples/us/sq2lv_layouts.c | 1 + examples/us/sq2lv_layouts.h | 2 ++ squeek2lvgl.py | 8 ++++++-- 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c index d0753df..4360a71 100644 --- a/examples/us+de/sq2lv_layouts.c +++ b/examples/us+de/sq2lv_layouts.c @@ -347,11 +347,13 @@ const int sq2lv_num_layouts = 2; const sq2lv_layout_t sq2lv_layouts[] = { /* US English */ { + .name = name_us, .num_layers = num_layers_us, .layers = layers_us }, /* German */ { + .name = name_de, .num_layers = num_layers_de, .layers = layers_de } diff --git a/examples/us+de/sq2lv_layouts.h b/examples/us+de/sq2lv_layouts.h index 918bc67..fcc1556 100644 --- a/examples/us+de/sq2lv_layouts.h +++ b/examples/us+de/sq2lv_layouts.h @@ -37,6 +37,8 @@ typedef struct { /* Layout type */ typedef struct { + /* Layout name */ + const char * const name; /* Total number of layers */ const int num_layers; /* Layers array */ diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 73c8e42..144912d 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -255,6 +255,7 @@ const int sq2lv_num_layouts = 1; const sq2lv_layout_t sq2lv_layouts[] = { /* US English (Terminal) */ { + .name = name_terminal_us, .num_layers = num_layers_terminal_us, .layers = layers_terminal_us } diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index fc7697b..cc3afdb 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -44,6 +44,8 @@ typedef struct { /* Layout type */ typedef struct { + /* Layout name */ + const char * const name; /* Total number of layers */ const int num_layers; /* Layers array */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 05ed3b8..6fc637d 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -158,6 +158,7 @@ const int sq2lv_num_layouts = 1; const sq2lv_layout_t sq2lv_layouts[] = { /* US English */ { + .name = name_us, .num_layers = num_layers_us, .layers = layers_us } diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 40fae3a..d0111cb 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -36,6 +36,8 @@ typedef struct { /* Layout type */ typedef struct { + /* Layout name */ + const char * const name; /* Total number of layers */ const int num_layers; /* Layers array */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 7266df0..b998692 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -766,6 +766,8 @@ if __name__ == '__main__': h_builder.add_line('/* Layout type */') h_builder.add_line('typedef struct {') + h_builder.add_line(' /* Layout name */') + h_builder.add_line(' const char * const name;') h_builder.add_line(' /* Total number of layers */') h_builder.add_line(' const int num_layers;') h_builder.add_line(' /* Layers array */') @@ -798,8 +800,10 @@ if __name__ == '__main__': for i, layout in enumerate(layouts): c_builder.add_line(' /* ' + layout['name'] + ' */') c_builder.add_line(' {') - c_builder.add_line(' .num_layers = num_layers_' + layout['identifier'] + ',') - c_builder.add_line(' .layers = layers_' + layout['identifier']) + fields = ['name', 'num_layers', 'layers'] + identifier = layout['identifier'] + for j, field in enumerate(fields): + c_builder.add_line(f' .{field} = {field}_{identifier}{comma_if_needed(fields, j)}') c_builder.add_line(' }' + comma_if_needed(layouts, i)) c_builder.add_line('};') c_builder.add_line() From 00fe6cafcc3a60b0d061968de70c605a859f384d Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 13:09:24 +0200 Subject: [PATCH 18/46] Use name instead of ID --- examples/us+de/sq2lv_layouts.c | 4 ++-- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 2 +- examples/us/sq2lv_layouts.c | 2 +- squeek2lvgl.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c index 4360a71..d1e8bf8 100644 --- a/examples/us+de/sq2lv_layouts.c +++ b/examples/us+de/sq2lv_layouts.c @@ -8,7 +8,7 @@ * Layout: US English - generated from us **/ -static const char * const name_us = "us"; +static const char * const name_us = "US English"; /* Layer: Lowercase letters - generated from base */ @@ -153,7 +153,7 @@ static const sq2lv_layer_t layers_us[] = { * Layout: German - generated from de **/ -static const char * const name_de = "de"; +static const char * const name_de = "German"; /* Layer: Lowercase letters - generated from base */ diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 144912d..80d1a8d 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -9,7 +9,7 @@ * Layout: US English (Terminal) - generated from terminal/us **/ -static const char * const name_terminal_us = "terminal/us"; +static const char * const name_terminal_us = "US English (Terminal)"; /* Layer: Lowercase letters - generated from base */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 6fc637d..571d6ad 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -8,7 +8,7 @@ * Layout: US English - generated from us **/ -static const char * const name_us = "us"; +static const char * const name_us = "US English"; /* Layer: Lowercase letters - generated from base */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index b998692..b44a0c8 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -643,7 +643,7 @@ if __name__ == '__main__': c_builder.add_section_comment(f'Layout: {layout_id_to_layout_name(layout_id)} - generated from {layout_id}') c_builder.add_line() - c_builder.add_line(f'static const char * const name_{layout_identifier} = "{layout_id}";') + c_builder.add_line(f'static const char * const name_{layout_identifier} = "{layout_id_to_layout_name(layout_id)}";') c_builder.add_line() layer_identifiers = [] From a8275d0e3532eca5bee075f70551ab33c650492c Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 13:12:30 +0200 Subject: [PATCH 19/46] Add layout short name --- examples/us+de/sq2lv_layouts.c | 4 ++++ examples/us+de/sq2lv_layouts.h | 2 ++ examples/us-terminal-with-scancodes/sq2lv_layouts.c | 2 ++ examples/us-terminal-with-scancodes/sq2lv_layouts.h | 2 ++ examples/us/sq2lv_layouts.c | 2 ++ examples/us/sq2lv_layouts.h | 2 ++ squeek2lvgl.py | 5 ++++- 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c index d1e8bf8..e33811d 100644 --- a/examples/us+de/sq2lv_layouts.c +++ b/examples/us+de/sq2lv_layouts.c @@ -9,6 +9,7 @@ **/ static const char * const name_us = "US English"; +static const char * const short_name_us = "us"; /* Layer: Lowercase letters - generated from base */ @@ -154,6 +155,7 @@ static const sq2lv_layer_t layers_us[] = { **/ static const char * const name_de = "German"; +static const char * const short_name_de = "de"; /* Layer: Lowercase letters - generated from base */ @@ -348,12 +350,14 @@ const sq2lv_layout_t sq2lv_layouts[] = { /* US English */ { .name = name_us, + .short_name = short_name_us, .num_layers = num_layers_us, .layers = layers_us }, /* German */ { .name = name_de, + .short_name = short_name_de, .num_layers = num_layers_de, .layers = layers_de } diff --git a/examples/us+de/sq2lv_layouts.h b/examples/us+de/sq2lv_layouts.h index fcc1556..b88d5d7 100644 --- a/examples/us+de/sq2lv_layouts.h +++ b/examples/us+de/sq2lv_layouts.h @@ -39,6 +39,8 @@ typedef struct { typedef struct { /* Layout name */ const char * const name; + /* Layout short name */ + const char * const short_name; /* Total number of layers */ const int num_layers; /* Layers array */ diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 80d1a8d..dea665c 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -10,6 +10,7 @@ **/ static const char * const name_terminal_us = "US English (Terminal)"; +static const char * const short_name_terminal_us = "terminal/us"; /* Layer: Lowercase letters - generated from base */ @@ -256,6 +257,7 @@ const sq2lv_layout_t sq2lv_layouts[] = { /* US English (Terminal) */ { .name = name_terminal_us, + .short_name = short_name_terminal_us, .num_layers = num_layers_terminal_us, .layers = layers_terminal_us } diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index cc3afdb..7dbcf77 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -46,6 +46,8 @@ typedef struct { typedef struct { /* Layout name */ const char * const name; + /* Layout short name */ + const char * const short_name; /* Total number of layers */ const int num_layers; /* Layers array */ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 571d6ad..48702ae 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -9,6 +9,7 @@ **/ static const char * const name_us = "US English"; +static const char * const short_name_us = "us"; /* Layer: Lowercase letters - generated from base */ @@ -159,6 +160,7 @@ const sq2lv_layout_t sq2lv_layouts[] = { /* US English */ { .name = name_us, + .short_name = short_name_us, .num_layers = num_layers_us, .layers = layers_us } diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index d0111cb..9c7743d 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -38,6 +38,8 @@ typedef struct { typedef struct { /* Layout name */ const char * const name; + /* Layout short name */ + const char * const short_name; /* Total number of layers */ const int num_layers; /* Layers array */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index b44a0c8..52adbf8 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -644,6 +644,7 @@ if __name__ == '__main__': c_builder.add_section_comment(f'Layout: {layout_id_to_layout_name(layout_id)} - generated from {layout_id}') c_builder.add_line() c_builder.add_line(f'static const char * const name_{layout_identifier} = "{layout_id_to_layout_name(layout_id)}";') + c_builder.add_line(f'static const char * const short_name_{layout_identifier} = "{layout_id}";') c_builder.add_line() layer_identifiers = [] @@ -768,6 +769,8 @@ if __name__ == '__main__': h_builder.add_line('typedef struct {') h_builder.add_line(' /* Layout name */') h_builder.add_line(' const char * const name;') + h_builder.add_line(' /* Layout short name */') + h_builder.add_line(' const char * const short_name;') h_builder.add_line(' /* Total number of layers */') h_builder.add_line(' const int num_layers;') h_builder.add_line(' /* Layers array */') @@ -800,7 +803,7 @@ if __name__ == '__main__': for i, layout in enumerate(layouts): c_builder.add_line(' /* ' + layout['name'] + ' */') c_builder.add_line(' {') - fields = ['name', 'num_layers', 'layers'] + fields = ['name', 'short_name', 'num_layers', 'layers'] identifier = layout['identifier'] for j, field in enumerate(fields): c_builder.add_line(f' .{field} = {field}_{identifier}{comma_if_needed(fields, j)}') From 66417e4a0ab4f8aaa91dff0548e1b30cda5af8d9 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 13:15:58 +0200 Subject: [PATCH 20/46] Add short names for dropdown --- examples/us+de/sq2lv_layouts.c | 6 +++++- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 5 ++++- examples/us/sq2lv_layouts.c | 5 ++++- squeek2lvgl.py | 8 +++++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c index e33811d..818821a 100644 --- a/examples/us+de/sq2lv_layouts.c +++ b/examples/us+de/sq2lv_layouts.c @@ -363,6 +363,10 @@ const sq2lv_layout_t sq2lv_layouts[] = { } }; -const char * const sq2lv_layout_names = +const char * const sq2lv_layout_names = "US English" "\n" "German"; + +const char * const sq2lv_layout_short_names = + "us" "\n" + "de"; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index dea665c..a9dfaba 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -263,9 +263,12 @@ const sq2lv_layout_t sq2lv_layouts[] = { } }; -const char * const sq2lv_layout_names = +const char * const sq2lv_layout_names = "US English (Terminal)"; +const char * const sq2lv_layout_short_names = + "terminal/us"; + const int sq2lv_num_unique_scancodes = 57; const int sq2lv_unique_scancodes[] = { diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 48702ae..6b6a3dd 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -166,5 +166,8 @@ const sq2lv_layout_t sq2lv_layouts[] = { } }; -const char * const sq2lv_layout_names = +const char * const sq2lv_layout_names = "US English"; + +const char * const sq2lv_layout_short_names = + "us"; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 52adbf8..9eb6d68 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -724,6 +724,7 @@ if __name__ == '__main__': layouts.append({ 'name': layout_id_to_layout_name(layout_id), + 'short_name': layout_id, 'identifier': layout_identifier }) @@ -813,7 +814,12 @@ if __name__ == '__main__': names = [layout['name'] for layout in layouts] names = '\n ' + ' "\\n"\n '.join([f'"{name}"' for name in names]) - c_builder.add_line(f'const char * const sq2lv_layout_names = {names};') + c_builder.add_line(f'const char * const sq2lv_layout_names ={names};') + c_builder.add_line() + + short_names = [layout['short_name'] for layout in layouts] + short_names = '\n ' + ' "\\n"\n '.join([f'"{short_name}"' for short_name in short_names]) + c_builder.add_line(f'const char * const sq2lv_layout_short_names ={short_names};') c_builder.add_line() if args.generate_scancodes: From 061b53670cb495a6bd5c40251491ac73c18b12e6 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 13:19:41 +0200 Subject: [PATCH 21/46] Add short names in header --- examples/us+de/sq2lv_layouts.h | 1 + examples/us-terminal-with-scancodes/sq2lv_layouts.h | 1 + examples/us/sq2lv_layouts.h | 1 + squeek2lvgl.py | 1 + 4 files changed, 4 insertions(+) diff --git a/examples/us+de/sq2lv_layouts.h b/examples/us+de/sq2lv_layouts.h index b88d5d7..c5b8a4c 100644 --- a/examples/us+de/sq2lv_layouts.h +++ b/examples/us+de/sq2lv_layouts.h @@ -53,5 +53,6 @@ extern const sq2lv_layout_t sq2lv_layouts[]; /* Layout names (suitable for use in lv_dropdown_t) */ extern const char * const sq2lv_layout_names; +extern const char * const sq2lv_layout_short_names; #endif /* SQ2LV_LAYOUTS_H */ diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 7dbcf77..90f0f33 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -60,6 +60,7 @@ extern const sq2lv_layout_t sq2lv_layouts[]; /* Layout names (suitable for use in lv_dropdown_t) */ extern const char * const sq2lv_layout_names; +extern const char * const sq2lv_layout_short_names; /* Unique scancodes from all layout (suitable for setting up uinput devices) */ extern const int sq2lv_num_unique_scancodes; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 9c7743d..54c50ef 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -52,5 +52,6 @@ extern const sq2lv_layout_t sq2lv_layouts[]; /* Layout names (suitable for use in lv_dropdown_t) */ extern const char * const sq2lv_layout_names; +extern const char * const sq2lv_layout_short_names; #endif /* SQ2LV_LAYOUTS_H */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 9eb6d68..8865075 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -786,6 +786,7 @@ if __name__ == '__main__': h_builder.add_line('/* Layout names (suitable for use in lv_dropdown_t) */') h_builder.add_line('extern const char * const sq2lv_layout_names;') + h_builder.add_line('extern const char * const sq2lv_layout_short_names;') h_builder.add_line() if args.generate_scancodes: From 94efcf33cdc12735356196c8b5aed6d122a284bc Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 13:38:19 +0200 Subject: [PATCH 22/46] Fix name --- examples/us+de/sq2lv_layouts.c | 2 +- examples/us+de/sq2lv_layouts.h | 2 +- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 2 +- examples/us-terminal-with-scancodes/sq2lv_layouts.h | 2 +- examples/us/sq2lv_layouts.c | 2 +- examples/us/sq2lv_layouts.h | 2 +- squeek2lvgl.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c index 818821a..c829e8b 100644 --- a/examples/us+de/sq2lv_layouts.c +++ b/examples/us+de/sq2lv_layouts.c @@ -1,5 +1,5 @@ /** - * Auto-generated with unsqu33kr + * Auto-generated with squeek2lvgl **/ #include "sq2lv_layouts.h" diff --git a/examples/us+de/sq2lv_layouts.h b/examples/us+de/sq2lv_layouts.h index c5b8a4c..43de65b 100644 --- a/examples/us+de/sq2lv_layouts.h +++ b/examples/us+de/sq2lv_layouts.h @@ -1,5 +1,5 @@ /** - * Auto-generated with unsqu33kr + * Auto-generated with squeek2lvgl **/ #ifndef SQ2LV_LAYOUTS_H diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index a9dfaba..25d2d3d 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -1,5 +1,5 @@ /** - * Auto-generated with unsqu33kr + * Auto-generated with squeek2lvgl **/ #include "sq2lv_layouts.h" diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 90f0f33..d2add50 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -1,5 +1,5 @@ /** - * Auto-generated with unsqu33kr + * Auto-generated with squeek2lvgl **/ #ifndef SQ2LV_LAYOUTS_H diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 6b6a3dd..c4df723 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -1,5 +1,5 @@ /** - * Auto-generated with unsqu33kr + * Auto-generated with squeek2lvgl **/ #include "sq2lv_layouts.h" diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 54c50ef..07810aa 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -1,5 +1,5 @@ /** - * Auto-generated with unsqu33kr + * Auto-generated with squeek2lvgl **/ #ifndef SQ2LV_LAYOUTS_H diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 8865075..a099cc6 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -176,7 +176,7 @@ class SourceFileBuilder(object): def _add_header_comment(self): """Add the generator header comment and return the builder. """ - self.add_lines(['/**', ' * Auto-generated with unsqu33kr', ' **/', '']) + self.add_lines(['/**', ' * Auto-generated with squeek2lvgl', ' **/', '']) return self def add_include(self, header): From 117e7240d146ba8f3d4bdc59a38317fc99002ba9 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 13:44:24 +0200 Subject: [PATCH 23/46] Consider view unlocked unless lock_view matches current view ID --- examples/us+de/sq2lv_layouts.c | 12 ++++++------ squeek2lvgl.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c index c829e8b..98b140e 100644 --- a/examples/us+de/sq2lv_layouts.c +++ b/examples/us+de/sq2lv_layouts.c @@ -215,14 +215,14 @@ static const int modifier_idxs_upper_de[] = { \ \ }; -static const int num_switchers_upper_de = 2; +static const int num_switchers_upper_de = 3; static const int switcher_idxs_upper_de[] = { \ - 19, 28 \ + 19, 28, 29 \ }; static const int switcher_dests_upper_de[] = { \ - 0, 2 \ + 0, 2, 3 \ }; /* Layer: Numbers / symbols - generated from numbers */ @@ -249,14 +249,14 @@ static const int modifier_idxs_numbers_de[] = { \ \ }; -static const int num_switchers_numbers_de = 1; +static const int num_switchers_numbers_de = 2; static const int switcher_idxs_numbers_de[] = { \ - 28 \ + 28, 29 \ }; static const int switcher_dests_numbers_de[] = { \ - 0 \ + 0, 3 \ }; /* Layer: Special characters - generated from eschars */ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index a099cc6..52974aa 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -556,7 +556,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, da elif 'locking' in action and 'lock_view' in action['locking'] and 'unlock_view' in action['locking']: if action['locking']['lock_view'] == view_id: dest = action['locking']['unlock_view'] - elif action['locking']['unlock_view'] == view_id: + else: dest = action['locking']['lock_view'] if dest: switcher_idxs.append(idx) From 9786e5f5b3917e3886ce5e532bbe0318e113abd4 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 21:07:17 +0200 Subject: [PATCH 24/46] Ignore object files --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5761abc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.o From f2194f34380f4f03b65126bbc274c95e9cab7495 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 19 Sep 2021 21:30:14 +0200 Subject: [PATCH 25/46] Read key code from button data if possible --- examples/de+es+fr+us/sq2lv_layouts.c | 770 ++++++++++++++++++ .../{us+de => de+es+fr+us}/sq2lv_layouts.h | 6 +- examples/us+de/sq2lv_layouts.c | 372 --------- .../sq2lv_layouts.c | 6 +- examples/us/sq2lv_layouts.c | 6 +- regenerate-examples.sh | 6 +- squeek2lvgl.py | 38 +- 7 files changed, 812 insertions(+), 392 deletions(-) create mode 100644 examples/de+es+fr+us/sq2lv_layouts.c rename examples/{us+de => de+es+fr+us}/sq2lv_layouts.h (93%) delete mode 100644 examples/us+de/sq2lv_layouts.c diff --git a/examples/de+es+fr+us/sq2lv_layouts.c b/examples/de+es+fr+us/sq2lv_layouts.c new file mode 100644 index 0000000..11516bc --- /dev/null +++ b/examples/de+es+fr+us/sq2lv_layouts.c @@ -0,0 +1,770 @@ +/** + * Auto-generated with squeek2lvgl + **/ + +#include "sq2lv_layouts.h" + +/** + * Layout: German - generated from de + **/ + +static const char * const name_de = "German"; +static const char * const short_name_de = "de"; + +/* Layer: Lowercase letters - generated from base */ + +static const int num_keys_lower_de = 36; + +static const char * const keycaps_lower_de[] = { \ + "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ + "ABC", "y", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "123", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_lower_de = 0; + +static const int modifier_idxs_lower_de[] = { \ + \ +}; + +static const int num_switchers_lower_de = 3; + +static const int switcher_idxs_lower_de[] = { \ + 19, 28, 29 \ +}; + +static const int switcher_dests_lower_de[] = { \ + 1, 2, 3 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const int num_keys_upper_de = 36; + +static const char * const keycaps_upper_de[] = { \ + "Q", "W", "E", "R", "T", "Z", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ + "abc", "Y", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "123", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "!", "?", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_upper_de = 0; + +static const int modifier_idxs_upper_de[] = { \ + \ +}; + +static const int num_switchers_upper_de = 3; + +static const int switcher_idxs_upper_de[] = { \ + 19, 28, 29 \ +}; + +static const int switcher_dests_upper_de[] = { \ + 0, 2, 3 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const int num_keys_numbers_de = 36; + +static const char * const keycaps_numbers_de[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_numbers_de = 0; + +static const int modifier_idxs_numbers_de[] = { \ + \ +}; + +static const int num_switchers_numbers_de = 2; + +static const int switcher_idxs_numbers_de[] = { \ + 28, 29 \ +}; + +static const int switcher_dests_numbers_de[] = { \ + 0, 3 \ +}; + +/* Layer: Special characters - generated from eschars */ + +static const int num_keys_special_de = 37; + +static const char * const keycaps_special_de[] = { \ + "ä", "è", "é", "ö", "ü", "Ä", "È", "É", "Ö", "Ü", "\n", \ + "à", "â", "ê", "î", "ô", "À", "Â", "È", "Î", "Ô", "\n", \ + "123", "«", "»", "ç", "Ç", "æ", "œ", "ß", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "„", "“", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_special_de = 0; + +static const int modifier_idxs_special_de[] = { \ + \ +}; + +static const int num_switchers_special_de = 3; + +static const int switcher_idxs_special_de[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_special_de[] = { \ + 2, 0, 0 \ +}; + +/* Layer array */ + +static const int num_layers_de = 4; + +static const sq2lv_layer_t layers_de[] = { + { + .num_keys = num_keys_lower_de, + .keycaps = keycaps_lower_de, + .attributes = attributes_lower_de, + .num_modifiers = num_modifiers_lower_de, + .modifier_idxs = modifier_idxs_lower_de, + .num_switchers = num_switchers_lower_de, + .switcher_idxs = switcher_idxs_lower_de, + .switcher_dests = switcher_dests_lower_de + }, + { + .num_keys = num_keys_upper_de, + .keycaps = keycaps_upper_de, + .attributes = attributes_upper_de, + .num_modifiers = num_modifiers_upper_de, + .modifier_idxs = modifier_idxs_upper_de, + .num_switchers = num_switchers_upper_de, + .switcher_idxs = switcher_idxs_upper_de, + .switcher_dests = switcher_dests_upper_de + }, + { + .num_keys = num_keys_numbers_de, + .keycaps = keycaps_numbers_de, + .attributes = attributes_numbers_de, + .num_modifiers = num_modifiers_numbers_de, + .modifier_idxs = modifier_idxs_numbers_de, + .num_switchers = num_switchers_numbers_de, + .switcher_idxs = switcher_idxs_numbers_de, + .switcher_dests = switcher_dests_numbers_de + }, + { + .num_keys = num_keys_special_de, + .keycaps = keycaps_special_de, + .attributes = attributes_special_de, + .num_modifiers = num_modifiers_special_de, + .modifier_idxs = modifier_idxs_special_de, + .num_switchers = num_switchers_special_de, + .switcher_idxs = switcher_idxs_special_de, + .switcher_dests = switcher_dests_special_de + } +}; + +/** + * Layout: Spanish - generated from es + **/ + +static const char * const name_es = "Spanish"; +static const char * const short_name_es = "es"; + +/* Layer: Lowercase letters - generated from base */ + +static const int num_keys_lower_es = 37; + +static const char * const keycaps_lower_es[] = { \ + "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "ñ", "\n", \ + "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "123", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_es[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_lower_es = 0; + +static const int modifier_idxs_lower_es[] = { \ + \ +}; + +static const int num_switchers_lower_es = 3; + +static const int switcher_idxs_lower_es[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_lower_es[] = { \ + 1, 2, 3 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const int num_keys_upper_es = 37; + +static const char * const keycaps_upper_es[] = { \ + "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "Ñ", "\n", \ + "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "123", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "¿", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_es[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_upper_es = 0; + +static const int modifier_idxs_upper_es[] = { \ + \ +}; + +static const int num_switchers_upper_es = 3; + +static const int switcher_idxs_upper_es[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_upper_es[] = { \ + 0, 2, 3 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const int num_keys_numbers_es = 36; + +static const char * const keycaps_numbers_es[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ",", "\"", "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_es[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_numbers_es = 0; + +static const int modifier_idxs_numbers_es[] = { \ + \ +}; + +static const int num_switchers_numbers_es = 2; + +static const int switcher_idxs_numbers_es[] = { \ + 28, 29 \ +}; + +static const int switcher_dests_numbers_es[] = { \ + 0, 3 \ +}; + +/* Layer: Special characters - generated from eschars */ + +static const int num_keys_special_es = 37; + +static const char * const keycaps_special_es[] = { \ + "á", "é", "í", "ó", "ú", "Á", "É", "Í", "Ó", "Ú", "\n", \ + "à", "è", "ì", "ò", "ù", "À", "È", "Ì", "Ò", "Ù", "\n", \ + "123", "ü", "ç", "ï", "Ü", "Ç", "Ï", "¡", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "«", "»", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_special_es[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_special_es = 0; + +static const int modifier_idxs_special_es[] = { \ + \ +}; + +static const int num_switchers_special_es = 3; + +static const int switcher_idxs_special_es[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_special_es[] = { \ + 2, 0, 0 \ +}; + +/* Layer array */ + +static const int num_layers_es = 4; + +static const sq2lv_layer_t layers_es[] = { + { + .num_keys = num_keys_lower_es, + .keycaps = keycaps_lower_es, + .attributes = attributes_lower_es, + .num_modifiers = num_modifiers_lower_es, + .modifier_idxs = modifier_idxs_lower_es, + .num_switchers = num_switchers_lower_es, + .switcher_idxs = switcher_idxs_lower_es, + .switcher_dests = switcher_dests_lower_es + }, + { + .num_keys = num_keys_upper_es, + .keycaps = keycaps_upper_es, + .attributes = attributes_upper_es, + .num_modifiers = num_modifiers_upper_es, + .modifier_idxs = modifier_idxs_upper_es, + .num_switchers = num_switchers_upper_es, + .switcher_idxs = switcher_idxs_upper_es, + .switcher_dests = switcher_dests_upper_es + }, + { + .num_keys = num_keys_numbers_es, + .keycaps = keycaps_numbers_es, + .attributes = attributes_numbers_es, + .num_modifiers = num_modifiers_numbers_es, + .modifier_idxs = modifier_idxs_numbers_es, + .num_switchers = num_switchers_numbers_es, + .switcher_idxs = switcher_idxs_numbers_es, + .switcher_dests = switcher_dests_numbers_es + }, + { + .num_keys = num_keys_special_es, + .keycaps = keycaps_special_es, + .attributes = attributes_special_es, + .num_modifiers = num_modifiers_special_es, + .modifier_idxs = modifier_idxs_special_es, + .num_switchers = num_switchers_special_es, + .switcher_idxs = switcher_idxs_special_es, + .switcher_dests = switcher_dests_special_es + } +}; + +/** + * Layout: French - generated from fr + **/ + +static const char * const name_fr = "French"; +static const char * const short_name_fr = "fr"; + +/* Layer: Lowercase letters - generated from base */ + +static const int num_keys_lower_fr = 35; + +static const char * const keycaps_lower_fr[] = { \ + "a", "z", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ + "q", "s", "d", "f", "g", "h", "j", "k", "l", "m", "\n", \ + "ABC", "w", "x", "c", "v", "b", "n", ".", LV_SYMBOL_BACKSPACE, "\n", \ + "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_fr[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_lower_fr = 0; + +static const int modifier_idxs_lower_fr[] = { \ + \ +}; + +static const int num_switchers_lower_fr = 3; + +static const int switcher_idxs_lower_fr[] = { \ + 20, 29, 33 \ +}; + +static const int switcher_dests_lower_fr[] = { \ + 1, 2, 3 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const int num_keys_upper_fr = 35; + +static const char * const keycaps_upper_fr[] = { \ + "A", "Z", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ + "Q", "S", "D", "F", "G", "H", "J", "K", "L", "M", "\n", \ + "abc", "W", "X", "C", "V", "B", "N", ",", LV_SYMBOL_BACKSPACE, "\n", \ + "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_fr[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_upper_fr = 0; + +static const int modifier_idxs_upper_fr[] = { \ + \ +}; + +static const int num_switchers_upper_fr = 3; + +static const int switcher_idxs_upper_fr[] = { \ + 20, 29, 33 \ +}; + +static const int switcher_dests_upper_fr[] = { \ + 0, 2, 3 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const int num_keys_numbers_fr = 34; + +static const char * const keycaps_numbers_fr[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_fr[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_numbers_fr = 0; + +static const int modifier_idxs_numbers_fr[] = { \ + \ +}; + +static const int num_switchers_numbers_fr = 2; + +static const int switcher_idxs_numbers_fr[] = { \ + 28, 32 \ +}; + +static const int switcher_dests_numbers_fr[] = { \ + 0, 3 \ +}; + +/* Layer: Special characters - generated from eschars */ + +static const int num_keys_special_fr = 35; + +static const char * const keycaps_special_fr[] = { \ + "à", "â", "ç", "é", "è", "ê", "î", "ô", "ù", "û", "\n", \ + "À", "Â", "Ç", "É", "È", "Ê", "Î", "Ô", "Ù", "Û", "\n", \ + "123", "æ", "œ", "ä", "ë", "ï", "ö", "ü", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_special_fr[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_special_fr = 0; + +static const int modifier_idxs_special_fr[] = { \ + \ +}; + +static const int num_switchers_special_fr = 3; + +static const int switcher_idxs_special_fr[] = { \ + 20, 29, 33 \ +}; + +static const int switcher_dests_special_fr[] = { \ + 2, 0, 0 \ +}; + +/* Layer array */ + +static const int num_layers_fr = 4; + +static const sq2lv_layer_t layers_fr[] = { + { + .num_keys = num_keys_lower_fr, + .keycaps = keycaps_lower_fr, + .attributes = attributes_lower_fr, + .num_modifiers = num_modifiers_lower_fr, + .modifier_idxs = modifier_idxs_lower_fr, + .num_switchers = num_switchers_lower_fr, + .switcher_idxs = switcher_idxs_lower_fr, + .switcher_dests = switcher_dests_lower_fr + }, + { + .num_keys = num_keys_upper_fr, + .keycaps = keycaps_upper_fr, + .attributes = attributes_upper_fr, + .num_modifiers = num_modifiers_upper_fr, + .modifier_idxs = modifier_idxs_upper_fr, + .num_switchers = num_switchers_upper_fr, + .switcher_idxs = switcher_idxs_upper_fr, + .switcher_dests = switcher_dests_upper_fr + }, + { + .num_keys = num_keys_numbers_fr, + .keycaps = keycaps_numbers_fr, + .attributes = attributes_numbers_fr, + .num_modifiers = num_modifiers_numbers_fr, + .modifier_idxs = modifier_idxs_numbers_fr, + .num_switchers = num_switchers_numbers_fr, + .switcher_idxs = switcher_idxs_numbers_fr, + .switcher_dests = switcher_dests_numbers_fr + }, + { + .num_keys = num_keys_special_fr, + .keycaps = keycaps_special_fr, + .attributes = attributes_special_fr, + .num_modifiers = num_modifiers_special_fr, + .modifier_idxs = modifier_idxs_special_fr, + .num_switchers = num_switchers_special_fr, + .switcher_idxs = switcher_idxs_special_fr, + .switcher_dests = switcher_dests_special_fr + } +}; + +/** + * Layout: US English - generated from us + **/ + +static const char * const name_us = "US English"; +static const char * const short_name_us = "us"; + +/* Layer: Lowercase letters - generated from base */ + +static const int num_keys_lower_us = 34; + +static const char * const keycaps_lower_us[] = { \ + "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ + "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_lower_us = 0; + +static const int modifier_idxs_lower_us[] = { \ + \ +}; + +static const int num_switchers_lower_us = 2; + +static const int switcher_idxs_lower_us[] = { \ + 19, 28 \ +}; + +static const int switcher_dests_lower_us[] = { \ + 1, 2 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const int num_keys_upper_us = 34; + +static const char * const keycaps_upper_us[] = { \ + "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ + "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_upper_us = 0; + +static const int modifier_idxs_upper_us[] = { \ + \ +}; + +static const int num_switchers_upper_us = 2; + +static const int switcher_idxs_upper_us[] = { \ + 19, 28 \ +}; + +static const int switcher_dests_upper_us[] = { \ + 0, 2 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const int num_keys_numbers_us = 34; + +static const char * const keycaps_numbers_us[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ +}; + +static const int num_modifiers_numbers_us = 0; + +static const int modifier_idxs_numbers_us[] = { \ + \ +}; + +static const int num_switchers_numbers_us = 1; + +static const int switcher_idxs_numbers_us[] = { \ + 28 \ +}; + +static const int switcher_dests_numbers_us[] = { \ + 0 \ +}; + +/* Layer array */ + +static const int num_layers_us = 3; + +static const sq2lv_layer_t layers_us[] = { + { + .num_keys = num_keys_lower_us, + .keycaps = keycaps_lower_us, + .attributes = attributes_lower_us, + .num_modifiers = num_modifiers_lower_us, + .modifier_idxs = modifier_idxs_lower_us, + .num_switchers = num_switchers_lower_us, + .switcher_idxs = switcher_idxs_lower_us, + .switcher_dests = switcher_dests_lower_us + }, + { + .num_keys = num_keys_upper_us, + .keycaps = keycaps_upper_us, + .attributes = attributes_upper_us, + .num_modifiers = num_modifiers_upper_us, + .modifier_idxs = modifier_idxs_upper_us, + .num_switchers = num_switchers_upper_us, + .switcher_idxs = switcher_idxs_upper_us, + .switcher_dests = switcher_dests_upper_us + }, + { + .num_keys = num_keys_numbers_us, + .keycaps = keycaps_numbers_us, + .attributes = attributes_numbers_us, + .num_modifiers = num_modifiers_numbers_us, + .modifier_idxs = modifier_idxs_numbers_us, + .num_switchers = num_switchers_numbers_us, + .switcher_idxs = switcher_idxs_numbers_us, + .switcher_dests = switcher_dests_numbers_us + } +}; + +/** + * Public interface + **/ + +const int sq2lv_num_layouts = 4; + +const sq2lv_layout_t sq2lv_layouts[] = { + /* German */ + { + .name = name_de, + .short_name = short_name_de, + .num_layers = num_layers_de, + .layers = layers_de + }, + /* Spanish */ + { + .name = name_es, + .short_name = short_name_es, + .num_layers = num_layers_es, + .layers = layers_es + }, + /* French */ + { + .name = name_fr, + .short_name = short_name_fr, + .num_layers = num_layers_fr, + .layers = layers_fr + }, + /* US English */ + { + .name = name_us, + .short_name = short_name_us, + .num_layers = num_layers_us, + .layers = layers_us + } +}; + +const char * const sq2lv_layout_names = + "German" "\n" + "Spanish" "\n" + "French" "\n" + "US English"; + +const char * const sq2lv_layout_short_names = + "de" "\n" + "es" "\n" + "fr" "\n" + "us"; diff --git a/examples/us+de/sq2lv_layouts.h b/examples/de+es+fr+us/sq2lv_layouts.h similarity index 93% rename from examples/us+de/sq2lv_layouts.h rename to examples/de+es+fr+us/sq2lv_layouts.h index 43de65b..b4e514b 100644 --- a/examples/us+de/sq2lv_layouts.h +++ b/examples/de+es+fr+us/sq2lv_layouts.h @@ -11,8 +11,10 @@ /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { - SQ2LV_LAYOUT_US = 0, - SQ2LV_LAYOUT_DE = 1 + SQ2LV_LAYOUT_DE = 0, + SQ2LV_LAYOUT_ES = 1, + SQ2LV_LAYOUT_FR = 2, + SQ2LV_LAYOUT_US = 3 } sq2lv_layout_id_t; /* Layer type */ diff --git a/examples/us+de/sq2lv_layouts.c b/examples/us+de/sq2lv_layouts.c deleted file mode 100644 index 98b140e..0000000 --- a/examples/us+de/sq2lv_layouts.c +++ /dev/null @@ -1,372 +0,0 @@ -/** - * Auto-generated with squeek2lvgl - **/ - -#include "sq2lv_layouts.h" - -/** - * Layout: US English - generated from us - **/ - -static const char * const name_us = "US English"; -static const char * const short_name_us = "us"; - -/* Layer: Lowercase letters - generated from base */ - -static const int num_keys_lower_us = 34; - -static const char * const keycaps_lower_us[] = { \ - "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ - "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ - "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ -}; - -static const int num_modifiers_lower_us = 0; - -static const int modifier_idxs_lower_us[] = { \ - \ -}; - -static const int num_switchers_lower_us = 2; - -static const int switcher_idxs_lower_us[] = { \ - 19, 28 \ -}; - -static const int switcher_dests_lower_us[] = { \ - 1, 2 \ -}; - -/* Layer: Uppercase letters - generated from upper */ - -static const int num_keys_upper_us = 34; - -static const char * const keycaps_upper_us[] = { \ - "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ - "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ - "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ -}; - -static const int num_modifiers_upper_us = 0; - -static const int modifier_idxs_upper_us[] = { \ - \ -}; - -static const int num_switchers_upper_us = 2; - -static const int switcher_idxs_upper_us[] = { \ - 19, 28 \ -}; - -static const int switcher_dests_upper_us[] = { \ - 0, 2 \ -}; - -/* Layer: Numbers / symbols - generated from numbers */ - -static const int num_keys_numbers_us = 34; - -static const char * const keycaps_numbers_us[] = { \ - "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ - "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ -}; - -static const int num_modifiers_numbers_us = 0; - -static const int modifier_idxs_numbers_us[] = { \ - \ -}; - -static const int num_switchers_numbers_us = 1; - -static const int switcher_idxs_numbers_us[] = { \ - 28 \ -}; - -static const int switcher_dests_numbers_us[] = { \ - 0 \ -}; - -/* Layer array */ - -static const int num_layers_us = 3; - -static const sq2lv_layer_t layers_us[] = { - { - .num_keys = num_keys_lower_us, - .keycaps = keycaps_lower_us, - .attributes = attributes_lower_us, - .num_modifiers = num_modifiers_lower_us, - .modifier_idxs = modifier_idxs_lower_us, - .num_switchers = num_switchers_lower_us, - .switcher_idxs = switcher_idxs_lower_us, - .switcher_dests = switcher_dests_lower_us - }, - { - .num_keys = num_keys_upper_us, - .keycaps = keycaps_upper_us, - .attributes = attributes_upper_us, - .num_modifiers = num_modifiers_upper_us, - .modifier_idxs = modifier_idxs_upper_us, - .num_switchers = num_switchers_upper_us, - .switcher_idxs = switcher_idxs_upper_us, - .switcher_dests = switcher_dests_upper_us - }, - { - .num_keys = num_keys_numbers_us, - .keycaps = keycaps_numbers_us, - .attributes = attributes_numbers_us, - .num_modifiers = num_modifiers_numbers_us, - .modifier_idxs = modifier_idxs_numbers_us, - .num_switchers = num_switchers_numbers_us, - .switcher_idxs = switcher_idxs_numbers_us, - .switcher_dests = switcher_dests_numbers_us - } -}; - -/** - * Layout: German - generated from de - **/ - -static const char * const name_de = "German"; -static const char * const short_name_de = "de"; - -/* Layer: Lowercase letters - generated from base */ - -static const int num_keys_lower_de = 36; - -static const char * const keycaps_lower_de[] = { \ - "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "\n", \ - "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ - "ABC", "y", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ -}; - -static const int num_modifiers_lower_de = 0; - -static const int modifier_idxs_lower_de[] = { \ - \ -}; - -static const int num_switchers_lower_de = 3; - -static const int switcher_idxs_lower_de[] = { \ - 19, 28, 29 \ -}; - -static const int switcher_dests_lower_de[] = { \ - 1, 2, 3 \ -}; - -/* Layer: Uppercase letters - generated from upper */ - -static const int num_keys_upper_de = 36; - -static const char * const keycaps_upper_de[] = { \ - "Q", "W", "E", "R", "T", "Z", "U", "I", "O", "P", "\n", \ - "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ - "abc", "Y", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "!", "?", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ -}; - -static const int num_modifiers_upper_de = 0; - -static const int modifier_idxs_upper_de[] = { \ - \ -}; - -static const int num_switchers_upper_de = 3; - -static const int switcher_idxs_upper_de[] = { \ - 19, 28, 29 \ -}; - -static const int switcher_dests_upper_de[] = { \ - 0, 2, 3 \ -}; - -/* Layer: Numbers / symbols - generated from numbers */ - -static const int num_keys_numbers_de = 36; - -static const char * const keycaps_numbers_de[] = { \ - "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ - "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ -}; - -static const int num_modifiers_numbers_de = 0; - -static const int modifier_idxs_numbers_de[] = { \ - \ -}; - -static const int num_switchers_numbers_de = 2; - -static const int switcher_idxs_numbers_de[] = { \ - 28, 29 \ -}; - -static const int switcher_dests_numbers_de[] = { \ - 0, 3 \ -}; - -/* Layer: Special characters - generated from eschars */ - -static const int num_keys_special_de = 37; - -static const char * const keycaps_special_de[] = { \ - "ä", "è", "é", "ö", "ü", "Ä", "È", "É", "Ö", "Ü", "\n", \ - "à", "â", "ê", "î", "ô", "À", "Â", "È", "Î", "Ô", "\n", \ - "1#", "«", "»", "ç", "Ç", "æ", "œ", "ß", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", "äöü", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "„", "“", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ -}; - -static const int num_modifiers_special_de = 0; - -static const int modifier_idxs_special_de[] = { \ - \ -}; - -static const int num_switchers_special_de = 3; - -static const int switcher_idxs_special_de[] = { \ - 20, 29, 30 \ -}; - -static const int switcher_dests_special_de[] = { \ - 2, 0, 0 \ -}; - -/* Layer array */ - -static const int num_layers_de = 4; - -static const sq2lv_layer_t layers_de[] = { - { - .num_keys = num_keys_lower_de, - .keycaps = keycaps_lower_de, - .attributes = attributes_lower_de, - .num_modifiers = num_modifiers_lower_de, - .modifier_idxs = modifier_idxs_lower_de, - .num_switchers = num_switchers_lower_de, - .switcher_idxs = switcher_idxs_lower_de, - .switcher_dests = switcher_dests_lower_de - }, - { - .num_keys = num_keys_upper_de, - .keycaps = keycaps_upper_de, - .attributes = attributes_upper_de, - .num_modifiers = num_modifiers_upper_de, - .modifier_idxs = modifier_idxs_upper_de, - .num_switchers = num_switchers_upper_de, - .switcher_idxs = switcher_idxs_upper_de, - .switcher_dests = switcher_dests_upper_de - }, - { - .num_keys = num_keys_numbers_de, - .keycaps = keycaps_numbers_de, - .attributes = attributes_numbers_de, - .num_modifiers = num_modifiers_numbers_de, - .modifier_idxs = modifier_idxs_numbers_de, - .num_switchers = num_switchers_numbers_de, - .switcher_idxs = switcher_idxs_numbers_de, - .switcher_dests = switcher_dests_numbers_de - }, - { - .num_keys = num_keys_special_de, - .keycaps = keycaps_special_de, - .attributes = attributes_special_de, - .num_modifiers = num_modifiers_special_de, - .modifier_idxs = modifier_idxs_special_de, - .num_switchers = num_switchers_special_de, - .switcher_idxs = switcher_idxs_special_de, - .switcher_dests = switcher_dests_special_de - } -}; - -/** - * Public interface - **/ - -const int sq2lv_num_layouts = 2; - -const sq2lv_layout_t sq2lv_layouts[] = { - /* US English */ - { - .name = name_us, - .short_name = short_name_us, - .num_layers = num_layers_us, - .layers = layers_us - }, - /* German */ - { - .name = name_de, - .short_name = short_name_de, - .num_layers = num_layers_de, - .layers = layers_de - } -}; - -const char * const sq2lv_layout_names = - "US English" "\n" - "German"; - -const char * const sq2lv_layout_short_names = - "us" "\n" - "de"; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 25d2d3d..fe3fef5 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -21,7 +21,7 @@ static const char * const keycaps_lower_terminal_us[] = { \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", " ", LV_SYMBOL_OK, "" \ + "123", " ", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ @@ -83,7 +83,7 @@ static const char * const keycaps_upper_terminal_us[] = { \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", " ", LV_SYMBOL_OK, "" \ + "123", " ", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ @@ -145,7 +145,7 @@ static const char * const keycaps_numbers_terminal_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \ ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", " ", ".", LV_SYMBOL_OK, "" \ + "ABC", " ", ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index c4df723..598cb34 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -19,7 +19,7 @@ static const char * const keycaps_lower_us[] = { \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ + "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ @@ -53,7 +53,7 @@ static const char * const keycaps_upper_us[] = { \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ - "1#", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ + "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ @@ -87,7 +87,7 @@ static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ + "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ diff --git a/regenerate-examples.sh b/regenerate-examples.sh index 3f4ef22..82ec29e 100755 --- a/regenerate-examples.sh +++ b/regenerate-examples.sh @@ -25,9 +25,11 @@ pipenv run python squeek2lvgl.py \ --surround-space-with-arrows pipenv run python squeek2lvgl.py \ - --input us.yaml \ --input de.yaml \ - --output examples/us+de \ + --input es.yaml \ + --input fr.yaml \ + --input us.yaml \ + --output examples/de+es+fr+us \ --surround-space-with-arrows pipenv run python squeek2lvgl.py \ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 52974aa..d9e20a0 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -304,6 +304,20 @@ def view_id_to_c_identifier(view_id): return layer_identifier_for_view_id[view_id] if view_id in layer_identifier_for_view_id else view_id +ignored_keys = { + 'preferences', + 'show_actions', + 'show_symbols' +} + +def is_key_ignored(key): + """Return True if a key should be ignored or False otherwise. + + key -- the key in question + """ + return key in ignored_keys + + keycap_for_key = { '\\': '\\\\', '"': '\\"', @@ -314,21 +328,15 @@ keycap_for_key = { 'BackSpace': 'LV_SYMBOL_BACKSPACE', 'colon': ':', 'period': '.', - 'preferences': None, 'Shift_L': { 'base': 'ABC', 'upper': 'abc' }, - 'show_actions': None, 'show_eschars': { 'de': 'äöü', 'es': 'áéí', - 'fr': 'àéô' + 'fr': 'áàéô' }, - 'show_letters': 'abc', - 'show_numbers': '1#', - 'show_numbers_from_symbols': '1#', - 'show_symbols': None, 'space': ' ', 'Return': 'LV_SYMBOL_OK', } @@ -464,7 +472,7 @@ scancodes_for_keycap = { ' ': ['KEY_SPACE'], 'ABC': [], 'abc': [], - '1#': [], + '123': [], 'PgUp': ['KEY_PAGEUP'], 'PgDn': ['KEY_PAGEDOWN'], 'Home': ['KEY_HOME'], @@ -495,7 +503,8 @@ def keycap_to_scancodes(keycap): keycap -- keycap to produce """ if keycap not in scancodes_for_keycap: - die(f'cannot determine scancodes for unknown keycap "{keycap}"') + warn(f'Cannot determine scancodes for unknown keycap "{keycap}"') + return [] return scancodes_for_keycap[keycap] @@ -537,7 +546,16 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, da for key in keys: - keycap = key_to_keycap(key, view_id, layout_id) + if is_key_ignored(key): + continue + + keycap = None + + if key in data_buttons and 'label' in data_buttons[key]: + keycap = data_buttons[key]['label'] + else: + keycap = key_to_keycap(key, view_id, layout_id) + if not keycap: continue From e93d853f3d0413ca5e1a9fc5796c571a5778a3d2 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 20 Sep 2021 10:12:18 +0200 Subject: [PATCH 26/46] Introduce custom control flags and treat locked layer switchers like active modifiers --- examples/de+es+fr+us/sq2lv_layouts.c | 60 +++++++++---------- examples/de+es+fr+us/sq2lv_layouts.h | 7 ++- .../sq2lv_layouts.c | 18 +++--- .../sq2lv_layouts.h | 7 ++- examples/us/sq2lv_layouts.c | 12 ++-- examples/us/sq2lv_layouts.h | 7 ++- squeek2lvgl.py | 35 +++++++---- 7 files changed, 86 insertions(+), 60 deletions(-) diff --git a/examples/de+es+fr+us/sq2lv_layouts.c b/examples/de+es+fr+us/sq2lv_layouts.c index 11516bc..374ddb7 100644 --- a/examples/de+es+fr+us/sq2lv_layouts.c +++ b/examples/de+es+fr+us/sq2lv_layouts.c @@ -25,8 +25,8 @@ static const char * const keycaps_lower_de[] = { \ static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_de = 0; @@ -59,8 +59,8 @@ static const char * const keycaps_upper_de[] = { \ static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_de = 0; @@ -93,8 +93,8 @@ static const char * const keycaps_numbers_de[] = { \ static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_de = 0; @@ -127,8 +127,8 @@ static const char * const keycaps_special_de[] = { \ static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_de = 0; @@ -215,8 +215,8 @@ static const char * const keycaps_lower_es[] = { \ static const lv_btnmatrix_ctrl_t attributes_lower_es[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_es = 0; @@ -249,8 +249,8 @@ static const char * const keycaps_upper_es[] = { \ static const lv_btnmatrix_ctrl_t attributes_upper_es[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_es = 0; @@ -283,8 +283,8 @@ static const char * const keycaps_numbers_es[] = { \ static const lv_btnmatrix_ctrl_t attributes_numbers_es[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_es = 0; @@ -317,8 +317,8 @@ static const char * const keycaps_special_es[] = { \ static const lv_btnmatrix_ctrl_t attributes_special_es[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_es = 0; @@ -405,8 +405,8 @@ static const char * const keycaps_lower_fr[] = { \ static const lv_btnmatrix_ctrl_t attributes_lower_fr[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_fr = 0; @@ -439,8 +439,8 @@ static const char * const keycaps_upper_fr[] = { \ static const lv_btnmatrix_ctrl_t attributes_upper_fr[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_fr = 0; @@ -473,8 +473,8 @@ static const char * const keycaps_numbers_fr[] = { \ static const lv_btnmatrix_ctrl_t attributes_numbers_fr[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_fr = 0; @@ -507,8 +507,8 @@ static const char * const keycaps_special_fr[] = { \ static const lv_btnmatrix_ctrl_t attributes_special_fr[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_fr = 0; @@ -595,8 +595,8 @@ static const char * const keycaps_lower_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_us = 0; @@ -629,8 +629,8 @@ static const char * const keycaps_upper_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_us = 0; @@ -663,8 +663,8 @@ static const char * const keycaps_numbers_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_us = 0; diff --git a/examples/de+es+fr+us/sq2lv_layouts.h b/examples/de+es+fr+us/sq2lv_layouts.h index b4e514b..0fe89ca 100644 --- a/examples/de+es+fr+us/sq2lv_layouts.h +++ b/examples/de+es+fr+us/sq2lv_layouts.h @@ -9,6 +9,11 @@ #define SQ2LV_SCANCODES_ENABLED 0 +/* Key attributes */ +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) + /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { SQ2LV_LAYOUT_DE = 0, @@ -23,7 +28,7 @@ typedef struct { const int num_keys; /* Key caps */ const char ** const keycaps; - /* Button matrix attributes */ + /* Key attributes */ const lv_btnmatrix_ctrl_t * const attributes; /* Number of modifier keys */ const int num_modifiers; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index fe3fef5..fdeadf3 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -25,11 +25,11 @@ static const char * const keycaps_lower_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ - LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_terminal_us = 2; @@ -87,11 +87,11 @@ static const char * const keycaps_upper_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ - LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_terminal_us = 2; @@ -149,11 +149,11 @@ static const char * const keycaps_numbers_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ - LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | LV_BTNMATRIX_CTRL_CHECKABLE | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, 7, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_terminal_us = 2; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index d2add50..4a02eef 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -9,6 +9,11 @@ #define SQ2LV_SCANCODES_ENABLED 1 +/* Key attributes */ +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) + /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { SQ2LV_LAYOUT_TERMINAL_US = 0 @@ -20,7 +25,7 @@ typedef struct { const int num_keys; /* Key caps */ const char ** const keycaps; - /* Button matrix attributes */ + /* Key attributes */ const lv_btnmatrix_ctrl_t * const attributes; /* Number of modifier keys */ const int num_modifiers; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 598cb34..0e83dc6 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -25,8 +25,8 @@ static const char * const keycaps_lower_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_us = 0; @@ -59,8 +59,8 @@ static const char * const keycaps_upper_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_us = 0; @@ -93,8 +93,8 @@ static const char * const keycaps_numbers_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3, \ - LV_KEYBOARD_CTRL_BTN_FLAGS | 3, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 7, 2, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 3 \ + 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_us = 0; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 07810aa..1175da6 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -9,6 +9,11 @@ #define SQ2LV_SCANCODES_ENABLED 0 +/* Key attributes */ +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) + /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { SQ2LV_LAYOUT_US = 0 @@ -20,7 +25,7 @@ typedef struct { const int num_keys; /* Key caps */ const char ** const keycaps; - /* Button matrix attributes */ + /* Key attributes */ const lv_btnmatrix_ctrl_t * const attributes; /* Number of modifier keys */ const int num_modifiers; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index d9e20a0..b3b036b 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -332,11 +332,6 @@ keycap_for_key = { 'base': 'ABC', 'upper': 'abc' }, - 'show_eschars': { - 'de': 'äöü', - 'es': 'áéí', - 'fr': 'áàéô' - }, 'space': ' ', 'Return': 'LV_SYMBOL_OK', } @@ -368,19 +363,24 @@ def key_is_modifier(key, data_buttons): return key in data_buttons and 'modifier' in data_buttons[key] -def key_to_attributes(key, data_buttons): +def key_to_attributes(key, is_locked, is_lockable, data_buttons): """Return the LVGL button attributes for a key. key -- the key in question + is_locked - whether the key is locked in the current view + is_lockable - whether the key can be locked in the current view data_buttons -- the "buttons" object from the layout's YAML file """ attributes = [] - if key in data_buttons and key not in ['period', 'colon', '"']: - attributes.append('LV_KEYBOARD_CTRL_BTN_FLAGS') - if key_is_modifier(key, data_buttons): - attributes.append('LV_BTNMATRIX_CTRL_CHECKABLE') + attributes.append('SQ2LV_CTRL_MOD_INACTIVE') + elif is_locked: + attributes.append('SQ2LV_CTRL_MOD_ACTIVE') + elif is_lockable: + attributes.append('SQ2LV_CTRL_MOD_INACTIVE') + elif key in data_buttons and key not in ['"', 'colon', 'period', 'space'] or key in ['←', '→']: + attributes.append('SQ2LV_CTRL_NON_CHAR') if key not in data_buttons or key in ['period', 'colon', '"']: attributes.append('2') @@ -560,11 +560,13 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, da continue keycaps_in_row.append(keycap_to_c_value(keycap)) - attrs_in_row.append(key_to_attributes(key, data_buttons)) if key_is_modifier(key, data_buttons): modifier_idxs.append(idx) + is_locked = False + is_lockable = False + if key in data_buttons and 'action' in data_buttons[key]: action = data_buttons[key]['action'] dest = None @@ -574,12 +576,16 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, da elif 'locking' in action and 'lock_view' in action['locking'] and 'unlock_view' in action['locking']: if action['locking']['lock_view'] == view_id: dest = action['locking']['unlock_view'] + is_locked = True else: dest = action['locking']['lock_view'] + is_lockable = True if dest: switcher_idxs.append(idx) switcher_dests.append(dest) + attrs_in_row.append(key_to_attributes(key, is_locked, is_lockable, data_buttons)) + if args.generate_scancodes: scancodes_in_row.append(keycap_to_scancodes(keycap)) @@ -642,6 +648,11 @@ if __name__ == '__main__': h_builder.add_line() h_builder.add_line(f'#define SQ2LV_SCANCODES_ENABLED {1 if args.generate_scancodes else 0}') h_builder.add_line() + h_builder.add_subsection_comment('Key attributes') + h_builder.add_line('#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED)') + h_builder.add_line('#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE)') + h_builder.add_line('#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED)') + h_builder.add_line() layouts = [] unique_scancodes = {} @@ -760,7 +771,7 @@ if __name__ == '__main__': h_builder.add_line(' const int num_keys;') h_builder.add_line(' /* Key caps */') h_builder.add_line(' const char ** const keycaps;') - h_builder.add_line(' /* Button matrix attributes */') + h_builder.add_line(' /* Key attributes */') h_builder.add_line(' const lv_btnmatrix_ctrl_t * const attributes;') h_builder.add_line(' /* Number of modifier keys */') h_builder.add_line(' const int num_modifiers;') From 94e5cfa841b7e7dd3dcb2dc011329e59c978b00b Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 20 Sep 2021 12:57:08 +0200 Subject: [PATCH 27/46] Add option for customising Shift keycap --- README.md | 4 +- .../sq2lv_layouts.c | 219 ++++++++++++++++++ .../sq2lv_layouts.h | 5 +- .../{de+es+fr+us => es+fr+us}/sq2lv_layouts.c | 213 +---------------- examples/es+fr+us/sq2lv_layouts.h | 64 +++++ .../sq2lv_layouts.c | 6 +- examples/us/sq2lv_layouts.c | 6 +- regenerate-examples.sh | 7 +- squeek2lvgl.py | 46 ++-- 9 files changed, 330 insertions(+), 240 deletions(-) create mode 100644 examples/de-with-custom-shift-keycap/sq2lv_layouts.c rename examples/{de+es+fr+us => de-with-custom-shift-keycap}/sq2lv_layouts.h (95%) rename examples/{de+es+fr+us => es+fr+us}/sq2lv_layouts.c (71%) create mode 100644 examples/es+fr+us/sq2lv_layouts.h diff --git a/README.md b/README.md index 5761ba5..6d6ffcf 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Afterwards you can execute the script with `pipenv run`. Use the `-h` / `--help` ``` $ pipenv run python squeek2lvgl.py --help -usage: squeek2lvgl.py [-h] --input INPUT [--surround-space-with-arrows] [--generate-scancodes] --output OUTPUT +usage: squeek2lvgl.py [-h] --input INPUT [--shift-keycap SHIFT_KEYCAP] [--surround-space-with-arrows] [--generate-scancodes] --output OUTPUT Convert squeekboard layouts to LVGL-compatible C code. @@ -24,6 +24,8 @@ optional arguments: -h, --help show this help message and exit --input INPUT squeekboard layout to use as input for generation. Has to be a YAML file path relative to data/keyboards. Can be specified multiple times. + --shift-keycap SHIFT_KEYCAP + key caption for the Shift key. Defaults to "Shift". --surround-space-with-arrows insert left / right arrow before / after space key --generate-scancodes also generate scancode tables (only works for US layout currently) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c new file mode 100644 index 0000000..ef354bc --- /dev/null +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c @@ -0,0 +1,219 @@ +/** + * Auto-generated with squeek2lvgl + **/ + +#include "sq2lv_layouts.h" + +#define SQ2LV_SYMBOL_SHIFT "ABC" + +/** + * Layout: German - generated from de + **/ + +static const char * const name_de = "German"; +static const char * const short_name_de = "de"; + +/* Layer: Lowercase letters - generated from base */ + +static const int num_keys_lower_de = 36; + +static const char * const keycaps_lower_de[] = { \ + "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "\n", \ + "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ + SQ2LV_SYMBOL_SHIFT, "y", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + "123", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_lower_de = 0; + +static const int modifier_idxs_lower_de[] = { \ + \ +}; + +static const int num_switchers_lower_de = 3; + +static const int switcher_idxs_lower_de[] = { \ + 19, 28, 29 \ +}; + +static const int switcher_dests_lower_de[] = { \ + 1, 2, 3 \ +}; + +/* Layer: Uppercase letters - generated from upper */ + +static const int num_keys_upper_de = 36; + +static const char * const keycaps_upper_de[] = { \ + "Q", "W", "E", "R", "T", "Z", "U", "I", "O", "P", "\n", \ + "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ + SQ2LV_SYMBOL_SHIFT, "Y", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + "123", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "!", "?", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_upper_de = 0; + +static const int modifier_idxs_upper_de[] = { \ + \ +}; + +static const int num_switchers_upper_de = 3; + +static const int switcher_idxs_upper_de[] = { \ + 19, 28, 29 \ +}; + +static const int switcher_dests_upper_de[] = { \ + 0, 2, 3 \ +}; + +/* Layer: Numbers / symbols - generated from numbers */ + +static const int num_keys_numbers_de = 36; + +static const char * const keycaps_numbers_de[] = { \ + "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ + "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ + ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_numbers_de = 0; + +static const int modifier_idxs_numbers_de[] = { \ + \ +}; + +static const int num_switchers_numbers_de = 2; + +static const int switcher_idxs_numbers_de[] = { \ + 28, 29 \ +}; + +static const int switcher_dests_numbers_de[] = { \ + 0, 3 \ +}; + +/* Layer: Special characters - generated from eschars */ + +static const int num_keys_special_de = 37; + +static const char * const keycaps_special_de[] = { \ + "ä", "è", "é", "ö", "ü", "Ä", "È", "É", "Ö", "Ü", "\n", \ + "à", "â", "ê", "î", "ô", "À", "Â", "È", "Î", "Ô", "\n", \ + "123", "«", "»", "ç", "Ç", "æ", "œ", "ß", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "„", "“", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ + SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_special_de = 0; + +static const int modifier_idxs_special_de[] = { \ + \ +}; + +static const int num_switchers_special_de = 3; + +static const int switcher_idxs_special_de[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_special_de[] = { \ + 2, 0, 0 \ +}; + +/* Layer array */ + +static const int num_layers_de = 4; + +static const sq2lv_layer_t layers_de[] = { + { + .num_keys = num_keys_lower_de, + .keycaps = keycaps_lower_de, + .attributes = attributes_lower_de, + .num_modifiers = num_modifiers_lower_de, + .modifier_idxs = modifier_idxs_lower_de, + .num_switchers = num_switchers_lower_de, + .switcher_idxs = switcher_idxs_lower_de, + .switcher_dests = switcher_dests_lower_de + }, + { + .num_keys = num_keys_upper_de, + .keycaps = keycaps_upper_de, + .attributes = attributes_upper_de, + .num_modifiers = num_modifiers_upper_de, + .modifier_idxs = modifier_idxs_upper_de, + .num_switchers = num_switchers_upper_de, + .switcher_idxs = switcher_idxs_upper_de, + .switcher_dests = switcher_dests_upper_de + }, + { + .num_keys = num_keys_numbers_de, + .keycaps = keycaps_numbers_de, + .attributes = attributes_numbers_de, + .num_modifiers = num_modifiers_numbers_de, + .modifier_idxs = modifier_idxs_numbers_de, + .num_switchers = num_switchers_numbers_de, + .switcher_idxs = switcher_idxs_numbers_de, + .switcher_dests = switcher_dests_numbers_de + }, + { + .num_keys = num_keys_special_de, + .keycaps = keycaps_special_de, + .attributes = attributes_special_de, + .num_modifiers = num_modifiers_special_de, + .modifier_idxs = modifier_idxs_special_de, + .num_switchers = num_switchers_special_de, + .switcher_idxs = switcher_idxs_special_de, + .switcher_dests = switcher_dests_special_de + } +}; + +/** + * Public interface + **/ + +const int sq2lv_num_layouts = 1; + +const sq2lv_layout_t sq2lv_layouts[] = { + /* German */ + { + .name = name_de, + .short_name = short_name_de, + .num_layers = num_layers_de, + .layers = layers_de + } +}; + +const char * const sq2lv_layout_names = + "German"; + +const char * const sq2lv_layout_short_names = + "de"; diff --git a/examples/de+es+fr+us/sq2lv_layouts.h b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h similarity index 95% rename from examples/de+es+fr+us/sq2lv_layouts.h rename to examples/de-with-custom-shift-keycap/sq2lv_layouts.h index 0fe89ca..230c802 100644 --- a/examples/de+es+fr+us/sq2lv_layouts.h +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h @@ -16,10 +16,7 @@ /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { - SQ2LV_LAYOUT_DE = 0, - SQ2LV_LAYOUT_ES = 1, - SQ2LV_LAYOUT_FR = 2, - SQ2LV_LAYOUT_US = 3 + SQ2LV_LAYOUT_DE = 0 } sq2lv_layout_id_t; /* Layer type */ diff --git a/examples/de+es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c similarity index 71% rename from examples/de+es+fr+us/sq2lv_layouts.c rename to examples/es+fr+us/sq2lv_layouts.c index 374ddb7..dc2e6db 100644 --- a/examples/de+es+fr+us/sq2lv_layouts.c +++ b/examples/es+fr+us/sq2lv_layouts.c @@ -4,195 +4,7 @@ #include "sq2lv_layouts.h" -/** - * Layout: German - generated from de - **/ - -static const char * const name_de = "German"; -static const char * const short_name_de = "de"; - -/* Layer: Lowercase letters - generated from base */ - -static const int num_keys_lower_de = 36; - -static const char * const keycaps_lower_de[] = { \ - "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "\n", \ - "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ - "ABC", "y", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ - "123", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ -}; - -static const int num_modifiers_lower_de = 0; - -static const int modifier_idxs_lower_de[] = { \ - \ -}; - -static const int num_switchers_lower_de = 3; - -static const int switcher_idxs_lower_de[] = { \ - 19, 28, 29 \ -}; - -static const int switcher_dests_lower_de[] = { \ - 1, 2, 3 \ -}; - -/* Layer: Uppercase letters - generated from upper */ - -static const int num_keys_upper_de = 36; - -static const char * const keycaps_upper_de[] = { \ - "Q", "W", "E", "R", "T", "Z", "U", "I", "O", "P", "\n", \ - "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ - "abc", "Y", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ - "123", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "!", "?", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ -}; - -static const int num_modifiers_upper_de = 0; - -static const int modifier_idxs_upper_de[] = { \ - \ -}; - -static const int num_switchers_upper_de = 3; - -static const int switcher_idxs_upper_de[] = { \ - 19, 28, 29 \ -}; - -static const int switcher_dests_upper_de[] = { \ - 0, 2, 3 \ -}; - -/* Layer: Numbers / symbols - generated from numbers */ - -static const int num_keys_numbers_de = 36; - -static const char * const keycaps_numbers_de[] = { \ - "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ - "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ -}; - -static const int num_modifiers_numbers_de = 0; - -static const int modifier_idxs_numbers_de[] = { \ - \ -}; - -static const int num_switchers_numbers_de = 2; - -static const int switcher_idxs_numbers_de[] = { \ - 28, 29 \ -}; - -static const int switcher_dests_numbers_de[] = { \ - 0, 3 \ -}; - -/* Layer: Special characters - generated from eschars */ - -static const int num_keys_special_de = 37; - -static const char * const keycaps_special_de[] = { \ - "ä", "è", "é", "ö", "ü", "Ä", "È", "É", "Ö", "Ü", "\n", \ - "à", "â", "ê", "î", "ô", "À", "Â", "È", "Î", "Ô", "\n", \ - "123", "«", "»", "ç", "Ç", "æ", "œ", "ß", LV_SYMBOL_BACKSPACE, "\n", \ - "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "„", "“", LV_SYMBOL_OK, "" \ -}; - -static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ -}; - -static const int num_modifiers_special_de = 0; - -static const int modifier_idxs_special_de[] = { \ - \ -}; - -static const int num_switchers_special_de = 3; - -static const int switcher_idxs_special_de[] = { \ - 20, 29, 30 \ -}; - -static const int switcher_dests_special_de[] = { \ - 2, 0, 0 \ -}; - -/* Layer array */ - -static const int num_layers_de = 4; - -static const sq2lv_layer_t layers_de[] = { - { - .num_keys = num_keys_lower_de, - .keycaps = keycaps_lower_de, - .attributes = attributes_lower_de, - .num_modifiers = num_modifiers_lower_de, - .modifier_idxs = modifier_idxs_lower_de, - .num_switchers = num_switchers_lower_de, - .switcher_idxs = switcher_idxs_lower_de, - .switcher_dests = switcher_dests_lower_de - }, - { - .num_keys = num_keys_upper_de, - .keycaps = keycaps_upper_de, - .attributes = attributes_upper_de, - .num_modifiers = num_modifiers_upper_de, - .modifier_idxs = modifier_idxs_upper_de, - .num_switchers = num_switchers_upper_de, - .switcher_idxs = switcher_idxs_upper_de, - .switcher_dests = switcher_dests_upper_de - }, - { - .num_keys = num_keys_numbers_de, - .keycaps = keycaps_numbers_de, - .attributes = attributes_numbers_de, - .num_modifiers = num_modifiers_numbers_de, - .modifier_idxs = modifier_idxs_numbers_de, - .num_switchers = num_switchers_numbers_de, - .switcher_idxs = switcher_idxs_numbers_de, - .switcher_dests = switcher_dests_numbers_de - }, - { - .num_keys = num_keys_special_de, - .keycaps = keycaps_special_de, - .attributes = attributes_special_de, - .num_modifiers = num_modifiers_special_de, - .modifier_idxs = modifier_idxs_special_de, - .num_switchers = num_switchers_special_de, - .switcher_idxs = switcher_idxs_special_de, - .switcher_dests = switcher_dests_special_de - } -}; +#define SQ2LV_SYMBOL_SHIFT "Shift" /** * Layout: Spanish - generated from es @@ -208,7 +20,7 @@ static const int num_keys_lower_es = 37; static const char * const keycaps_lower_es[] = { \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "ñ", "\n", \ - "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ "123", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \ }; @@ -242,7 +54,7 @@ static const int num_keys_upper_es = 37; static const char * const keycaps_upper_es[] = { \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "Ñ", "\n", \ - "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ "123", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "¿", ".", LV_SYMBOL_OK, "" \ }; @@ -398,7 +210,7 @@ static const int num_keys_lower_fr = 35; static const char * const keycaps_lower_fr[] = { \ "a", "z", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "q", "s", "d", "f", "g", "h", "j", "k", "l", "m", "\n", \ - "ABC", "w", "x", "c", "v", "b", "n", ".", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "w", "x", "c", "v", "b", "n", ".", LV_SYMBOL_BACKSPACE, "\n", \ "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ }; @@ -432,7 +244,7 @@ static const int num_keys_upper_fr = 35; static const char * const keycaps_upper_fr[] = { \ "A", "Z", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "Q", "S", "D", "F", "G", "H", "J", "K", "L", "M", "\n", \ - "abc", "W", "X", "C", "V", "B", "N", ",", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "W", "X", "C", "V", "B", "N", ",", LV_SYMBOL_BACKSPACE, "\n", \ "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ }; @@ -588,7 +400,7 @@ static const int num_keys_lower_us = 34; static const char * const keycaps_lower_us[] = { \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ - "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; @@ -622,7 +434,7 @@ static const int num_keys_upper_us = 34; static const char * const keycaps_upper_us[] = { \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ - "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; @@ -724,16 +536,9 @@ static const sq2lv_layer_t layers_us[] = { * Public interface **/ -const int sq2lv_num_layouts = 4; +const int sq2lv_num_layouts = 3; const sq2lv_layout_t sq2lv_layouts[] = { - /* German */ - { - .name = name_de, - .short_name = short_name_de, - .num_layers = num_layers_de, - .layers = layers_de - }, /* Spanish */ { .name = name_es, @@ -758,13 +563,11 @@ const sq2lv_layout_t sq2lv_layouts[] = { }; const char * const sq2lv_layout_names = - "German" "\n" "Spanish" "\n" "French" "\n" "US English"; const char * const sq2lv_layout_short_names = - "de" "\n" "es" "\n" "fr" "\n" "us"; diff --git a/examples/es+fr+us/sq2lv_layouts.h b/examples/es+fr+us/sq2lv_layouts.h new file mode 100644 index 0000000..42330bb --- /dev/null +++ b/examples/es+fr+us/sq2lv_layouts.h @@ -0,0 +1,64 @@ +/** + * Auto-generated with squeek2lvgl + **/ + +#ifndef SQ2LV_LAYOUTS_H +#define SQ2LV_LAYOUTS_H + +#include "lvgl/lvgl.h" + +#define SQ2LV_SCANCODES_ENABLED 0 + +/* Key attributes */ +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) + +/* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ +typedef enum { + SQ2LV_LAYOUT_ES = 0, + SQ2LV_LAYOUT_FR = 1, + SQ2LV_LAYOUT_US = 2 +} sq2lv_layout_id_t; + +/* Layer type */ +typedef struct { + /* Number of keys */ + const int num_keys; + /* Key caps */ + const char ** const keycaps; + /* Key attributes */ + const lv_btnmatrix_ctrl_t * const attributes; + /* Number of modifier keys */ + const int num_modifiers; + /* Button indexes of modifier keys */ + const int * const modifier_idxs; + /* Number of buttons that trigger a layer switch */ + const int num_switchers; + /* Button indexes that trigger a layer switch */ + const int * const switcher_idxs; + /* Indexes of layers to jump to when triggering layer switch buttons */ + const int * const switcher_dests; +} sq2lv_layer_t; + +/* Layout type */ +typedef struct { + /* Layout name */ + const char * const name; + /* Layout short name */ + const char * const short_name; + /* Total number of layers */ + const int num_layers; + /* Layers array */ + const sq2lv_layer_t * const layers; +} sq2lv_layout_t; + +/* Layouts */ +extern const int sq2lv_num_layouts; +extern const sq2lv_layout_t sq2lv_layouts[]; + +/* Layout names (suitable for use in lv_dropdown_t) */ +extern const char * const sq2lv_layout_names; +extern const char * const sq2lv_layout_short_names; + +#endif /* SQ2LV_LAYOUTS_H */ diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index fdeadf3..74673c0 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -5,6 +5,8 @@ #include "sq2lv_layouts.h" #include +#define SQ2LV_SYMBOL_SHIFT "Shift" + /** * Layout: US English (Terminal) - generated from terminal/us **/ @@ -20,7 +22,7 @@ static const char * const keycaps_lower_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ - "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ "123", " ", LV_SYMBOL_OK, "" \ }; @@ -82,7 +84,7 @@ static const char * const keycaps_upper_terminal_us[] = { \ "Ctrl", "Alt", "PgUp", "PgDn", "Home", "End", "\n", \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ - "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ "123", " ", LV_SYMBOL_OK, "" \ }; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 0e83dc6..d6b0470 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -4,6 +4,8 @@ #include "sq2lv_layouts.h" +#define SQ2LV_SYMBOL_SHIFT "Shift" + /** * Layout: US English - generated from us **/ @@ -18,7 +20,7 @@ static const int num_keys_lower_us = 34; static const char * const keycaps_lower_us[] = { \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ - "ABC", "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; @@ -52,7 +54,7 @@ static const int num_keys_upper_us = 34; static const char * const keycaps_upper_us[] = { \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ - "abc", "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ + SQ2LV_SYMBOL_SHIFT, "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ "123", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; diff --git a/regenerate-examples.sh b/regenerate-examples.sh index 82ec29e..d60bb09 100755 --- a/regenerate-examples.sh +++ b/regenerate-examples.sh @@ -26,10 +26,15 @@ pipenv run python squeek2lvgl.py \ pipenv run python squeek2lvgl.py \ --input de.yaml \ + --output examples/de-with-custom-shift-keycap \ + --surround-space-with-arrows \ + --shift-keycap ABC + +pipenv run python squeek2lvgl.py \ --input es.yaml \ --input fr.yaml \ --input us.yaml \ - --output examples/de+es+fr+us \ + --output examples/es+fr+us \ --surround-space-with-arrows pipenv run python squeek2lvgl.py \ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index b3b036b..c119bd3 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -63,6 +63,8 @@ def parse_arguments(): parser.add_argument('--input', dest='input', action='append', required=True, help='squeekboard layout to ' + 'use as input for generation. Has to be a YAML file path relative to data/keyboards. ' + 'Can be specified multiple times.') + parser.add_argument('--shift-keycap', dest='shift_keycap', type=str, required=False, help='key caption for ' + + 'the Shift key. Defaults to "Shift".') parser.add_argument('--surround-space-with-arrows', action='store_true', dest='arrows_around_space', help='insert left / right arrow before / after space key') parser.add_argument('--generate-scancodes', action='store_true', dest='generate_scancodes', help='also ' @@ -328,30 +330,18 @@ keycap_for_key = { 'BackSpace': 'LV_SYMBOL_BACKSPACE', 'colon': ':', 'period': '.', - 'Shift_L': { - 'base': 'ABC', - 'upper': 'abc' - }, + 'Shift_L': 'SQ2LV_SYMBOL_SHIFT', 'space': ' ', 'Return': 'LV_SYMBOL_OK', } -def key_to_keycap(key, view_id, layout_id): +def key_to_keycap(args, key): """Return the keycap for a key - + + args -- commandline arguments key -- the key - view_id -- ID of the view the key appears on - layout_id -- ID of the layout the view is part of """ - keycap = keycap_for_key[key] if key in keycap_for_key else key - if isinstance(keycap, dict): - if view_id in keycap: - keycap = keycap[view_id] - elif layout_id in keycap: - keycap = keycap[layout_id] - else: - keycap = None - return keycap + return keycap_for_key[key] if key in keycap_for_key else key def key_is_modifier(key, data_buttons): @@ -395,7 +385,7 @@ def key_to_attributes(key, is_locked, is_lockable, data_buttons): def keycap_to_c_value(keycap): """Return the right-hand side C value for a keycap """ - return keycap if keycap.startswith('LV_') else f'"{keycap}"' + return keycap if keycap.startswith('LV_') or keycap.startswith('SQ2LV_') else f'"{keycap}"' scancodes_for_keycap = { @@ -497,23 +487,25 @@ scancodes_for_keycap = { '.': ['KEY_DOT'] } -def keycap_to_scancodes(keycap): +def keycap_to_scancodes(args, keycap): """Return the scancodes needed to produce a keycap + args -- commandline arguments keycap -- keycap to produce """ + if keycap == 'SQ2LV_SYMBOL_SHIFT': + return [] if keycap not in scancodes_for_keycap: warn(f'Cannot determine scancodes for unknown keycap "{keycap}"') return [] return scancodes_for_keycap[keycap] -def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, data_views, data_buttons): +def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, data_buttons): """Return keycaps, LVGL button attributes, modifier key indexes, layer switching key indexes, layer switching key destinations and scancodes for a view - args -- Commandline arguments - layout_id -- ID of the layout + args -- commandline arguments view_id -- ID of the view data_views -- the "views" object from the layout's YAML file data_buttons -- the "buttons" object from the layout's YAML file @@ -554,7 +546,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, da if key in data_buttons and 'label' in data_buttons[key]: keycap = data_buttons[key]['label'] else: - keycap = key_to_keycap(key, view_id, layout_id) + keycap = key_to_keycap(args, key) if not keycap: continue @@ -587,7 +579,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, layout_id, view_id, da attrs_in_row.append(key_to_attributes(key, is_locked, is_lockable, data_buttons)) if args.generate_scancodes: - scancodes_in_row.append(keycap_to_scancodes(keycap)) + scancodes_in_row.append(keycap_to_scancodes(args, keycap)) idx += 1 @@ -643,6 +635,10 @@ if __name__ == '__main__': c_builder.add_system_include('linux/input.h') c_builder.add_line() + shift_keycap = args.shift_keycap if args.shift_keycap else 'Shift' + c_builder.add_line(f'#define SQ2LV_SYMBOL_SHIFT "{shift_keycap}"') + c_builder.add_line() + h_builder = SourceFileBuilder() h_builder.add_include('lvgl/lvgl.h') h_builder.add_line() @@ -693,7 +689,7 @@ if __name__ == '__main__': c_builder.add_line() keycaps, attrs, modifier_idxs, switcher_idxs, switcher_dests, scancodes = get_keycaps_attrs_modifiers_switchers_scancodes( - args, layout_id, view_id, data_views, data_buttons) + args, view_id, data_views, data_buttons) for dest in switcher_dests: if dest not in view_ids: From c5a645490c51dc125aaff3f28340123276a00556 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Wed, 22 Sep 2021 20:18:33 +0200 Subject: [PATCH 28/46] Add in one more const Relates to cherrypicker/unl0kr#18 --- squeek2lvgl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squeek2lvgl.py b/squeek2lvgl.py index c119bd3..9a721c9 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -766,7 +766,7 @@ if __name__ == '__main__': h_builder.add_line(' /* Number of keys */') h_builder.add_line(' const int num_keys;') h_builder.add_line(' /* Key caps */') - h_builder.add_line(' const char ** const keycaps;') + h_builder.add_line(' const char * const * const keycaps;') h_builder.add_line(' /* Key attributes */') h_builder.add_line(' const lv_btnmatrix_ctrl_t * const attributes;') h_builder.add_line(' /* Number of modifier keys */') From 04785aed74e4c529e6a095e20abbe43c24201d73 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Wed, 22 Sep 2021 20:19:48 +0200 Subject: [PATCH 29/46] Regenerate examples --- examples/de-with-custom-shift-keycap/sq2lv_layouts.h | 2 +- examples/es+fr+us/sq2lv_layouts.h | 2 +- examples/us-terminal-with-scancodes/sq2lv_layouts.h | 2 +- examples/us/sq2lv_layouts.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.h b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h index 230c802..ceca8b3 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.h +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h @@ -24,7 +24,7 @@ typedef struct { /* Number of keys */ const int num_keys; /* Key caps */ - const char ** const keycaps; + const char * const * const keycaps; /* Key attributes */ const lv_btnmatrix_ctrl_t * const attributes; /* Number of modifier keys */ diff --git a/examples/es+fr+us/sq2lv_layouts.h b/examples/es+fr+us/sq2lv_layouts.h index 42330bb..0e3f23a 100644 --- a/examples/es+fr+us/sq2lv_layouts.h +++ b/examples/es+fr+us/sq2lv_layouts.h @@ -26,7 +26,7 @@ typedef struct { /* Number of keys */ const int num_keys; /* Key caps */ - const char ** const keycaps; + const char * const * const keycaps; /* Key attributes */ const lv_btnmatrix_ctrl_t * const attributes; /* Number of modifier keys */ diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 4a02eef..0909d19 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -24,7 +24,7 @@ typedef struct { /* Number of keys */ const int num_keys; /* Key caps */ - const char ** const keycaps; + const char * const * const keycaps; /* Key attributes */ const lv_btnmatrix_ctrl_t * const attributes; /* Number of modifier keys */ diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 1175da6..e6a201a 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -24,7 +24,7 @@ typedef struct { /* Number of keys */ const int num_keys; /* Key caps */ - const char ** const keycaps; + const char * const * const keycaps; /* Key attributes */ const lv_btnmatrix_ctrl_t * const attributes; /* Number of modifier keys */ From 5faaf14831c915132c229b0ddef0931ab6ce7cd3 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Wed, 22 Sep 2021 20:26:23 +0200 Subject: [PATCH 30/46] Cast to expected type Relates to cherrypicker/unl0kr#18 --- sq2lv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq2lv.c b/sq2lv.c index 66a308b..e826b06 100644 --- a/sq2lv.c +++ b/sq2lv.c @@ -136,7 +136,7 @@ void sq2lv_switch_layout(lv_obj_t *keyboard, sq2lv_layout_id_t layout_id) { /* Assign layers */ for (int i = 0; i < sq2lv_layouts[layout_id].num_layers; ++i) { lv_keyboard_set_map(keyboard, layer_index_to_keyboard_mode(i), - sq2lv_layouts[layout_id].layers[i].keycaps, + (const char **)sq2lv_layouts[layout_id].layers[i].keycaps, sq2lv_layouts[layout_id].layers[i].attributes); } From 01c343b96cec50880a1dca3af6a8f40be89b8149 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Wed, 22 Sep 2021 20:39:55 +0200 Subject: [PATCH 31/46] Replace empty arrays with NULL Relates to cherrypicker/unl0kr#18 --- .../sq2lv_layouts.c | 16 ++----- examples/es+fr+us/sq2lv_layouts.c | 44 +++++-------------- examples/us/sq2lv_layouts.c | 12 ++--- squeek2lvgl.py | 6 +++ 4 files changed, 24 insertions(+), 54 deletions(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c index ef354bc..a724f14 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c @@ -33,9 +33,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ static const int num_modifiers_lower_de = 0; -static const int modifier_idxs_lower_de[] = { \ - \ -}; +static const int * const modifier_idxs_lower_de = NULL; static const int num_switchers_lower_de = 3; @@ -67,9 +65,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ static const int num_modifiers_upper_de = 0; -static const int modifier_idxs_upper_de[] = { \ - \ -}; +static const int * const modifier_idxs_upper_de = NULL; static const int num_switchers_upper_de = 3; @@ -101,9 +97,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ static const int num_modifiers_numbers_de = 0; -static const int modifier_idxs_numbers_de[] = { \ - \ -}; +static const int * const modifier_idxs_numbers_de = NULL; static const int num_switchers_numbers_de = 2; @@ -135,9 +129,7 @@ static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ static const int num_modifiers_special_de = 0; -static const int modifier_idxs_special_de[] = { \ - \ -}; +static const int * const modifier_idxs_special_de = NULL; static const int num_switchers_special_de = 3; diff --git a/examples/es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c index dc2e6db..fbddcaf 100644 --- a/examples/es+fr+us/sq2lv_layouts.c +++ b/examples/es+fr+us/sq2lv_layouts.c @@ -33,9 +33,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_es[] = { \ static const int num_modifiers_lower_es = 0; -static const int modifier_idxs_lower_es[] = { \ - \ -}; +static const int * const modifier_idxs_lower_es = NULL; static const int num_switchers_lower_es = 3; @@ -67,9 +65,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_es[] = { \ static const int num_modifiers_upper_es = 0; -static const int modifier_idxs_upper_es[] = { \ - \ -}; +static const int * const modifier_idxs_upper_es = NULL; static const int num_switchers_upper_es = 3; @@ -101,9 +97,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_es[] = { \ static const int num_modifiers_numbers_es = 0; -static const int modifier_idxs_numbers_es[] = { \ - \ -}; +static const int * const modifier_idxs_numbers_es = NULL; static const int num_switchers_numbers_es = 2; @@ -135,9 +129,7 @@ static const lv_btnmatrix_ctrl_t attributes_special_es[] = { \ static const int num_modifiers_special_es = 0; -static const int modifier_idxs_special_es[] = { \ - \ -}; +static const int * const modifier_idxs_special_es = NULL; static const int num_switchers_special_es = 3; @@ -223,9 +215,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_fr[] = { \ static const int num_modifiers_lower_fr = 0; -static const int modifier_idxs_lower_fr[] = { \ - \ -}; +static const int * const modifier_idxs_lower_fr = NULL; static const int num_switchers_lower_fr = 3; @@ -257,9 +247,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_fr[] = { \ static const int num_modifiers_upper_fr = 0; -static const int modifier_idxs_upper_fr[] = { \ - \ -}; +static const int * const modifier_idxs_upper_fr = NULL; static const int num_switchers_upper_fr = 3; @@ -291,9 +279,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_fr[] = { \ static const int num_modifiers_numbers_fr = 0; -static const int modifier_idxs_numbers_fr[] = { \ - \ -}; +static const int * const modifier_idxs_numbers_fr = NULL; static const int num_switchers_numbers_fr = 2; @@ -325,9 +311,7 @@ static const lv_btnmatrix_ctrl_t attributes_special_fr[] = { \ static const int num_modifiers_special_fr = 0; -static const int modifier_idxs_special_fr[] = { \ - \ -}; +static const int * const modifier_idxs_special_fr = NULL; static const int num_switchers_special_fr = 3; @@ -413,9 +397,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ static const int num_modifiers_lower_us = 0; -static const int modifier_idxs_lower_us[] = { \ - \ -}; +static const int * const modifier_idxs_lower_us = NULL; static const int num_switchers_lower_us = 2; @@ -447,9 +429,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ static const int num_modifiers_upper_us = 0; -static const int modifier_idxs_upper_us[] = { \ - \ -}; +static const int * const modifier_idxs_upper_us = NULL; static const int num_switchers_upper_us = 2; @@ -481,9 +461,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ static const int num_modifiers_numbers_us = 0; -static const int modifier_idxs_numbers_us[] = { \ - \ -}; +static const int * const modifier_idxs_numbers_us = NULL; static const int num_switchers_numbers_us = 1; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index d6b0470..9bc7960 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -33,9 +33,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ static const int num_modifiers_lower_us = 0; -static const int modifier_idxs_lower_us[] = { \ - \ -}; +static const int * const modifier_idxs_lower_us = NULL; static const int num_switchers_lower_us = 2; @@ -67,9 +65,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ static const int num_modifiers_upper_us = 0; -static const int modifier_idxs_upper_us[] = { \ - \ -}; +static const int * const modifier_idxs_upper_us = NULL; static const int num_switchers_upper_us = 2; @@ -101,9 +97,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ static const int num_modifiers_numbers_us = 0; -static const int modifier_idxs_numbers_us[] = { \ - \ -}; +static const int * const modifier_idxs_numbers_us = NULL; static const int num_switchers_numbers_us = 1; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 9a721c9..0185fff 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -224,6 +224,11 @@ class SourceFileBuilder(object): array_terminator -- element to append to the last row """ prefix = 'static ' if static else '' + + if not values or not values[0]: + self.add_line(f'{prefix}{type} * const {identifier} = NULL;') + return self + self.add_line(f'{prefix}{type} {identifier}[] = ' + '{ \\') for i, values_in_row in enumerate(values): elements = values_in_row @@ -234,6 +239,7 @@ class SourceFileBuilder(object): joined = ', '.join([f'{e}' for e in elements]) self.add_line(f' {joined}{comma_if_needed(values, i)} \\') self.add_line('};') + return self def add_flat_array(self, static, type, identifier, values, array_terminator): From 482953d769ff09b2e32fb2660fffd3a825adee6f Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sat, 25 Sep 2021 12:51:48 +0200 Subject: [PATCH 32/46] Add function for finding layouts by short name --- examples/de-with-custom-shift-keycap/sq2lv_layouts.h | 1 + examples/es+fr+us/sq2lv_layouts.h | 1 + examples/us-terminal-with-scancodes/sq2lv_layouts.h | 1 + examples/us/sq2lv_layouts.h | 1 + sq2lv.c | 11 ++++++++++- sq2lv.h | 8 ++++++++ squeek2lvgl.py | 1 + 7 files changed, 23 insertions(+), 1 deletion(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.h b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h index ceca8b3..b01cbe9 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.h +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h @@ -16,6 +16,7 @@ /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { + SQ2LV_LAYOUT_NONE = -1, SQ2LV_LAYOUT_DE = 0 } sq2lv_layout_id_t; diff --git a/examples/es+fr+us/sq2lv_layouts.h b/examples/es+fr+us/sq2lv_layouts.h index 0e3f23a..75cd438 100644 --- a/examples/es+fr+us/sq2lv_layouts.h +++ b/examples/es+fr+us/sq2lv_layouts.h @@ -16,6 +16,7 @@ /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { + SQ2LV_LAYOUT_NONE = -1, SQ2LV_LAYOUT_ES = 0, SQ2LV_LAYOUT_FR = 1, SQ2LV_LAYOUT_US = 2 diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 0909d19..60b8e3a 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -16,6 +16,7 @@ /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { + SQ2LV_LAYOUT_NONE = -1, SQ2LV_LAYOUT_TERMINAL_US = 0 } sq2lv_layout_id_t; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index e6a201a..1b4dfed 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -16,6 +16,7 @@ /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { + SQ2LV_LAYOUT_NONE = -1, SQ2LV_LAYOUT_US = 0 } sq2lv_layout_id_t; diff --git a/sq2lv.c b/sq2lv.c index e826b06..04df066 100644 --- a/sq2lv.c +++ b/sq2lv.c @@ -25,7 +25,7 @@ * Static variables */ -static sq2lv_layout_id_t current_layout_id = -1; +static sq2lv_layout_id_t current_layout_id = SQ2LV_LAYOUT_NONE; /** @@ -128,6 +128,15 @@ static int get_destination_layer_index_for_layer_switcher(lv_obj_t *keyboard, ui * Public functions */ +sq2lv_layout_id_t find_layout_with_short_name(const char *name) { + for (int i = 0; i < sq2lv_num_layouts; ++i) { + if (strcmp(sq2lv_layouts[i].short_name, name) == 0) { + return i; + } + } + return SQ2LV_LAYOUT_NONE; +} + void sq2lv_switch_layout(lv_obj_t *keyboard, sq2lv_layout_id_t layout_id) { if (layout_id < 0 || layout_id >= sq2lv_num_layouts) { return; diff --git a/sq2lv.h b/sq2lv.h index e05e883..38d3892 100644 --- a/sq2lv.h +++ b/sq2lv.h @@ -23,6 +23,14 @@ #include "../sq2lv_layouts.h" +/** + * Find the first layout with a given short name. + * + * @param name layout short name + * @return ID of the first matching layout or SQ2LV_LAYOUT_NONE if no layout matched + */ +sq2lv_layout_id_t find_layout_with_short_name(const char *name); + /** * Apply a layout to a keyboard. * diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 0185fff..95d57f3 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -761,6 +761,7 @@ if __name__ == '__main__': h_builder.add_line('/* Layout IDs, values can be used as indexes into the sq2lv_layouts array */') h_builder.add_line('typedef enum {') + h_builder.add_line(' SQ2LV_LAYOUT_NONE = -1,') for i, layout in enumerate(layouts): identifier = layout['identifier'].upper() h_builder.add_line(f' SQ2LV_LAYOUT_{identifier} = {i}{comma_if_needed(layouts, i)}') From 33e4660f973fdf338355599e9b1053791df742ab Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sat, 25 Sep 2021 12:56:56 +0200 Subject: [PATCH 33/46] Add missing prefix --- sq2lv.c | 2 +- sq2lv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sq2lv.c b/sq2lv.c index 04df066..def04fe 100644 --- a/sq2lv.c +++ b/sq2lv.c @@ -128,7 +128,7 @@ static int get_destination_layer_index_for_layer_switcher(lv_obj_t *keyboard, ui * Public functions */ -sq2lv_layout_id_t find_layout_with_short_name(const char *name) { +sq2lv_layout_id_t sq2lv_find_layout_with_short_name(const char *name) { for (int i = 0; i < sq2lv_num_layouts; ++i) { if (strcmp(sq2lv_layouts[i].short_name, name) == 0) { return i; diff --git a/sq2lv.h b/sq2lv.h index 38d3892..b5a1c07 100644 --- a/sq2lv.h +++ b/sq2lv.h @@ -29,7 +29,7 @@ * @param name layout short name * @return ID of the first matching layout or SQ2LV_LAYOUT_NONE if no layout matched */ -sq2lv_layout_id_t find_layout_with_short_name(const char *name); +sq2lv_layout_id_t sq2lv_find_layout_with_short_name(const char *name); /** * Apply a layout to a keyboard. From 90eebad7e11fe5e90f9fe6b4e492561e849f4ac3 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Fri, 1 Oct 2021 21:05:03 +0200 Subject: [PATCH 34/46] Add LV_BTNMATRIX_CTRL_POPOVER to char keys --- .../sq2lv_layouts.c | 32 ++++---- examples/es+fr+us/sq2lv_layouts.c | 80 +++++++++---------- .../sq2lv_layouts.c | 20 ++--- examples/us/sq2lv_layouts.c | 24 +++--- squeek2lvgl.py | 4 +- 5 files changed, 81 insertions(+), 79 deletions(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c index a724f14..c23fe10 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c @@ -25,10 +25,10 @@ static const char * const keycaps_lower_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_de = 0; @@ -57,10 +57,10 @@ static const char * const keycaps_upper_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_de = 0; @@ -89,10 +89,10 @@ static const char * const keycaps_numbers_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_de = 0; @@ -121,10 +121,10 @@ static const char * const keycaps_special_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_de = 0; diff --git a/examples/es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c index fbddcaf..18e590e 100644 --- a/examples/es+fr+us/sq2lv_layouts.c +++ b/examples/es+fr+us/sq2lv_layouts.c @@ -25,10 +25,10 @@ static const char * const keycaps_lower_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_es[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_es = 0; @@ -57,10 +57,10 @@ static const char * const keycaps_upper_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_es[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_es = 0; @@ -89,10 +89,10 @@ static const char * const keycaps_numbers_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_es[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_es = 0; @@ -121,10 +121,10 @@ static const char * const keycaps_special_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_special_es[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_es = 0; @@ -207,9 +207,9 @@ static const char * const keycaps_lower_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_fr[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -239,9 +239,9 @@ static const char * const keycaps_upper_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_fr[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -271,9 +271,9 @@ static const char * const keycaps_numbers_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_fr[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -303,9 +303,9 @@ static const char * const keycaps_special_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_special_fr[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_NON_CHAR | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -389,10 +389,10 @@ static const char * const keycaps_lower_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_us = 0; @@ -421,10 +421,10 @@ static const char * const keycaps_upper_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_us = 0; @@ -453,10 +453,10 @@ static const char * const keycaps_numbers_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_us = 0; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 74673c0..8eb8565 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -28,9 +28,9 @@ static const char * const keycaps_lower_terminal_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -90,9 +90,9 @@ static const char * const keycaps_upper_terminal_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -152,10 +152,10 @@ static const char * const keycaps_numbers_terminal_us[] = { \ static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, 7, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, 7, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_terminal_us = 2; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 9bc7960..89b9d30 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -25,10 +25,10 @@ static const char * const keycaps_lower_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_us = 0; @@ -57,10 +57,10 @@ static const char * const keycaps_upper_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_us = 0; @@ -89,10 +89,10 @@ static const char * const keycaps_numbers_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ - 2, 2, 2, 2, 2, 2, 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_us = 0; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 95d57f3..4992df3 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -377,8 +377,10 @@ def key_to_attributes(key, is_locked, is_lockable, data_buttons): attributes.append('SQ2LV_CTRL_MOD_INACTIVE') elif key in data_buttons and key not in ['"', 'colon', 'period', 'space'] or key in ['←', '→']: attributes.append('SQ2LV_CTRL_NON_CHAR') + elif key not in ['space']: + attributes.append('LV_BTNMATRIX_CTRL_POPOVER') - if key not in data_buttons or key in ['period', 'colon', '"']: + if key not in data_buttons or key in ['"', 'colon', 'period']: attributes.append('2') elif key == 'space': attributes.append('7') From 07c5eef6222a274b8e52a9691b871da65403f43c Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Tue, 12 Oct 2021 19:55:59 +0200 Subject: [PATCH 35/46] Fix scancodes for / and ? --- .../us-terminal-with-scancodes/sq2lv_layouts.c | 14 +++++++------- squeek2lvgl.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 8eb8565..0249a9e 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -179,24 +179,24 @@ static const int num_scancodes_numbers_terminal_us = 5; static const int scancodes_numbers_terminal_us[] = { \ KEY_LEFTCTRL, KEY_LEFTALT, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, \ KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, \ - KEY_LEFTSHIFT, KEY_8, KEY_LEFTSHIFT, KEY_3, KEY_LEFTSHIFT, KEY_4, KEY_LEFTSHIFT, KEY_QUESTION, KEY_LEFTSHIFT, KEY_7, KEY_MINUS, KEY_LEFTSHIFT, KEY_MINUS, KEY_LEFTSHIFT, KEY_EQUAL, KEY_LEFTSHIFT, KEY_9, KEY_LEFTSHIFT, KEY_0, \ - KEY_COMMA, KEY_LEFTSHIFT, KEY_APOSTROPHE, KEY_APOSTROPHE, KEY_LEFTSHIFT, KEY_SEMICOLON, KEY_SEMICOLON, KEY_LEFTSHIFT, KEY_1, KEY_QUESTION, KEY_BACKSPACE, \ + KEY_LEFTSHIFT, KEY_8, KEY_LEFTSHIFT, KEY_3, KEY_LEFTSHIFT, KEY_4, KEY_SLASH, KEY_LEFTSHIFT, KEY_7, KEY_MINUS, KEY_LEFTSHIFT, KEY_MINUS, KEY_LEFTSHIFT, KEY_EQUAL, KEY_LEFTSHIFT, KEY_9, KEY_LEFTSHIFT, KEY_0, \ + KEY_COMMA, KEY_LEFTSHIFT, KEY_APOSTROPHE, KEY_APOSTROPHE, KEY_LEFTSHIFT, KEY_SEMICOLON, KEY_SEMICOLON, KEY_LEFTSHIFT, KEY_1, KEY_LEFTSHIFT, KEY_SLASH, KEY_BACKSPACE, \ KEY_SPACE, KEY_DOT, KEY_ENTER \ }; static const int scancode_idxs_numbers_terminal_us[] = { \ 0, 1, 2, 3, 4, 5, \ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \ - 16, 18, 20, 22, 24, 26, 27, 29, 31, 33, \ - 35, 36, 38, 39, 41, 42, 44, 45, \ + 16, 18, 20, 22, 23, 25, 26, 28, 30, 32, \ + 34, 35, 37, 38, 40, 41, 43, 45, \ -1, 46, 47, 48 \ }; static const int scancode_nums_numbers_terminal_us[] = { \ 1, 1, 1, 1, 1, 1, \ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ - 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, \ - 1, 2, 1, 2, 1, 2, 1, 1, \ + 2, 2, 2, 1, 2, 1, 2, 2, 2, 2, \ + 1, 2, 1, 2, 1, 2, 2, 1, \ 0, 1, 1, 1 \ }; @@ -279,5 +279,5 @@ const int sq2lv_unique_scancodes[] = { KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_BACKSPACE, KEY_SPACE, KEY_ENTER, KEY_PAGEUP, KEY_PAGEDOWN, KEY_HOME, KEY_END, KEY_LEFTSHIFT, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, - KEY_QUESTION, KEY_MINUS, KEY_EQUAL, KEY_COMMA, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_DOT + KEY_SLASH, KEY_MINUS, KEY_EQUAL, KEY_COMMA, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_DOT }; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 4992df3..9f1c1cf 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -478,7 +478,7 @@ scancodes_for_keycap = { '*': ['KEY_LEFTSHIFT', 'KEY_8'], '#': ['KEY_LEFTSHIFT', 'KEY_3'], '$': ['KEY_LEFTSHIFT', 'KEY_4'], - '/': ['KEY_LEFTSHIFT', 'KEY_QUESTION'], + '/': ['KEY_SLASH'], '&': ['KEY_LEFTSHIFT', 'KEY_7'], '-': ['KEY_MINUS'], '_': ['KEY_LEFTSHIFT', 'KEY_MINUS'], @@ -491,7 +491,7 @@ scancodes_for_keycap = { ':': ['KEY_LEFTSHIFT', 'KEY_SEMICOLON'], ';': ['KEY_SEMICOLON'], '!': ['KEY_LEFTSHIFT', 'KEY_1'], - '?': ['KEY_QUESTION'], + '?': ['KEY_LEFTSHIFT', 'KEY_SLASH'], '.': ['KEY_DOT'] } From e0eb3c4c0dd19a68f14fa81d5fa94f65f19c8674 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Tue, 12 Oct 2021 20:34:54 +0200 Subject: [PATCH 36/46] Add support for further layers (some keys still missing scancodes) --- .../sq2lv_layouts.c | 60 ++++- examples/es+fr+us/sq2lv_layouts.c | 176 ++++++++++++--- .../sq2lv_layouts.c | 208 +++++++++++++++--- examples/us/sq2lv_layouts.c | 56 ++++- sq2lv.c | 16 ++ squeek2lvgl.py | 69 +++++- 6 files changed, 509 insertions(+), 76 deletions(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c index c23fe10..69444b2 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c @@ -42,7 +42,7 @@ static const int switcher_idxs_lower_de[] = { \ }; static const int switcher_dests_lower_de[] = { \ - 1, 2, 3 \ + 1, 2, 4 \ }; /* Layer: Uppercase letters - generated from upper */ @@ -74,24 +74,24 @@ static const int switcher_idxs_upper_de[] = { \ }; static const int switcher_dests_upper_de[] = { \ - 0, 2, 3 \ + 0, 2, 4 \ }; /* Layer: Numbers / symbols - generated from numbers */ -static const int num_keys_numbers_de = 36; +static const int num_keys_numbers_de = 37; static const char * const keycaps_numbers_de[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -99,14 +99,46 @@ static const int num_modifiers_numbers_de = 0; static const int * const modifier_idxs_numbers_de = NULL; -static const int num_switchers_numbers_de = 2; +static const int num_switchers_numbers_de = 3; static const int switcher_idxs_numbers_de[] = { \ - 28, 29 \ + 20, 29, 30 \ }; static const int switcher_dests_numbers_de[] = { \ - 0, 3 \ + 3, 0, 4 \ +}; + +/* Layer: Symbols - generated from symbols */ + +static const int num_keys_symbols_de = 37; + +static const char * const keycaps_symbols_de[] = { \ + "~", "`", "´", "|", "·", "√", "µ", "÷", "×", "¶", "\n", \ + "©", "®", "£", "$", "¥", "^", "°", "*", "{", "}", "\n", \ + "123", "\\", "/", "§", "π", "τ", "[", "]", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_symbols_de[] = { \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_symbols_de = 0; + +static const int * const modifier_idxs_symbols_de = NULL; + +static const int num_switchers_symbols_de = 3; + +static const int switcher_idxs_symbols_de[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_symbols_de[] = { \ + 2, 0, 4 \ }; /* Layer: Special characters - generated from eschars */ @@ -143,7 +175,7 @@ static const int switcher_dests_special_de[] = { \ /* Layer array */ -static const int num_layers_de = 4; +static const int num_layers_de = 5; static const sq2lv_layer_t layers_de[] = { { @@ -176,6 +208,16 @@ static const sq2lv_layer_t layers_de[] = { .switcher_idxs = switcher_idxs_numbers_de, .switcher_dests = switcher_dests_numbers_de }, + { + .num_keys = num_keys_symbols_de, + .keycaps = keycaps_symbols_de, + .attributes = attributes_symbols_de, + .num_modifiers = num_modifiers_symbols_de, + .modifier_idxs = modifier_idxs_symbols_de, + .num_switchers = num_switchers_symbols_de, + .switcher_idxs = switcher_idxs_symbols_de, + .switcher_dests = switcher_dests_symbols_de + }, { .num_keys = num_keys_special_de, .keycaps = keycaps_special_de, diff --git a/examples/es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c index 18e590e..5b4fad4 100644 --- a/examples/es+fr+us/sq2lv_layouts.c +++ b/examples/es+fr+us/sq2lv_layouts.c @@ -42,7 +42,7 @@ static const int switcher_idxs_lower_es[] = { \ }; static const int switcher_dests_lower_es[] = { \ - 1, 2, 3 \ + 1, 2, 4 \ }; /* Layer: Uppercase letters - generated from upper */ @@ -74,24 +74,24 @@ static const int switcher_idxs_upper_es[] = { \ }; static const int switcher_dests_upper_es[] = { \ - 0, 2, 3 \ + 0, 2, 4 \ }; /* Layer: Numbers / symbols - generated from numbers */ -static const int num_keys_numbers_es = 36; +static const int num_keys_numbers_es = 37; static const char * const keycaps_numbers_es[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ",", "\"", "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \ "abc", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_es[] = { \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -99,14 +99,46 @@ static const int num_modifiers_numbers_es = 0; static const int * const modifier_idxs_numbers_es = NULL; -static const int num_switchers_numbers_es = 2; +static const int num_switchers_numbers_es = 3; static const int switcher_idxs_numbers_es[] = { \ - 28, 29 \ + 20, 29, 30 \ }; static const int switcher_dests_numbers_es[] = { \ - 0, 3 \ + 3, 0, 4 \ +}; + +/* Layer: Symbols - generated from symbols */ + +static const int num_keys_symbols_es = 37; + +static const char * const keycaps_symbols_es[] = { \ + "~", "`", "|", "·", "√", "π", "τ", "÷", "×", "¶", "\n", \ + "©", "®", "£", "$", "¥", "^", "°", "*", "{", "}", "\n", \ + "123", "\\", "/", "<", ">", "=", "[", "]", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_symbols_es[] = { \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_symbols_es = 0; + +static const int * const modifier_idxs_symbols_es = NULL; + +static const int num_switchers_symbols_es = 3; + +static const int switcher_idxs_symbols_es[] = { \ + 20, 29, 30 \ +}; + +static const int switcher_dests_symbols_es[] = { \ + 2, 0, 4 \ }; /* Layer: Special characters - generated from eschars */ @@ -143,7 +175,7 @@ static const int switcher_dests_special_es[] = { \ /* Layer array */ -static const int num_layers_es = 4; +static const int num_layers_es = 5; static const sq2lv_layer_t layers_es[] = { { @@ -176,6 +208,16 @@ static const sq2lv_layer_t layers_es[] = { .switcher_idxs = switcher_idxs_numbers_es, .switcher_dests = switcher_dests_numbers_es }, + { + .num_keys = num_keys_symbols_es, + .keycaps = keycaps_symbols_es, + .attributes = attributes_symbols_es, + .num_modifiers = num_modifiers_symbols_es, + .modifier_idxs = modifier_idxs_symbols_es, + .num_switchers = num_switchers_symbols_es, + .switcher_idxs = switcher_idxs_symbols_es, + .switcher_dests = switcher_dests_symbols_es + }, { .num_keys = num_keys_special_es, .keycaps = keycaps_special_es, @@ -224,7 +266,7 @@ static const int switcher_idxs_lower_fr[] = { \ }; static const int switcher_dests_lower_fr[] = { \ - 1, 2, 3 \ + 1, 2, 4 \ }; /* Layer: Uppercase letters - generated from upper */ @@ -256,24 +298,24 @@ static const int switcher_idxs_upper_fr[] = { \ }; static const int switcher_dests_upper_fr[] = { \ - 0, 2, 3 \ + 0, 2, 4 \ }; /* Layer: Numbers / symbols - generated from numbers */ -static const int num_keys_numbers_fr = 34; +static const int num_keys_numbers_fr = 35; static const char * const keycaps_numbers_fr[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_fr[] = { \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -281,14 +323,46 @@ static const int num_modifiers_numbers_fr = 0; static const int * const modifier_idxs_numbers_fr = NULL; -static const int num_switchers_numbers_fr = 2; +static const int num_switchers_numbers_fr = 3; static const int switcher_idxs_numbers_fr[] = { \ - 28, 32 \ + 20, 29, 33 \ }; static const int switcher_dests_numbers_fr[] = { \ - 0, 3 \ + 3, 0, 4 \ +}; + +/* Layer: Symbols - generated from symbols */ + +static const int num_keys_symbols_fr = 35; + +static const char * const keycaps_symbols_fr[] = { \ + "~", "`", "|", "·", "√", "π", "τ", "÷", "×", "¶", "\n", \ + "©", "®", "£", "$", "¥", "^", "°", "*", "{", "}", "\n", \ + "123", "\\", "/", "<", ">", "=", "[", "]", LV_SYMBOL_BACKSPACE, "\n", \ + "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_symbols_fr[] = { \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_symbols_fr = 0; + +static const int * const modifier_idxs_symbols_fr = NULL; + +static const int num_switchers_symbols_fr = 3; + +static const int switcher_idxs_symbols_fr[] = { \ + 20, 29, 33 \ +}; + +static const int switcher_dests_symbols_fr[] = { \ + 2, 0, 4 \ }; /* Layer: Special characters - generated from eschars */ @@ -325,7 +399,7 @@ static const int switcher_dests_special_fr[] = { \ /* Layer array */ -static const int num_layers_fr = 4; +static const int num_layers_fr = 5; static const sq2lv_layer_t layers_fr[] = { { @@ -358,6 +432,16 @@ static const sq2lv_layer_t layers_fr[] = { .switcher_idxs = switcher_idxs_numbers_fr, .switcher_dests = switcher_dests_numbers_fr }, + { + .num_keys = num_keys_symbols_fr, + .keycaps = keycaps_symbols_fr, + .attributes = attributes_symbols_fr, + .num_modifiers = num_modifiers_symbols_fr, + .modifier_idxs = modifier_idxs_symbols_fr, + .num_switchers = num_switchers_symbols_fr, + .switcher_idxs = switcher_idxs_symbols_fr, + .switcher_dests = switcher_dests_symbols_fr + }, { .num_keys = num_keys_special_fr, .keycaps = keycaps_special_fr, @@ -443,19 +527,19 @@ static const int switcher_dests_upper_us[] = { \ /* Layer: Numbers / symbols - generated from numbers */ -static const int num_keys_numbers_us = 34; +static const int num_keys_numbers_us = 35; static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -463,19 +547,51 @@ static const int num_modifiers_numbers_us = 0; static const int * const modifier_idxs_numbers_us = NULL; -static const int num_switchers_numbers_us = 1; +static const int num_switchers_numbers_us = 2; static const int switcher_idxs_numbers_us[] = { \ - 28 \ + 20, 29 \ }; static const int switcher_dests_numbers_us[] = { \ - 0 \ + 3, 0 \ +}; + +/* Layer: Symbols - generated from symbols */ + +static const int num_keys_symbols_us = 35; + +static const char * const keycaps_symbols_us[] = { \ + "~", "`", "|", "·", "√", "π", "τ", "÷", "×", "¶", "\n", \ + "©", "®", "£", "€", "¥", "^", "°", "*", "{", "}", "\n", \ + "123", "\\", "/", "<", ">", "=", "[", "]", LV_SYMBOL_BACKSPACE, "\n", \ + "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_symbols_us[] = { \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_symbols_us = 0; + +static const int * const modifier_idxs_symbols_us = NULL; + +static const int num_switchers_symbols_us = 2; + +static const int switcher_idxs_symbols_us[] = { \ + 20, 29 \ +}; + +static const int switcher_dests_symbols_us[] = { \ + 2, 0 \ }; /* Layer array */ -static const int num_layers_us = 3; +static const int num_layers_us = 4; static const sq2lv_layer_t layers_us[] = { { @@ -507,6 +623,16 @@ static const sq2lv_layer_t layers_us[] = { .num_switchers = num_switchers_numbers_us, .switcher_idxs = switcher_idxs_numbers_us, .switcher_dests = switcher_dests_numbers_us + }, + { + .num_keys = num_keys_symbols_us, + .keycaps = keycaps_symbols_us, + .attributes = attributes_symbols_us, + .num_modifiers = num_modifiers_symbols_us, + .modifier_idxs = modifier_idxs_symbols_us, + .num_switchers = num_switchers_symbols_us, + .switcher_idxs = switcher_idxs_symbols_us, + .switcher_dests = switcher_dests_symbols_us } }; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 0249a9e..8cb62bc 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -16,14 +16,14 @@ static const char * const short_name_terminal_us = "terminal/us"; /* Layer: Lowercase letters - generated from base */ -static const int num_keys_lower_terminal_us = 37; +static const int num_keys_lower_terminal_us = 38; static const char * const keycaps_lower_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "\n", \ "a", "s", "d", "f", "g", "h", "j", "k", "l", "\n", \ SQ2LV_SYMBOL_SHIFT, "z", "x", "c", "v", "b", "n", "m", LV_SYMBOL_BACKSPACE, "\n", \ - "123", " ", LV_SYMBOL_OK, "" \ + "123", " ", ">_", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ @@ -31,7 +31,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3 \ + SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_terminal_us = 2; @@ -40,14 +40,14 @@ static const int modifier_idxs_lower_terminal_us[] = { \ 0, 1 \ }; -static const int num_switchers_lower_terminal_us = 2; +static const int num_switchers_lower_terminal_us = 3; static const int switcher_idxs_lower_terminal_us[] = { \ - 25, 34 \ + 25, 34, 36 \ }; static const int switcher_dests_lower_terminal_us[] = { \ - 1, 2 \ + 1, 2, 4 \ }; static const int num_scancodes_lower_terminal_us = 5; @@ -65,7 +65,7 @@ static const int scancode_idxs_lower_terminal_us[] = { \ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \ 16, 17, 18, 19, 20, 21, 22, 23, 24, \ -1, 25, 26, 27, 28, 29, 30, 31, 32, \ - -1, 33, 34 \ + -1, 33, -1, 34 \ }; static const int scancode_nums_lower_terminal_us[] = { \ @@ -73,19 +73,19 @@ static const int scancode_nums_lower_terminal_us[] = { \ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ 1, 1, 1, 1, 1, 1, 1, 1, 1, \ 0, 1, 1, 1, 1, 1, 1, 1, 1, \ - 0, 1, 1 \ + 0, 1, 0, 1 \ }; /* Layer: Uppercase letters - generated from upper */ -static const int num_keys_upper_terminal_us = 37; +static const int num_keys_upper_terminal_us = 38; static const char * const keycaps_upper_terminal_us[] = { \ "Ctrl", "Alt", "PgUp", "PgDn", "Home", "End", "\n", \ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "\n", \ "A", "S", "D", "F", "G", "H", "J", "K", "L", "\n", \ SQ2LV_SYMBOL_SHIFT, "Z", "X", "C", "V", "B", "N", "M", LV_SYMBOL_BACKSPACE, "\n", \ - "123", " ", LV_SYMBOL_OK, "" \ + "123", " ", ">_", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ @@ -93,7 +93,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3 \ + SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_terminal_us = 2; @@ -102,14 +102,14 @@ static const int modifier_idxs_upper_terminal_us[] = { \ 0, 1 \ }; -static const int num_switchers_upper_terminal_us = 2; +static const int num_switchers_upper_terminal_us = 3; static const int switcher_idxs_upper_terminal_us[] = { \ - 25, 34 \ + 25, 34, 36 \ }; static const int switcher_dests_upper_terminal_us[] = { \ - 0, 2 \ + 0, 2, 4 \ }; static const int num_scancodes_upper_terminal_us = 5; @@ -127,7 +127,7 @@ static const int scancode_idxs_upper_terminal_us[] = { \ 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, \ 26, 28, 30, 32, 34, 36, 38, 40, 42, \ -1, 44, 46, 48, 50, 52, 54, 56, 58, \ - -1, 59, 60 \ + -1, 59, -1, 60 \ }; static const int scancode_nums_upper_terminal_us[] = { \ @@ -135,18 +135,18 @@ static const int scancode_nums_upper_terminal_us[] = { \ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 2, 2, 2, 2, 2, 2, 2, 2, 2, \ 0, 2, 2, 2, 2, 2, 2, 2, 1, \ - 0, 1, 1 \ + 0, 1, 0, 1 \ }; /* Layer: Numbers / symbols - generated from numbers */ -static const int num_keys_numbers_terminal_us = 38; +static const int num_keys_numbers_terminal_us = 39; static const char * const keycaps_numbers_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \ - ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "τ=\", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", " ", ".", LV_SYMBOL_OK, "" \ }; @@ -154,7 +154,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, 7, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -164,14 +164,14 @@ static const int modifier_idxs_numbers_terminal_us[] = { \ 0, 1 \ }; -static const int num_switchers_numbers_terminal_us = 1; +static const int num_switchers_numbers_terminal_us = 2; static const int switcher_idxs_numbers_terminal_us[] = { \ - 34 \ + 26, 35 \ }; static const int switcher_dests_numbers_terminal_us[] = { \ - 0 \ + 3, 0 \ }; static const int num_scancodes_numbers_terminal_us = 5; @@ -188,7 +188,7 @@ static const int scancode_idxs_numbers_terminal_us[] = { \ 0, 1, 2, 3, 4, 5, \ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \ 16, 18, 20, 22, 23, 25, 26, 28, 30, 32, \ - 34, 35, 37, 38, 40, 41, 43, 45, \ + -1, 34, 35, 37, 38, 40, 41, 43, 45, \ -1, 46, 47, 48 \ }; @@ -196,13 +196,137 @@ static const int scancode_nums_numbers_terminal_us[] = { \ 1, 1, 1, 1, 1, 1, \ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ 2, 2, 2, 1, 2, 1, 2, 2, 2, 2, \ - 1, 2, 1, 2, 1, 2, 2, 1, \ + 0, 1, 2, 1, 2, 1, 2, 2, 1, \ 0, 1, 1, 1 \ }; +/* Layer: Symbols - generated from symbols */ + +static const int num_keys_symbols_terminal_us = 39; + +static const char * const keycaps_symbols_terminal_us[] = { \ + "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ + "~", "`", "|", "·", "√", "π", "τ", "÷", "×", "¶", "\n", \ + "©", "®", "£", "€", "¥", "^", "°", "@", "{", "}", "\n", \ + "123", "\\", "%", "<", ">", "=", "[", "]", LV_SYMBOL_BACKSPACE, "\n", \ + "ABC", " ", ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_symbols_terminal_us[] = { \ + SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, 7, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_symbols_terminal_us = 2; + +static const int modifier_idxs_symbols_terminal_us[] = { \ + 0, 1 \ +}; + +static const int num_switchers_symbols_terminal_us = 2; + +static const int switcher_idxs_symbols_terminal_us[] = { \ + 26, 35 \ +}; + +static const int switcher_dests_symbols_terminal_us[] = { \ + 2, 0 \ +}; + +static const int num_scancodes_symbols_terminal_us = 5; + +static const int scancodes_symbols_terminal_us[] = { \ + KEY_LEFTCTRL, KEY_LEFTALT, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, \ + KEY_LEFTSHIFT, KEY_GRAVE, KEY_GRAVE, KEY_LEFTSHIFT, KEY_BACKSLASH, \ + KEY_LEFTSHIFT, KEY_6, KEY_LEFTSHIFT, KEY_2, KEY_LEFTSHIFT, KEY_LEFTBRACE, KEY_LEFTSHIFT, KEY_RIGHTBRACE, \ + KEY_BACKSLASH, KEY_LEFTSHIFT, KEY_5, KEY_LEFTSHIFT, KEY_COMMA, KEY_LEFTSHIFT, KEY_DOT, KEY_EQUAL, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_BACKSPACE, \ + KEY_SPACE, KEY_DOT, KEY_ENTER \ +}; + +static const int scancode_idxs_symbols_terminal_us[] = { \ + 0, 1, 2, 3, 4, 5, \ + 6, 8, 9, -1, -1, -1, -1, -1, -1, -1, \ + -1, -1, -1, -1, -1, 11, -1, 13, 15, 17, \ + -1, 19, 20, 22, 24, 26, 27, 28, 29, \ + -1, 30, 31, 32 \ +}; + +static const int scancode_nums_symbols_terminal_us[] = { \ + 1, 1, 1, 1, 1, 1, \ + 2, 1, 2, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 2, 0, 2, 2, 2, \ + 0, 1, 2, 2, 2, 1, 1, 1, 1, \ + 0, 1, 1, 1 \ +}; + +/* Layer: Actions - generated from actions */ + +static const int num_keys_actions_terminal_us = 30; + +static const char * const keycaps_actions_terminal_us[] = { \ + "Ctrl", "Alt", "PgUp", "PgDn", "Home", "End", "\n", \ + "F1", "F2", "F3", "F4", "F5", "F6", "\n", \ + "F7", "F8", "F9", "F10", "F11", "F12", "\n", \ + "Esc", "Tab", "Pause", "Insert", "↑", "Del", "\n", \ + "ABC", "Menu", "Break", "←", "↓", "→", "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_actions_terminal_us[] = { \ + SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_actions_terminal_us = 2; + +static const int modifier_idxs_actions_terminal_us[] = { \ + 0, 1 \ +}; + +static const int num_switchers_actions_terminal_us = 1; + +static const int switcher_idxs_actions_terminal_us[] = { \ + 24 \ +}; + +static const int switcher_dests_actions_terminal_us[] = { \ + 0 \ +}; + +static const int num_scancodes_actions_terminal_us = 5; + +static const int scancodes_actions_terminal_us[] = { \ + KEY_LEFTCTRL, KEY_LEFTALT, KEY_PAGEUP, KEY_PAGEDOWN, KEY_HOME, KEY_END, \ + KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, \ + KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, \ + KEY_ESC, KEY_TAB, KEY_PAUSE, KEY_INSERT, KEY_UP, KEY_DELETE, \ + KEY_COMPOSE, KEY_BREAK, KEY_LEFT, KEY_DOWN, KEY_RIGHT \ +}; + +static const int scancode_idxs_actions_terminal_us[] = { \ + 0, 1, 2, 3, 4, 5, \ + 6, 7, 8, 9, 10, 11, \ + 12, 13, 14, 15, 16, 17, \ + 18, 19, 20, 21, 22, 23, \ + -1, 24, 25, 26, 27, 28 \ +}; + +static const int scancode_nums_actions_terminal_us[] = { \ + 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, \ + 0, 1, 1, 1, 1, 1 \ +}; + /* Layer array */ -static const int num_layers_terminal_us = 3; +static const int num_layers_terminal_us = 5; static const sq2lv_layer_t layers_terminal_us[] = { { @@ -246,6 +370,34 @@ static const sq2lv_layer_t layers_terminal_us[] = { .scancodes = scancodes_numbers_terminal_us, .scancode_idxs = scancode_idxs_numbers_terminal_us, .scancode_nums = scancode_nums_numbers_terminal_us + }, + { + .num_keys = num_keys_symbols_terminal_us, + .keycaps = keycaps_symbols_terminal_us, + .attributes = attributes_symbols_terminal_us, + .num_modifiers = num_modifiers_symbols_terminal_us, + .modifier_idxs = modifier_idxs_symbols_terminal_us, + .num_switchers = num_switchers_symbols_terminal_us, + .switcher_idxs = switcher_idxs_symbols_terminal_us, + .switcher_dests = switcher_dests_symbols_terminal_us, + .num_scancodes = num_scancodes_symbols_terminal_us, + .scancodes = scancodes_symbols_terminal_us, + .scancode_idxs = scancode_idxs_symbols_terminal_us, + .scancode_nums = scancode_nums_symbols_terminal_us + }, + { + .num_keys = num_keys_actions_terminal_us, + .keycaps = keycaps_actions_terminal_us, + .attributes = attributes_actions_terminal_us, + .num_modifiers = num_modifiers_actions_terminal_us, + .modifier_idxs = modifier_idxs_actions_terminal_us, + .num_switchers = num_switchers_actions_terminal_us, + .switcher_idxs = switcher_idxs_actions_terminal_us, + .switcher_dests = switcher_dests_actions_terminal_us, + .num_scancodes = num_scancodes_actions_terminal_us, + .scancodes = scancodes_actions_terminal_us, + .scancode_idxs = scancode_idxs_actions_terminal_us, + .scancode_nums = scancode_nums_actions_terminal_us } }; @@ -271,7 +423,7 @@ const char * const sq2lv_layout_names = const char * const sq2lv_layout_short_names = "terminal/us"; -const int sq2lv_num_unique_scancodes = 57; +const int sq2lv_num_unique_scancodes = 80; const int sq2lv_unique_scancodes[] = { KEY_LEFTCTRL, KEY_LEFTALT, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_Q, KEY_W, KEY_E, KEY_R, @@ -279,5 +431,7 @@ const int sq2lv_unique_scancodes[] = { KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_BACKSPACE, KEY_SPACE, KEY_ENTER, KEY_PAGEUP, KEY_PAGEDOWN, KEY_HOME, KEY_END, KEY_LEFTSHIFT, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, - KEY_SLASH, KEY_MINUS, KEY_EQUAL, KEY_COMMA, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_DOT + KEY_SLASH, KEY_MINUS, KEY_EQUAL, KEY_COMMA, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_DOT, KEY_GRAVE, KEY_BACKSLASH, KEY_LEFTBRACE, + KEY_RIGHTBRACE, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, + KEY_F10, KEY_F11, KEY_F12, KEY_ESC, KEY_TAB, KEY_PAUSE, KEY_INSERT, KEY_DELETE, KEY_COMPOSE, KEY_BREAK }; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 89b9d30..4f36594 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -79,19 +79,19 @@ static const int switcher_dests_upper_us[] = { \ /* Layer: Numbers / symbols - generated from numbers */ -static const int num_keys_numbers_us = 34; +static const int num_keys_numbers_us = 35; static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ - ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; @@ -99,19 +99,51 @@ static const int num_modifiers_numbers_us = 0; static const int * const modifier_idxs_numbers_us = NULL; -static const int num_switchers_numbers_us = 1; +static const int num_switchers_numbers_us = 2; static const int switcher_idxs_numbers_us[] = { \ - 28 \ + 20, 29 \ }; static const int switcher_dests_numbers_us[] = { \ - 0 \ + 3, 0 \ +}; + +/* Layer: Symbols - generated from symbols */ + +static const int num_keys_symbols_us = 35; + +static const char * const keycaps_symbols_us[] = { \ + "~", "`", "|", "·", "√", "π", "τ", "÷", "×", "¶", "\n", \ + "©", "®", "£", "€", "¥", "^", "°", "*", "{", "}", "\n", \ + "123", "\\", "/", "<", ">", "=", "[", "]", LV_SYMBOL_BACKSPACE, "\n", \ + "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ +}; + +static const lv_btnmatrix_ctrl_t attributes_symbols_us[] = { \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ + SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ +}; + +static const int num_modifiers_symbols_us = 0; + +static const int * const modifier_idxs_symbols_us = NULL; + +static const int num_switchers_symbols_us = 2; + +static const int switcher_idxs_symbols_us[] = { \ + 20, 29 \ +}; + +static const int switcher_dests_symbols_us[] = { \ + 2, 0 \ }; /* Layer array */ -static const int num_layers_us = 3; +static const int num_layers_us = 4; static const sq2lv_layer_t layers_us[] = { { @@ -143,6 +175,16 @@ static const sq2lv_layer_t layers_us[] = { .num_switchers = num_switchers_numbers_us, .switcher_idxs = switcher_idxs_numbers_us, .switcher_dests = switcher_dests_numbers_us + }, + { + .num_keys = num_keys_symbols_us, + .keycaps = keycaps_symbols_us, + .attributes = attributes_symbols_us, + .num_modifiers = num_modifiers_symbols_us, + .modifier_idxs = modifier_idxs_symbols_us, + .num_switchers = num_switchers_symbols_us, + .switcher_idxs = switcher_idxs_symbols_us, + .switcher_dests = switcher_dests_symbols_us } }; diff --git a/sq2lv.c b/sq2lv.c index def04fe..298011b 100644 --- a/sq2lv.c +++ b/sq2lv.c @@ -80,6 +80,14 @@ static lv_keyboard_mode_t layer_index_to_keyboard_mode(int layer_index) { return LV_KEYBOARD_MODE_SPECIAL; case 3: return LV_KEYBOARD_MODE_NUMBER; + case 4: + return LV_KEYBOARD_MODE_USER_1; + case 5: + return LV_KEYBOARD_MODE_USER_2; + case 6: + return LV_KEYBOARD_MODE_USER_3; + case 7: + return LV_KEYBOARD_MODE_USER_4; default: return -1; } @@ -95,6 +103,14 @@ static int keyboard_mode_to_layer_index(lv_keyboard_mode_t keyboard_mode) { return 2; case LV_KEYBOARD_MODE_NUMBER: return 3; + case LV_KEYBOARD_MODE_USER_1: + return 4; + case LV_KEYBOARD_MODE_USER_2: + return 5; + case LV_KEYBOARD_MODE_USER_3: + return 6; + case LV_KEYBOARD_MODE_USER_4: + return 7; default: return -1; } diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 9f1c1cf..c3a6eb3 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -286,7 +286,9 @@ layer_name_for_view_id = { 'base': 'Lowercase letters', 'upper': 'Uppercase letters', 'numbers': 'Numbers / symbols', - 'eschars': 'Special characters' + 'eschars': 'Special characters', + 'symbols': 'Symbols', + 'actions': 'Actions' } def view_id_to_layer_name(view_id): @@ -313,9 +315,7 @@ def view_id_to_c_identifier(view_id): ignored_keys = { - 'preferences', - 'show_actions', - 'show_symbols' + 'preferences' } def is_key_ignored(key): @@ -492,16 +492,67 @@ scancodes_for_keycap = { ';': ['KEY_SEMICOLON'], '!': ['KEY_LEFTSHIFT', 'KEY_1'], '?': ['KEY_LEFTSHIFT', 'KEY_SLASH'], - '.': ['KEY_DOT'] + '.': ['KEY_DOT'], + '~': ['KEY_LEFTSHIFT', 'KEY_GRAVE'], + '`': ['KEY_GRAVE'], + '|': ['KEY_LEFTSHIFT', 'KEY_BACKSLASH'], + # '·': [], + # '√': [], + # 'π': [], + # 'τ': [], + # '÷': [], + # '×': [], + # '¶': [], + # '©': [], + # '®': [], + # '£': [], + # '€': [], + # '¥': [], + '\\\\': ['KEY_BACKSLASH'], + '^': ['KEY_LEFTSHIFT', 'KEY_6'], + # '°': [], + '@': ['KEY_LEFTSHIFT', 'KEY_2'], + '{': ['KEY_LEFTSHIFT', 'KEY_LEFTBRACE'], + '}': ['KEY_LEFTSHIFT', 'KEY_RIGHTBRACE'], + '%': ['KEY_LEFTSHIFT', 'KEY_5'], + '<': ['KEY_LEFTSHIFT', 'KEY_COMMA'], + '>': ['KEY_LEFTSHIFT', 'KEY_DOT'], + '=': ['KEY_EQUAL'], + '[': ['KEY_LEFTBRACE'], + ']': ['KEY_RIGHTBRACE'], + 'F1': ['KEY_F1'], + 'F2': ['KEY_F2'], + 'F3': ['KEY_F3'], + 'F4': ['KEY_F4'], + 'F5': ['KEY_F5'], + 'F6': ['KEY_F6'], + 'F7': ['KEY_F7'], + 'F8': ['KEY_F8'], + 'F9': ['KEY_F9'], + 'F10': ['KEY_F10'], + 'F11': ['KEY_F11'], + 'F12': ['KEY_F12'], + 'Esc': ['KEY_ESC'], + 'Tab': ['KEY_TAB'], + 'Pause': ['KEY_PAUSE'], + 'Insert': ['KEY_INSERT'], + 'Del': ['KEY_DELETE'], + 'Menu': ['KEY_COMPOSE'], + 'Break': ['KEY_BREAK'], + '↑': ['KEY_UP'], + '←': ['KEY_LEFT'], + '↓': ['KEY_DOWN'], + '→': ['KEY_RIGHT'] } -def keycap_to_scancodes(args, keycap): +def keycap_to_scancodes(args, keycap, is_switcher): """Return the scancodes needed to produce a keycap args -- commandline arguments keycap -- keycap to produce + is_switcher -- whether the key is a layer switcher """ - if keycap == 'SQ2LV_SYMBOL_SHIFT': + if is_switcher: return [] if keycap not in scancodes_for_keycap: warn(f'Cannot determine scancodes for unknown keycap "{keycap}"') @@ -566,6 +617,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d is_locked = False is_lockable = False + is_switcher = False if key in data_buttons and 'action' in data_buttons[key]: action = data_buttons[key]['action'] @@ -583,11 +635,12 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d if dest: switcher_idxs.append(idx) switcher_dests.append(dest) + is_switcher = True attrs_in_row.append(key_to_attributes(key, is_locked, is_lockable, data_buttons)) if args.generate_scancodes: - scancodes_in_row.append(keycap_to_scancodes(args, keycap)) + scancodes_in_row.append(keycap_to_scancodes(args, keycap, is_switcher)) idx += 1 From 3d93f7c46973931b7023aff53e36272496076708 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Tue, 12 Oct 2021 20:38:46 +0200 Subject: [PATCH 37/46] Remove escaping for quote --- examples/de-with-custom-shift-keycap/sq2lv_layouts.c | 2 +- examples/es+fr+us/sq2lv_layouts.c | 6 +++--- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 2 +- examples/us/sq2lv_layouts.c | 2 +- squeek2lvgl.py | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c index 69444b2..94bf72d 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c @@ -84,7 +84,7 @@ static const int num_keys_numbers_de = 37; static const char * const keycaps_numbers_de[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ";", """, "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ }; diff --git a/examples/es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c index 5b4fad4..97a49d8 100644 --- a/examples/es+fr+us/sq2lv_layouts.c +++ b/examples/es+fr+us/sq2lv_layouts.c @@ -84,7 +84,7 @@ static const int num_keys_numbers_es = 37; static const char * const keycaps_numbers_es[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", "\"", "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", """, "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \ "abc", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \ }; @@ -308,7 +308,7 @@ static const int num_keys_numbers_fr = 35; static const char * const keycaps_numbers_fr[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ }; @@ -532,7 +532,7 @@ static const int num_keys_numbers_us = 35; static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 8cb62bc..4b9f09e 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -146,7 +146,7 @@ static const char * const keycaps_numbers_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \ - "τ=\", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "τ=\", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", " ", ".", LV_SYMBOL_OK, "" \ }; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 4f36594..b7b5dcc 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -84,7 +84,7 @@ static const int num_keys_numbers_us = 35; static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index c3a6eb3..80b0a27 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -328,7 +328,6 @@ def is_key_ignored(key): keycap_for_key = { '\\': '\\\\', - '"': '\\"', '↑': 'LV_SYMBOL_UP', '↓': 'LV_SYMBOL_DOWN', '←': 'LV_SYMBOL_LEFT', @@ -486,7 +485,7 @@ scancodes_for_keycap = { '(': ['KEY_LEFTSHIFT', 'KEY_9'], ')': ['KEY_LEFTSHIFT', 'KEY_0'], ',': ['KEY_COMMA'], - '\\"': ['KEY_LEFTSHIFT', 'KEY_APOSTROPHE'], + '"': ['KEY_LEFTSHIFT', 'KEY_APOSTROPHE'], '\'': ['KEY_APOSTROPHE'], ':': ['KEY_LEFTSHIFT', 'KEY_SEMICOLON'], ';': ['KEY_SEMICOLON'], From 160956cebcdbb944f7468d4bd5a3c99d6f84e545 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Tue, 12 Oct 2021 21:11:53 +0200 Subject: [PATCH 38/46] Fix arrow keycaps --- squeek2lvgl.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 80b0a27..7735f1a 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -338,6 +338,10 @@ keycap_for_key = { 'Shift_L': 'SQ2LV_SYMBOL_SHIFT', 'space': ' ', 'Return': 'LV_SYMBOL_OK', + 'Up': 'LV_SYMBOL_UP', + 'Left': 'LV_SYMBOL_LEFT', + 'Down': 'LV_SYMBOL_DOWN', + 'Right': 'LV_SYMBOL_RIGHT' } def key_to_keycap(args, key): @@ -374,7 +378,7 @@ def key_to_attributes(key, is_locked, is_lockable, data_buttons): attributes.append('SQ2LV_CTRL_MOD_ACTIVE') elif is_lockable: attributes.append('SQ2LV_CTRL_MOD_INACTIVE') - elif key in data_buttons and key not in ['"', 'colon', 'period', 'space'] or key in ['←', '→']: + elif key in data_buttons and key not in ['"', 'colon', 'period', 'space'] or key in ['↑', '←', '↓', '→']: attributes.append('SQ2LV_CTRL_NON_CHAR') elif key not in ['space']: attributes.append('LV_BTNMATRIX_CTRL_POPOVER') @@ -601,7 +605,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d keycap = None - if key in data_buttons and 'label' in data_buttons[key]: + if key in data_buttons and 'label' in data_buttons[key] and key not in ['Up', 'Left', 'Down', 'Right']: keycap = data_buttons[key]['label'] else: keycap = key_to_keycap(args, key) From 774da359f5b8f4f256f960d815a71dd38d5c6f3b Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Tue, 12 Oct 2021 21:18:02 +0200 Subject: [PATCH 39/46] Revert "Remove escaping for quote" This reverts commit 3d93f7c46973931b7023aff53e36272496076708. --- examples/de-with-custom-shift-keycap/sq2lv_layouts.c | 2 +- examples/es+fr+us/sq2lv_layouts.c | 6 +++--- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 2 +- examples/us/sq2lv_layouts.c | 2 +- squeek2lvgl.py | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c index 94bf72d..69444b2 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c @@ -84,7 +84,7 @@ static const int num_keys_numbers_de = 37; static const char * const keycaps_numbers_de[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ";", """, "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \ "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \ }; diff --git a/examples/es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c index 97a49d8..5b4fad4 100644 --- a/examples/es+fr+us/sq2lv_layouts.c +++ b/examples/es+fr+us/sq2lv_layouts.c @@ -84,7 +84,7 @@ static const int num_keys_numbers_es = 37; static const char * const keycaps_numbers_es[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", """, "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \ "abc", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \ }; @@ -308,7 +308,7 @@ static const int num_keys_numbers_fr = 35; static const char * const keycaps_numbers_fr[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \ }; @@ -532,7 +532,7 @@ static const int num_keys_numbers_us = 35; static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 4b9f09e..8cb62bc 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -146,7 +146,7 @@ static const char * const keycaps_numbers_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \ - "τ=\", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "τ=\", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", " ", ".", LV_SYMBOL_OK, "" \ }; diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index b7b5dcc..4f36594 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -84,7 +84,7 @@ static const int num_keys_numbers_us = 35; static const char * const keycaps_numbers_us[] = { \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \ - "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \ }; diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 7735f1a..b9debac 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -328,6 +328,7 @@ def is_key_ignored(key): keycap_for_key = { '\\': '\\\\', + '"': '\\"', '↑': 'LV_SYMBOL_UP', '↓': 'LV_SYMBOL_DOWN', '←': 'LV_SYMBOL_LEFT', @@ -489,7 +490,7 @@ scancodes_for_keycap = { '(': ['KEY_LEFTSHIFT', 'KEY_9'], ')': ['KEY_LEFTSHIFT', 'KEY_0'], ',': ['KEY_COMMA'], - '"': ['KEY_LEFTSHIFT', 'KEY_APOSTROPHE'], + '\\"': ['KEY_LEFTSHIFT', 'KEY_APOSTROPHE'], '\'': ['KEY_APOSTROPHE'], ':': ['KEY_LEFTSHIFT', 'KEY_SEMICOLON'], ';': ['KEY_SEMICOLON'], From db4222c091a2b5584cb952324f26e97ecc938de8 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Tue, 12 Oct 2021 21:20:54 +0200 Subject: [PATCH 40/46] Handle backslash in labels --- examples/us-terminal-with-scancodes/sq2lv_layouts.c | 6 +++--- squeek2lvgl.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 8cb62bc..855422d 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -146,7 +146,7 @@ static const char * const keycaps_numbers_terminal_us[] = { \ "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \ "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \ - "τ=\", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ + "τ=\\", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \ "ABC", " ", ".", LV_SYMBOL_OK, "" \ }; @@ -270,8 +270,8 @@ static const char * const keycaps_actions_terminal_us[] = { \ "Ctrl", "Alt", "PgUp", "PgDn", "Home", "End", "\n", \ "F1", "F2", "F3", "F4", "F5", "F6", "\n", \ "F7", "F8", "F9", "F10", "F11", "F12", "\n", \ - "Esc", "Tab", "Pause", "Insert", "↑", "Del", "\n", \ - "ABC", "Menu", "Break", "←", "↓", "→", "" \ + "Esc", "Tab", "Pause", "Insert", LV_SYMBOL_UP, "Del", "\n", \ + "ABC", "Menu", "Break", LV_SYMBOL_LEFT, LV_SYMBOL_DOWN, LV_SYMBOL_RIGHT, "" \ }; static const lv_btnmatrix_ctrl_t attributes_actions_terminal_us[] = { \ diff --git a/squeek2lvgl.py b/squeek2lvgl.py index b9debac..b0042b9 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -607,7 +607,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d keycap = None if key in data_buttons and 'label' in data_buttons[key] and key not in ['Up', 'Left', 'Down', 'Right']: - keycap = data_buttons[key]['label'] + keycap = data_buttons[key]['label'].replace('\\', '\\\\') else: keycap = key_to_keycap(args, key) From e3ce01bc38020b21bc61844fa1fed1a4f41097c5 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 24 Oct 2021 20:23:17 +0200 Subject: [PATCH 41/46] Make keys repeatable Relates: cherrypicker/buffyboard#11 --- .../sq2lv_layouts.c | 40 +++---- .../sq2lv_layouts.h | 6 +- examples/es+fr+us/sq2lv_layouts.c | 112 +++++++++--------- examples/es+fr+us/sq2lv_layouts.h | 6 +- .../sq2lv_layouts.c | 50 ++++---- .../sq2lv_layouts.h | 6 +- examples/us/sq2lv_layouts.c | 32 ++--- examples/us/sq2lv_layouts.h | 6 +- squeek2lvgl.py | 39 +++++- 9 files changed, 163 insertions(+), 134 deletions(-) diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c index 69444b2..334b92f 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c @@ -25,10 +25,10 @@ static const char * const keycaps_lower_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_de = 0; @@ -57,10 +57,10 @@ static const char * const keycaps_upper_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_de = 0; @@ -89,10 +89,10 @@ static const char * const keycaps_numbers_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_de = 0; @@ -121,10 +121,10 @@ static const char * const keycaps_symbols_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_symbols_de[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_symbols_de = 0; @@ -153,10 +153,10 @@ static const char * const keycaps_special_de[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_de = 0; diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.h b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h index b01cbe9..1e098c8 100644 --- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.h +++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.h @@ -10,9 +10,9 @@ #define SQ2LV_SCANCODES_ENABLED 0 /* Key attributes */ -#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) -#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) -#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { diff --git a/examples/es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c index 5b4fad4..3729167 100644 --- a/examples/es+fr+us/sq2lv_layouts.c +++ b/examples/es+fr+us/sq2lv_layouts.c @@ -25,10 +25,10 @@ static const char * const keycaps_lower_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_es[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_es = 0; @@ -57,10 +57,10 @@ static const char * const keycaps_upper_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_es[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_es = 0; @@ -89,10 +89,10 @@ static const char * const keycaps_numbers_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_es[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_es = 0; @@ -121,10 +121,10 @@ static const char * const keycaps_symbols_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_symbols_es[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_symbols_es = 0; @@ -153,10 +153,10 @@ static const char * const keycaps_special_es[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_special_es[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_es = 0; @@ -249,10 +249,10 @@ static const char * const keycaps_lower_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_fr[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_fr = 0; @@ -281,10 +281,10 @@ static const char * const keycaps_upper_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_fr[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_fr = 0; @@ -313,10 +313,10 @@ static const char * const keycaps_numbers_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_fr[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_fr = 0; @@ -345,10 +345,10 @@ static const char * const keycaps_symbols_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_symbols_fr[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_symbols_fr = 0; @@ -377,10 +377,10 @@ static const char * const keycaps_special_fr[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_special_fr[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_ACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_special_fr = 0; @@ -473,10 +473,10 @@ static const char * const keycaps_lower_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_us = 0; @@ -505,10 +505,10 @@ static const char * const keycaps_upper_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_us = 0; @@ -537,10 +537,10 @@ static const char * const keycaps_numbers_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_us = 0; @@ -569,10 +569,10 @@ static const char * const keycaps_symbols_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_symbols_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_symbols_us = 0; diff --git a/examples/es+fr+us/sq2lv_layouts.h b/examples/es+fr+us/sq2lv_layouts.h index 75cd438..82d1659 100644 --- a/examples/es+fr+us/sq2lv_layouts.h +++ b/examples/es+fr+us/sq2lv_layouts.h @@ -10,9 +10,9 @@ #define SQ2LV_SCANCODES_ENABLED 0 /* Key attributes */ -#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) -#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) -#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c index 855422d..b25f757 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c @@ -27,11 +27,11 @@ static const char * const keycaps_lower_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_terminal_us[] = { \ - SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, 7, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_terminal_us = 2; @@ -89,11 +89,11 @@ static const char * const keycaps_upper_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_terminal_us[] = { \ - SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, 7, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, 7, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_terminal_us = 2; @@ -151,11 +151,11 @@ static const char * const keycaps_numbers_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_terminal_us[] = { \ - SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, 7, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, 7, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_terminal_us = 2; @@ -213,11 +213,11 @@ static const char * const keycaps_symbols_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_symbols_terminal_us[] = { \ - SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, 7, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, 7, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_symbols_terminal_us = 2; @@ -275,11 +275,11 @@ static const char * const keycaps_actions_terminal_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_actions_terminal_us[] = { \ - SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_MOD_INACTIVE | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3 \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_actions_terminal_us = 2; diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.h b/examples/us-terminal-with-scancodes/sq2lv_layouts.h index 60b8e3a..c515d64 100644 --- a/examples/us-terminal-with-scancodes/sq2lv_layouts.h +++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.h @@ -10,9 +10,9 @@ #define SQ2LV_SCANCODES_ENABLED 1 /* Key attributes */ -#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) -#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) -#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c index 4f36594..3a3d20e 100644 --- a/examples/us/sq2lv_layouts.c +++ b/examples/us/sq2lv_layouts.c @@ -25,10 +25,10 @@ static const char * const keycaps_lower_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_INACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_INACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_lower_us = 0; @@ -57,10 +57,10 @@ static const char * const keycaps_upper_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_MOD_ACTIVE | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_MOD_ACTIVE | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_upper_us = 0; @@ -89,10 +89,10 @@ static const char * const keycaps_numbers_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_numbers_us = 0; @@ -121,10 +121,10 @@ static const char * const keycaps_symbols_us[] = { \ }; static const lv_btnmatrix_ctrl_t attributes_symbols_us[] = { \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, \ - SQ2LV_CTRL_NON_CHAR | 3, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3, \ - SQ2LV_CTRL_NON_CHAR | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | 2, SQ2LV_CTRL_NON_CHAR | 3 \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3, \ + SQ2LV_CTRL_NON_CHAR | LV_BTNMATRIX_CTRL_NO_REPEAT | 3, SQ2LV_CTRL_NON_CHAR | 2, 7, SQ2LV_CTRL_NON_CHAR | 2, LV_BTNMATRIX_CTRL_POPOVER | LV_BTNMATRIX_CTRL_NO_REPEAT | 2, SQ2LV_CTRL_NON_CHAR | 3 \ }; static const int num_modifiers_symbols_us = 0; diff --git a/examples/us/sq2lv_layouts.h b/examples/us/sq2lv_layouts.h index 1b4dfed..338290e 100644 --- a/examples/us/sq2lv_layouts.h +++ b/examples/us/sq2lv_layouts.h @@ -10,9 +10,9 @@ #define SQ2LV_SCANCODES_ENABLED 0 /* Key attributes */ -#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) -#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) -#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED) +#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE) +#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED) /* Layout IDs, values can be used as indexes into the sq2lv_layouts array */ typedef enum { diff --git a/squeek2lvgl.py b/squeek2lvgl.py index b0042b9..efd6bcd 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -18,6 +18,7 @@ # along with this program. If not, see . import argparse +from typing import Set import git import os import sys @@ -346,7 +347,7 @@ keycap_for_key = { } def key_to_keycap(args, key): - """Return the keycap for a key + """Return the keycap for a key. args -- commandline arguments key -- the key @@ -355,7 +356,7 @@ def key_to_keycap(args, key): def key_is_modifier(key, data_buttons): - """Return true if a key acts as a modifier.. + """Return true if a key acts as a modifier. key -- the key in question data_buttons -- the "buttons" object from the layout's YAML file @@ -363,6 +364,31 @@ def key_is_modifier(key, data_buttons): return key in data_buttons and 'modifier' in data_buttons[key] +repeatable_keys = { + 'BackSpace', + 'Del', + 'PgUp', + 'PgDn', + 'Return', + 'space', + '↑', + '←', + '↓', + '→', + 'Up', + 'Left', + 'Down', + 'Right' +} + +def key_can_repeat(key): + """Return True if a key can repeatedly emit while being held down. + + key -- the key + """ + return key in repeatable_keys + + def key_to_attributes(key, is_locked, is_lockable, data_buttons): """Return the LVGL button attributes for a key. @@ -384,6 +410,9 @@ def key_to_attributes(key, is_locked, is_lockable, data_buttons): elif key not in ['space']: attributes.append('LV_BTNMATRIX_CTRL_POPOVER') + if not key_can_repeat(key): + attributes.append('LV_BTNMATRIX_CTRL_NO_REPEAT') + if key not in data_buttons or key in ['"', 'colon', 'period']: attributes.append('2') elif key == 'space': @@ -710,9 +739,9 @@ if __name__ == '__main__': h_builder.add_line(f'#define SQ2LV_SCANCODES_ENABLED {1 if args.generate_scancodes else 0}') h_builder.add_line() h_builder.add_subsection_comment('Key attributes') - h_builder.add_line('#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED)') - h_builder.add_line('#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE)') - h_builder.add_line('#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED)') + h_builder.add_line('#define SQ2LV_CTRL_NON_CHAR (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKED)') + h_builder.add_line('#define SQ2LV_CTRL_MOD_ACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE)') + h_builder.add_line('#define SQ2LV_CTRL_MOD_INACTIVE (LV_BTNMATRIX_CTRL_CLICK_TRIG | LV_BTNMATRIX_CTRL_CHECKABLE | LV_BTNMATRIX_CTRL_CHECKED)') h_builder.add_line() layouts = [] From 2576c8f5f6149459d59467eb1320be34856e3c23 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Fri, 27 May 2022 20:55:24 +0200 Subject: [PATCH 42/46] Remove ignored const qualifier --- sq2lv.c | 4 ++-- sq2lv.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sq2lv.c b/sq2lv.c index 298011b..40c92f3 100644 --- a/sq2lv.c +++ b/sq2lv.c @@ -207,7 +207,7 @@ bool sq2lv_is_modifier(lv_obj_t *keyboard, uint16_t btn_id) { return false; } -const int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers) { +int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers) { if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { *num_modifiers = 0; return NULL; @@ -228,7 +228,7 @@ const int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifi } #if SQ2LV_SCANCODES_ENABLED -const int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes) { +int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes) { if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { *num_scancodes = 0; return NULL; diff --git a/sq2lv.h b/sq2lv.h index b5a1c07..3afc61c 100644 --- a/sq2lv.h +++ b/sq2lv.h @@ -73,7 +73,7 @@ bool sq2lv_is_modifier(lv_obj_t *keyboard, uint16_t btn_id); * @param num_modifiers pointer to an integer into which the number of modifiers will be written * @return pointer to the array of button indexes corresponding to modifier keys */ -const int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers); +int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers); #if SQ2LV_SCANCODES_ENABLED /** @@ -84,7 +84,7 @@ const int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifi * @param num_scancodes pointer to an integer into which the number of scancodes will be written * @return pointer into an array of scancodes at the appropriate index */ -const int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes); +int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes); #endif /* SQ2LV_SCANCODES_ENABLED */ #endif /* SQ2LV_H */ From 02fe94c78793888a7bbcf862455c2be27dc451e0 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Fri, 27 May 2022 20:59:49 +0200 Subject: [PATCH 43/46] Further const warning fixes --- sq2lv.c | 6 +++--- sq2lv.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sq2lv.c b/sq2lv.c index 40c92f3..590af71 100644 --- a/sq2lv.c +++ b/sq2lv.c @@ -207,7 +207,7 @@ bool sq2lv_is_modifier(lv_obj_t *keyboard, uint16_t btn_id) { return false; } -int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers) { +int *sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers) { if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { *num_modifiers = 0; return NULL; @@ -224,11 +224,11 @@ int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers) { return NULL; } - return &(sq2lv_layouts[current_layout_id].layers[layer_index].modifier_idxs[0]); + return (int *)(&(sq2lv_layouts[current_layout_id].layers[layer_index].modifier_idxs[0])); } #if SQ2LV_SCANCODES_ENABLED -int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes) { +int *sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes) { if (current_layout_id < 0 || current_layout_id >= sq2lv_num_layouts) { *num_scancodes = 0; return NULL; diff --git a/sq2lv.h b/sq2lv.h index 3afc61c..16bc028 100644 --- a/sq2lv.h +++ b/sq2lv.h @@ -73,7 +73,7 @@ bool sq2lv_is_modifier(lv_obj_t *keyboard, uint16_t btn_id); * @param num_modifiers pointer to an integer into which the number of modifiers will be written * @return pointer to the array of button indexes corresponding to modifier keys */ -int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers); +int *sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers); #if SQ2LV_SCANCODES_ENABLED /** @@ -84,7 +84,7 @@ int * const sq2lv_get_modifier_indexes(lv_obj_t *keyboard, int *num_modifiers); * @param num_scancodes pointer to an integer into which the number of scancodes will be written * @return pointer into an array of scancodes at the appropriate index */ -int * const sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes); +int *sq2lv_get_scancodes(lv_obj_t *keyboard, uint16_t btn_id, int *num_scancodes); #endif /* SQ2LV_SCANCODES_ENABLED */ #endif /* SQ2LV_H */ From 041602ac944be7215bcded12e87d0670356b7981 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Sun, 2 Oct 2022 21:07:35 +0200 Subject: [PATCH 44/46] Only require Python 3 --- .gitignore | 1 + Pipfile | 2 +- Pipfile.lock | 80 ---------------------------------------------------- 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 Pipfile.lock diff --git a/.gitignore b/.gitignore index 5761abc..ed4182a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.o +Pipfile.lock diff --git a/Pipfile b/Pipfile index 1438471..f8e94b8 100644 --- a/Pipfile +++ b/Pipfile @@ -10,4 +10,4 @@ gitpython = "*" [dev-packages] [requires] -python_version = "3.8" +python_version = "3" diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index 2c9eabd..0000000 --- a/Pipfile.lock +++ /dev/null @@ -1,80 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "2d598f1754849a1e6f92a1ee95baaf2ced919bf20e44a4eec871521e772b0127" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3.8" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "gitdb": { - "hashes": [ - "sha256:6c4cc71933456991da20917998acbe6cf4fb41eeaab7d6d67fbc05ecd4c865b0", - "sha256:96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005" - ], - "markers": "python_version >= '3.4'", - "version": "==4.0.7" - }, - "gitpython": { - "hashes": [ - "sha256:b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b", - "sha256:fce760879cd2aebd2991b3542876dc5c4a909b30c9d69dfc488e504a8db37ee8" - ], - "index": "pypi", - "version": "==3.1.18" - }, - "pyyaml": { - "hashes": [ - "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf", - "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696", - "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393", - "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77", - "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922", - "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5", - "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8", - "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10", - "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc", - "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", - "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", - "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", - "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", - "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", - "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", - "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", - "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", - "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", - "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", - "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", - "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", - "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", - "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", - "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", - "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", - "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", - "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", - "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", - "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" - ], - "index": "pypi", - "version": "==5.4.1" - }, - "smmap": { - "hashes": [ - "sha256:7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182", - "sha256:a9a7479e4c572e2e775c404dcd3080c8dc49f39918c2cf74913d30c4c478e3c2" - ], - "markers": "python_version >= '3.5'", - "version": "==4.0.0" - } - }, - "develop": {} -} From b67685dfede0771d2a237e1d8d4e784fcf406a70 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 3 Oct 2022 12:43:43 +0200 Subject: [PATCH 45/46] Extract variable for layout name --- squeek2lvgl.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/squeek2lvgl.py b/squeek2lvgl.py index efd6bcd..0b1580d 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -755,14 +755,15 @@ if __name__ == '__main__': for file in args.input: layout_id, _ = os.path.splitext(file) layout_identifier = layout_id_to_c_identifier(layout_id) + layout_name = layout_id_to_layout_name(layout_id) data = load_yaml(layouts_dir, file) data_views = data['views'] data_buttons = data['buttons'] if 'buttons' in data else {} - c_builder.add_section_comment(f'Layout: {layout_id_to_layout_name(layout_id)} - generated from {layout_id}') + c_builder.add_section_comment(f'Layout: {layout_name} - generated from {layout_id}') c_builder.add_line() - c_builder.add_line(f'static const char * const name_{layout_identifier} = "{layout_id_to_layout_name(layout_id)}";') + c_builder.add_line(f'static const char * const name_{layout_identifier} = "{layout_name}";') c_builder.add_line(f'static const char * const short_name_{layout_identifier} = "{layout_id}";') c_builder.add_line() @@ -842,7 +843,7 @@ if __name__ == '__main__': c_builder.add_line() layouts.append({ - 'name': layout_id_to_layout_name(layout_id), + 'name': layout_name, 'short_name': layout_id, 'identifier': layout_identifier }) From ffe1f5bf18a99756f1c0985e8ccc3d24a1f4a528 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 23 Oct 2023 21:09:40 +0200 Subject: [PATCH 46/46] Add options to specify layout name and extra top row on base and upper layer --- README.md | 26 +++++++++++++++++++----- squeek2lvgl.py | 55 ++++++++++++++++++++++++++++---------------------- 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 6d6ffcf..3f98825 100644 --- a/README.md +++ b/README.md @@ -16,20 +16,36 @@ Afterwards you can execute the script with `pipenv run`. Use the `-h` / `--help` ``` $ pipenv run python squeek2lvgl.py --help -usage: squeek2lvgl.py [-h] --input INPUT [--shift-keycap SHIFT_KEYCAP] [--surround-space-with-arrows] [--generate-scancodes] --output OUTPUT +usage: squeek2lvgl.py [-h] --input INPUT --name NAME + [--extra-top-row-base EXTRA_TOP_ROW_BASE] + [--extra-top-row-upper EXTRA_TOP_ROW_UPPER] + [--shift-keycap SHIFT_KEYCAP] + [--surround-space-with-arrows] [--generate-scancodes] + --output OUTPUT Convert squeekboard layouts to LVGL-compatible C code. -optional arguments: +options: -h, --help show this help message and exit - --input INPUT squeekboard layout to use as input for generation. Has to be a YAML file path relative to data/keyboards. Can be specified - multiple times. + --input INPUT squeekboard layout to use as input for generation. Has + to be a YAML file path relative to data/keyboards. Can + be specified multiple times. + --name NAME name for the layout. Needs to be specified once for + every --input flag. + --extra-top-row-base EXTRA_TOP_ROW_BASE + additional key row to add at the top of the base + layer. + --extra-top-row-upper EXTRA_TOP_ROW_UPPER + additional key row to add at the top of the upper + layer. --shift-keycap SHIFT_KEYCAP key caption for the Shift key. Defaults to "Shift". --surround-space-with-arrows insert left / right arrow before / after space key - --generate-scancodes also generate scancode tables (only works for US layout currently) + --generate-scancodes also generate scancode tables (only works for US + layout currently) --output OUTPUT output directory for generated files + ``` As an example, the following command converts [squeekboard's US layout] to C diff --git a/squeek2lvgl.py b/squeek2lvgl.py index 0b1580d..f4650ee 100644 --- a/squeek2lvgl.py +++ b/squeek2lvgl.py @@ -64,6 +64,12 @@ def parse_arguments(): parser.add_argument('--input', dest='input', action='append', required=True, help='squeekboard layout to ' + 'use as input for generation. Has to be a YAML file path relative to data/keyboards. ' + 'Can be specified multiple times.') + parser.add_argument('--name', dest='name', action='append', required=True, help='name for the layout. ' + + 'Needs to be specified once for every --input flag.') + parser.add_argument('--extra-top-row-base', dest='extra_top_row_base', type=str, required=False, help='additional ' + + 'key row to add at the top of the base layer.') + parser.add_argument('--extra-top-row-upper', dest='extra_top_row_upper', type=str, required=False, help='additional ' + + 'key row to add at the top of the upper layer.') parser.add_argument('--shift-keycap', dest='shift_keycap', type=str, required=False, help='key caption for ' + 'the Shift key. Defaults to "Shift".') parser.add_argument('--surround-space-with-arrows', action='store_true', dest='arrows_around_space', @@ -259,22 +265,6 @@ class SourceFileBuilder(object): # Layout processing ## -layout_name_for_layout_id = { - 'terminal/us': 'US English (Terminal)', - 'de': 'German', - 'es': 'Spanish', - 'fr': 'French', - 'us': 'US English' -} - -def layout_id_to_layout_name(layout_id): - """Return a descriptive name for a layout. - - layout_id -- ID of the layout - """ - return layout_name_for_layout_id[layout_id] - - def layout_id_to_c_identifier(layout_id): """Return a string for a layout that is suitable to be used in a C identifier. @@ -389,12 +379,13 @@ def key_can_repeat(key): return key in repeatable_keys -def key_to_attributes(key, is_locked, is_lockable, data_buttons): +def key_to_attributes(key, is_locked, is_lockable, is_extra_top_row, data_buttons): """Return the LVGL button attributes for a key. key -- the key in question is_locked - whether the key is locked in the current view is_lockable - whether the key can be locked in the current view + is_extra_top_row - whether the key is in the extra top row data_buttons -- the "buttons" object from the layout's YAML file """ attributes = [] @@ -413,6 +404,11 @@ def key_to_attributes(key, is_locked, is_lockable, data_buttons): if not key_can_repeat(key): attributes.append('LV_BTNMATRIX_CTRL_NO_REPEAT') + if is_extra_top_row: + attributes.append('SQ2LV_CTRL_NON_CHAR') + if key == '': + attributes.append('LV_BTNMATRIX_CTRL_HIDDEN') + if key not in data_buttons or key in ['"', 'colon', 'period']: attributes.append('2') elif key == 'space': @@ -593,7 +589,7 @@ def keycap_to_scancodes(args, keycap, is_switcher): return scancodes_for_keycap[keycap] -def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, data_buttons): +def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, data_buttons, extra_top_row): """Return keycaps, LVGL button attributes, modifier key indexes, layer switching key indexes, layer switching key destinations and scancodes for a view @@ -601,6 +597,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d view_id -- ID of the view data_views -- the "views" object from the layout's YAML file data_buttons -- the "buttons" object from the layout's YAML file + extra_top_row -- additional row of keys to insert at the top or "" to insert an empty row """ keycaps = [] attrs = [] @@ -611,7 +608,11 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d idx = 0 - for row in data_views[view_id]: + rows = data_views[view_id] + if extra_top_row: + rows = [extra_top_row] + rows + + for index, row in enumerate(rows): keycaps_in_row = [] attrs_in_row = [] scancodes_in_row = [] @@ -628,7 +629,6 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d keys.insert(space_idx, '←') keys.insert(space_idx + 2, '→') - for key in keys: if is_key_ignored(key): continue @@ -670,7 +670,7 @@ def get_keycaps_attrs_modifiers_switchers_scancodes(args, view_id, data_views, d switcher_dests.append(dest) is_switcher = True - attrs_in_row.append(key_to_attributes(key, is_locked, is_lockable, data_buttons)) + attrs_in_row.append(key_to_attributes(key, is_locked, is_lockable, extra_top_row and index == 0, data_buttons)) if args.generate_scancodes: scancodes_in_row.append(keycap_to_scancodes(args, keycap, is_switcher)) @@ -752,10 +752,9 @@ if __name__ == '__main__': layouts_dir = os.path.join(tmp, rel_layouts_dir) - for file in args.input: + for file, layout_name in zip(args.input, args.name): layout_id, _ = os.path.splitext(file) layout_identifier = layout_id_to_c_identifier(layout_id) - layout_name = layout_id_to_layout_name(layout_id) data = load_yaml(layouts_dir, file) data_views = data['views'] @@ -783,8 +782,16 @@ if __name__ == '__main__': c_builder.add_subsection_comment(f'Layer: {layer_name} - generated from {view_id}') c_builder.add_line() + extra_top_row = None + if view_id == "base": + extra_top_row = args.extra_top_row_base + if view_id == "upper": + extra_top_row = args.extra_top_row_upper + if not extra_top_row and (args.extra_top_row_base or args.extra_top_row_upper): + extra_top_row = "" + keycaps, attrs, modifier_idxs, switcher_idxs, switcher_dests, scancodes = get_keycaps_attrs_modifiers_switchers_scancodes( - args, view_id, data_views, data_buttons) + args, view_id, data_views, data_buttons, extra_top_row) for dest in switcher_dests: if dest not in view_ids: