better component/parameter names to match panel naming

sed -i 's/top_plate/panel/g' *.scad sed -i 's/plate_to_frame/panel_to_frame/g' *.scad Signed-off-by: Brian S. Stephan <bss@incorporeal.org>
2024-02-09 14:31:18 -06:00
41 changed files with 424 additions and 1392 deletions
--- a/892
+++ b/892
@@ -1,674 +1,232 @@
-                    GNU GENERAL PUBLIC LICENSE
+GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+Version 3, 29 June 2007
-
+
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
+
- of this license document, but changing it is not allowed.
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
+
-                            Preamble
+Preamble
-
+
-  The GNU General Public License is a free, copyleft license for
+The GNU General Public License is a free, copyleft license for software and other kinds of works.
-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.
-  The licenses for most software and other practical works are designed
+
-to take away your freedom to share and change the works.  By contrast,
+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.
-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
+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.
-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
+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.
-any other work released this way by its authors.  You can apply it to
+
-your programs, too.
+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.
-
+
-  When we speak of free software, we are referring to freedom, not
+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.
-price.  Our General Public Licenses are designed to make sure that you
+
-have the freedom to distribute copies of free software (and charge for
+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.
-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
+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.
-free programs, and that you know you can do these things.
+
-
+The precise terms and conditions for copying, distribution and modification follow.
-  To protect your rights, we need to prevent others from denying you
+
-these rights or asking you to surrender the rights.  Therefore, you have
+TERMS AND CONDITIONS
-certain responsibilities if you distribute copies of the software, or if
+
-you modify it: responsibilities to respect the freedom of others.
+0. Definitions.
-
+
-  For example, if you distribute copies of such a program, whether
+“This License” refers to version 3 of the GNU General Public License.
-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
+“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-or can get the source code.  And you must show them these terms so they
+
-know their rights.
+“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.
-
+
-  Developers that use the GNU GPL protect your rights with two steps:
+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.
-(1) assert copyright on the software, and (2) offer you this License
+
-giving you legal permission to copy, distribute and/or modify it.
+A “covered work” means either the unmodified Program or a work based on the Program.
-
+
-  For the developers' and authors' protection, the GPL clearly explains
+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.
-that there is no warranty for this free software.  For both users' and
+
-authors' sake, the GPL requires that modified versions be marked as
+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.
-changed, so that their problems will not be attributed erroneously to
+
-authors of previous versions.
+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.
-
+
-  Some devices are designed to deny users access to install or run
+1. Source Code.
-modified versions of the software inside them, although the manufacturer
+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.
-can do so.  This is fundamentally incompatible with the aim of
+
-protecting users' freedom to change the software.  The systematic
+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.
-pattern of such abuse occurs in the area of products for individuals to
+
-use, which is precisely where it is most unacceptable.  Therefore, we
+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.
-have designed this version of the GPL to prohibit the practice for those
+
-products.  If such problems arise substantially in other domains, we
+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.
-stand ready to extend this provision to those domains in future versions
+
-of the GPL, as needed to protect the freedom of users.
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
+
-  Finally, every program is threatened constantly by software patents.
+The Corresponding Source for a work in source code form is that same work.
-States should not allow patents to restrict development and use of
+
-software on general-purpose computers, but in those that do, we wish to
+2. Basic Permissions.
-avoid the special danger that patents applied to a free program could
+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.
-make it effectively proprietary.  To prevent this, the GPL assures that
+
-patents cannot be used to render the program non-free.
+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.
-
+
-  The precise terms and conditions for copying, distribution and
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-modification follow.
+
-
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-                       TERMS AND CONDITIONS
+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.
-
+
-  0. Definitions.
+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.
-
+
-  "This License" refers to version 3 of the GNU General Public License.
+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.
-  "Copyright" also means copyright-like laws that apply to other kinds of
+
-works, such as semiconductor masks.
+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.
-
+
-  "The Program" refers to any copyrightable work licensed under this
+5. Conveying Modified Source Versions.
-License.  Each licensee is addressed as "you".  "Licensees" and
+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:
-"recipients" may be individuals or organizations.
+
-
+     a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-  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
+     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”.
-exact copy.  The resulting work is called a "modified version" of the
+
-earlier work or a work "based on" the earlier work.
+     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.
-
+
-  A "covered work" means either the unmodified Program or a work based
+     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.
-on the Program.
+
-
+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.
-  To "propagate" a work means to do anything with it that, without
+
-permission, would make you directly or secondarily liable for
+6. Conveying Non-Source Forms.
-infringement under applicable copyright law, except executing it on a
+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:
-computer or modifying a private copy.  Propagation includes copying,
+
-distribution (with or without modification), making available to the
+     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.
-public, and in some countries other activities as well.
+
-
+     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.
-  To "convey" a work means any kind of propagation that enables other
+
-parties to make or receive copies.  Mere interaction with a user through
+     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.
-a computer network, with no transfer of a copy, is not conveying.
+
-
+     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.
-  An interactive user interface displays "Appropriate Legal Notices"
+
-to the extent that it includes a convenient and prominently visible
+     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.
-feature that (1) displays an appropriate copyright notice, and (2)
+
-tells the user that there is no warranty for the work (except to the
+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.
-extent that warranties are provided), that licensees may convey the
+
-work under this License, and how to view a copy of this License.  If
+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.
-the interface presents a list of user commands or options, such as a
+
-menu, a prominent item in the list meets this criterion.
+“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.
-
+
-  1. Source Code.
+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 "source code" for a work means the preferred form of the work
+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.
-for making modifications to it.  "Object code" means any non-source
+
-form of a work.
+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.
-
+
-  A "Standard Interface" means an interface that either is an official
+7. Additional Terms.
-standard defined by a recognized standards body, or, in the case of
+“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.
-interfaces specified for a particular programming language, one that
+
-is widely used among developers working in that language.
+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.
-
+
-  The "System Libraries" of an executable work include anything, other
+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:
-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
+     a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-Component, and (b) serves only to enable use of the work with that
+
-Major Component, or to implement a Standard Interface for which an
+     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
-implementation is available to the public in source code form.  A
+
-"Major Component", in this context, means a major essential component
+     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
-(kernel, window system, and so on) of the specific operating system
+
-(if any) on which the executable work runs, or a compiler used to
+     d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-produce the work, or an object code interpreter used to run it.
+
-
+     e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-  The "Corresponding Source" for a work in object code form means all
+
-the source code needed to generate, install, and (for an executable
+     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.
-work) run the object code and to modify the work, including scripts to
+
-control those activities.  However, it does not include the work's
+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.
-System Libraries, or general-purpose tools or generally available free
+
-programs which are used unmodified in performing those activities but
+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.
-which are not part of the work.  For example, Corresponding Source
+
-includes interface definition files associated with source files for
+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.
-the work, and the source code for shared libraries and dynamically
+
-linked subprograms that the work is specifically designed to require,
+8. Termination.
-such as by intimate data communication or control flow between those
+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).
-subprograms and other parts of the work.
+
-
+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.
-  The Corresponding Source need not include anything that users
+
-can regenerate automatically from other parts of the Corresponding
+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.
-Source.
+
-
+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.
-  The Corresponding Source for a work in source code form is that
+
-same work.
+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.
-  2. Basic Permissions.
+
-
+10. Automatic Licensing of Downstream Recipients.
-  All rights granted under this License are granted for the term of
+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.
-copyright on the Program, and are irrevocable provided the stated
+
-conditions are met.  This License explicitly affirms your unlimited
+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.
-permission to run the unmodified Program.  The output from running a
+
-covered work is covered by this License only if the output, given its
+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.
-content, constitutes a covered work.  This License acknowledges your
+
-rights of fair use or other equivalent, as provided by copyright law.
+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”.
-  You may make, run and propagate covered works that you do not
+
-convey, without conditions so long as your license otherwise remains
+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.
-in force.  You may convey covered works to others for the sole purpose
+
-of having them make modifications exclusively for you, or provide you
+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.
-with facilities for running those works, provided that you comply with
+
-the terms of this License in conveying all material for which you do
+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.
-not control copyright.  Those thus making or running the covered works
+
-for you must do so exclusively on your behalf, under your direction
+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.
-and control, on terms that prohibit them from making any copies of
+
-your copyrighted material outside their relationship with you.
+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.
-
+
-  Conveying under any other circumstances is permitted solely under
+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.
-the conditions stated below.  Sublicensing is not allowed; section 10
+
-makes it unnecessary.
+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.
-
+
-  3. Protecting Users' Legal Rights From Anti-Circumvention 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.
-  No covered work shall be deemed part of an effective technological
+
-measure under any applicable law fulfilling obligations under article
+13. Use with the GNU Affero General Public License.
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+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.
-similar laws prohibiting or restricting circumvention of such
+
-measures.
+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.
-  When you convey a covered work, you waive any legal power to forbid
+
-circumvention of technological measures to the extent such circumvention
+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.
-is effected by exercising rights under this License with respect to
+
-the covered work, and you disclaim any intention to limit operation or
+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.
-modification of the work as a means of enforcing, against the work's
+
-users, your or third parties' legal rights to forbid circumvention of
+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.
-technological measures.
+
-
+15. Disclaimer of Warranty.
-  4. Conveying Verbatim Copies.
+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.
-
+
-  You may convey verbatim copies of the Program's source code as you
+16. Limitation of Liability.
-receive it, in any medium, provided that you conspicuously and
+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.
-appropriately publish on each copy an appropriate copyright notice;
+
-keep intact all notices stating that this License and any
+17. Interpretation of Sections 15 and 16.
-non-permissive terms added in accord with section 7 apply to the code;
+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.
-keep intact all notices of the absence of any warranty; and give all
+
-recipients a copy of this License along with the Program.
+END OF TERMS AND CONDITIONS
-
+
-  You may charge any price or no price for each copy that you convey,
+How to Apply These Terms to Your New Programs
-and you may offer support or warranty protection for a fee.
+
-
+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.
-  5. Conveying Modified Source Versions.
+
-
+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.
-  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
+     <one line to give the program's name and a brief idea of what it does.>
-terms of section 4, provided that you also meet all of these conditions:
+     Copyright (C) <year>  <name of author>
-
+
-    a) The work must carry prominent notices stating that you modified
+     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.
-    it, and giving a relevant date.
+
-
+     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.
-    b) The work must carry prominent notices stating that it is
+
-    released under this License and any conditions added under section
+     You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
    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.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    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 <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
-  If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
 notice like this when it starts in an interactive mode:
-    <program>  Copyright (C) <year>  <name of author>
+     <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
+     This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
    under certain conditions; type `show c' for details.
-The hypothetical commands `show w' and `show c' should show the appropriate
+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”.
 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,
+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 <http://www.gnu.org/licenses/>.
 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
 <https://www.gnu.org/licenses/>.
-  The GNU General Public License does not permit incorporating your program
+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 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
 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
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/27
+++ b/27
@@ -1,19 +1,14 @@
-EXCLUDES = blown-up-demo components parameters
+SRC_FILES := $(wildcard ./src/*.scad)
-OBJECTS := $(filter-out $(EXCLUDES),$(patsubst src/%.scad,%,$(wildcard src/*.scad)))
+SRC_FILES := $(filter-out ./src/blown-up-demo.scad, $(SRC_FILES))
-dir_guard=@mkdir -p ./build
+SRC_FILES := $(filter-out ./src/components.scad, $(SRC_FILES))
-
+SRC_FILES := $(filter-out ./src/roundedcube.scad, $(SRC_FILES))
-all:	$(OBJECTS)
+all: $(SRC_FILES)
-	$(dir_guard)
+	mkdir -p ./build
-	mkdir -p ./build/docs
+	for file in $^ ; do \
-	cp ./docs/README-objects.md ./build/README.md
+		openscad -o $${file}.stl $${file} ; \
-	cp ./docs/assembly-and-tips.md ./build/docs/assembly-and-tips.md
+		mv $${file}.stl ./build/ ; \
-	cp ./docs/printing-and-materials.md ./build/docs/printing-and-materials.md
+	done
-	cp ./LICENSE ./build/LICENSE
+	zip ./build/buildable-stick-system-`git describe --dirty`-stls.zip ./build/*
 	pushd ./build; zip ./buildable-stick-system-`git describe --dirty`-stls.zip . -r; popd
 $(OBJECTS):
 	$(dir_guard)
 	openscad -o build/$@.stl src/$@.scad
 clean:
 	rm -rf ./build
--- a/README.md
+++ b/README.md
@@ -2,16 +2,11 @@
 Files for 3D printing an arcade stick.
-Have you ever wanted to conjure your own arcade stick out of the ether (well, plastic), or to prototype a new layout or
+![An example of stick components displayed in OpenSCAD](docs/two-panel-example-v3.png)
 design before sending it to a custom builder? Do you just love having your space filled with arcade stick enclosures,
 because you keep making different variants, colorways, and so on? Or do you simply want a good stick on the cheap, and
 know someone or a library with a 3D printer? The Buildable Stick System may be the project for you!
 ![An example of stick components displayed in OpenSCAD](docs/blown-up-demo.png)
 [OpenSCAD-based illustration of how the components for an overhang panel-based stick fit together.]
-![A photo of a completed stick](docs/finished-v4.2.jpg)
+![A photo of a completed stick](docs/finished-v3.1.jpg)
 [Photo of a completed inset panel-based stick.]
@@ -27,28 +22,11 @@ component objects or create new ones. The OpenSCAD language is essentially a fun
 it easy to reuse, alter, and compose objects. If you do not see the object you would like, you can likely create it by
 starting with an existing object and constructing what you'd like with new or existing components.
 ## Usage of Parts
 There are a lot of parts to pick from, but there are some structural variants to pay attention to; here's some help
 about when/how to use specific parts:
 * `panel-inset` --- these fit flush into a frame, creating a closed box enclosure.
 * `panel-overhang` --- these have a tray that fits into a frame with the actual face extending beyond the frame,
  creating an ice cream sandwich enclosure.
    * These also yield a bit more space inside the box, for tall levers or whatever.
 * `frame` (non-pieces) --- these create the box of the enclosure, as one part. These can be hard to print well ---
  shrinkage forces tend to curl up the corners no matter what you do, and some points need supports --- but if you don't
  care about that because you're printing an ice cream sandwich, they are simpler than...
 * `frame-piece` --- these break up the frame box into four faces, and are held together by friction fit and the hex
  bolts. This is more stable than you might expect, but it does introduce some variability in the overall sturdiness of
  the enclosure compared with the frame as one box piece.
    * The `interconnect` replaces the need to bolt multiple frames together.
 ## Printing
 These items all fit on a 256mm^2 print bed; I use a Bambu Lab P1P based on what I've learned from the
-OpenStickCommunity. Standard settings seem sufficiently sturdy, but see `docs/materials-and-printing.md` for more
+OpenStickCommunity. Standard settings seem sufficiently sturdy for my purposes, though the slicer has done a couple
-thoughts and settings based on my tinkering with prints.
+weird things, in my experience.
 ## Assembling
@@ -79,34 +57,31 @@ What you'll need beyond these objects:
 ## Rough Costs
 This is a rough estimate of the cost to produce one of these sticks, assuming a usual 2-frame design and layout.
-Filament masses from Bambu Studio estimates, using Bambu PLA Basic, 20% gyroid infill and 3 wall loops.
+Filament masses from Bambu Studio estimates, using Bambu PLA Basic.
-* Left and right frame: **$10.42 USD** (208.50g each, as of 2024-02-22)
+* Left and right frame: **$7.08 USD** (141.84g each, as of 2023-09-12)
-* Left and right (inset) top panels: **~$6.40 USD** (~128g each, as of 2024-02-22)
+* Left and right (overhang) top panels: **~$6.74 USD** (~135g each, as of 2023-09-12)
-* Left and right (non-overhang) bottom panels: **$6.80 USD** (135.99g each, as of 2024-02-22)
+* Left and right (overhang) bottom panels: **$5.90 USD** (118.16g each, as of 2023-09-12)
-* Miscellaneous mounting plates, decorative plates, etc.: **~$1.83 USD** (~73g, as of 2024-02-22)
+* Miscellaneous mounting plates, decorative plates, etc.: **~$1.00 USD** (~40g, as of 2023-09-12)
 * 8 16mm M4 bolts to connect the frames: **$0.72 USD** (you can get a pack of 100 on Amazon for $9, as of 2023-09-12)
    * These are only necessary if you are using the whole frames, but as a heads up, the material cost of the
      pieces-based interconnect piece costs around $1, so it's roughly a wash since that's also a frame wall.
 * 8 M4 flange nuts to connect the frames: **$0.68 USD** (you can get a pack of 100 on Amazon for $8.50, as of 2023-09-12)
 * 4 10mm M3 bolts to connect Neutrik D plates to frames: **$0.40 USD** (you can get a pack of 100 on Amazon for $10, as
  of 2023-09-12)
 * 4 M3 flange nuts to connect Neutrik D plates to frames: **$0.34 USD** (you can get a pack of 100 on Amazon for $8.50,
  as of 2023-09-12)
-* 8 45mm M4 standoffs to connect panels to frames: **$2.40 USD** (you can get a pack of 10 on AliExpress for $3, as of
+* 8 45mm M4 spacers to connect panels to frames: **$2.40 USD** (you can get a pack of 10 on AliExpress for $3, as of
  2023-09-12)
    * You could 3D print these too, but you're probably better off with brass ones as they give some weight to the
      stick anyway
-    * You can also use a shorter length with longer bolts, or combine multiple standoffs, if either of those yield better
+    * You can also use a shorter length with longer bolts, or combine multiple spacers, if either of those yield better
      prices
 * 8 16mm M4 bolts to connect top plates to frames: **$0.72 USD** (you can get a pack of 100 on Amazon for $9, as of
 * 8 12mm M4 bolts to connect bottom plates to frames: **$0.72 USD** (you can get a pack of 100 on Amazon for $9, as of
  2023-09-12)
-With an enclosure coming in around $31, depending on your choices --- say, ~$30 for TheTrain's RP2040 Advanced Breakout
+With an enclosure coming in around $26, depending on your choices --- say, ~$30 for TheTrain's RP2040 Advanced Breakout
 Board, ~$60 for Sanwa buttons and a lever, and ~$20 for miscellaneous connectors and wiring --- you can put a
-full-featured controller with an open source foundation together for around $140. Reducing wall and infill settings
+full-featured controller with an open source foundation together for around $135.
 will probably save you around $5 of material, and you can probably decide what you want to do from there.
 ## Miscellany
@@ -124,17 +99,16 @@ Improvements, variants, new layouts, novel ideas, and etc. are all welcome.
 These files are suitable for previewing and rendering in OpenSCAD. They may also work in FreeCAD and perhaps other
 software, but they are developed in OpenSCAD, so YMMV otherwise.
 This project is hosted at [my personal Git site](https://git.incorporeal.org/bss/buildable-stick-system), but people are
 more likely to want to interact with [the GitHub mirror](https://github.com/bsstephan/buildable-stick-system). Feel free
 to use either.
 I'm reachable on the fediverse, over email, or on Discord, but if you're looking for an option I prefer, I maintain an
 IRC channel, `#buildable-stick-system`, on [my IRC network, Randomus](https://randomus.net/) if you would like a place
 to hang out and discuss issues and features and whatnot.
 ## Attribution
-### Author and Licensing
+Inspired by the incredible work of [TheTrain](https://github.com/TheTrainGoes) on the [OpenStickCommunity Fightstick
 Case](https://github.com/OpenStickCommunity/Hardware/tree/main/Fightstick%20Case), itself based on the incredible work
 by [Dash n'Mash](https://twitter.com/Dash_xx_Mash?s=20). Original work Copyright 2023 TheTrain, [licensed under CC BY
 4.0](https://creativecommons.org/licenses/by/4.0/).
 Made possible by the amazing efforts of [slagcoin](https://www.slagcoin.com/).
 ## Author and Licensing
 Written by and copyright Brian S. Stephan (<bss@incorporeal.org>).
@@ -147,23 +121,3 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Gen
 You should have received a copy of the GNU General Public License along with the Buildable Stick System. If not, see
 <https://www.gnu.org/licenses/>.
 ### Lineage
 Inspired by the incredible work of [TheTrain](https://github.com/TheTrainGoes) on the [OpenStickCommunity Fightstick
 Case](https://github.com/OpenStickCommunity/Hardware/tree/main/Fightstick%20Case), itself based on the incredible work
 by [Dash n'Mash](https://twitter.com/Dash_xx_Mash?s=20). Original work Copyright 2023 TheTrain, [licensed under CC BY
 4.0](https://creativecommons.org/licenses/by/4.0/).
 Made possible by the amazing efforts of [slagcoin](https://www.slagcoin.com/).
 ### Distributing BSS Sticks
 Under the terms of the GPLv3, you must inform the receiver of the "object code" of their rights under the GPLv3. This is
 a bit of a gray area for physical objects, but likely applies to distribution of modified or unmodified STL, STEP, etc.
 files at a minimum. The easiest way to satisfy the GPLv3 in either situation is to provide a link to the source code
 (either the unmodified mainline project, or your copy, with modifications listed in a "prominent notice"); something
 like the below should suffice in either electronic or printed form:
 > This arcade stick is part of the Buildable Stick System, version X.Y.Z; the source code to this program is available
 > under the terms of the GNU General Public License, at [LINK].
--- a/TODO.md
+++ b/TODO.md
@@ -2,6 +2,14 @@
 Notes for "next time".
-## v4.x
+## v3.3
 * Try not using roundedcube and instead bezel the top, to get cleaner seams everywhere else
 ## v4
 * Engraving some cosmetic stuff? Or maybe a place to mount other plates?
 * Try making it so top plates are bolted in from the side of the frame rather than the top
    * I'm thinking of abandoning this, because it makes the frame more complicated to have a portion of a column rather
      than the full column, but I'll keep it here for a bit longer
 * Try making frames out of four pieces connected at joints on the hex posts, rather than one large piece?
--- a/docs/README-objects.md
+++ b/docs/README-objects.md
@@ -1,65 +0,0 @@
 # The Buildable Stick System
 Files for 3D printing an arcade stick.
 ## Objects
 The following notes document the objects in the Buildable Stick System and how you can use them:
 * `bottom-panel-inset`: a simple solid panel that fits into the bottom of a frame box.
 * `bottom-panel-overhang-*`: solid panels whose base fits into the bottom of a frame box, but have a longer sheet that
  extends beyond the frame, creating a sandwich kind of look; the various forms hang over more or less of the frame,
  expecting it will be connected to other frames.
 * `frame-{left,middle,right,solo}`: the core frame of the stick, these are complete boxes; since they are long and
  narrow, and need supports to print the space for the insets, these may be difficult to print nicely.
 * `frame-piece-*`: the core frame broken up by individual faces, which are easier to print and essentially just as
  sturdy.
 * `frame-piece-*-extended*`: frame pieces that have been stretched out beyond the normal frame dimensions in order to
  make a nice bevel on the sides and/or bottom; this, interestingly, tends to make the stick look a bit thinner than if
  it was just a simple box.
 * `misc-decorative-plate-*`: things you can print to snazz up face buttons mounting, auxillary button points, etc..
 * `misc-dustwasher-*`: simple dustwashers for levers.
 * `misc-lever-mount-*`: lever mounts of various shapes and depths to get the desired lever height when mounting a lever
  to a panel (with the appropriate cutouts).
 * `misc-neutrik-*`: like the decorative plates, but these are a bit more necessary by their design.
 * `misc-rocker-*`: rocker SPDT switches don't have mounting holes, this allows you to attach them to the frame.
 * `top-panel-inset-*`: various lever and/or button layouts for using as the face(s) of a stick.
 * `top-panel-overhang-`: same idea as the inset top panels, but overhung over the frame to make the sandwich look; these
  also leave a bit more space inside the frame, which might accommodate a taller lever.
 Feel free to request or contribute to more objects, see the links to Git repos below.
 ## Printing and Assembling
 Additional documentation regarding printing the objects and assembling the stick are available in
 `docs/printing-and-materials.md` and `docs/assembly-and-tips.md`, respectively.
 ## Author and Licensing
 Written by and copyright Brian S. Stephan (<bss@incorporeal.org>).
 These arcade stick parts are from the Buildable Stick System; the source code to this program is available under the
 terms of the GNU General Public License, at:
 * <https://github.com/bsstephan/buildable-stick-system>, or
 * <https://git.incorporeal.org/bss/buildable-stick-system>
 See the tags/releases for the version of the source code corresponding to the STLs you received.
 The Buildable Stick System 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.
 The Buildable Stick System 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 the Buildable Stick System. If not, see
 <https://www.gnu.org/licenses/>.
 ## Lineage
 Inspired by the incredible work of [TheTrain](https://github.com/TheTrainGoes) on the [OpenStickCommunity Fightstick
 Case](https://github.com/OpenStickCommunity/Hardware/tree/main/Fightstick%20Case), itself based on the incredible work
 by [Dash n'Mash](https://twitter.com/Dash_xx_Mash?s=20). Original work Copyright 2023 TheTrain, [licensed under CC BY
 4.0](https://creativecommons.org/licenses/by/4.0/).
--- a/docs/assembly-and-tips.md
+++ b/docs/assembly-and-tips.md
@@ -1,65 +0,0 @@
 # Assembly and Tips
 Just some miscellaneous notes for any dear reader, or more likely, my own forgetful self.
 ## Putting a BSS Stick Together
 Assembly of a stick is pretty straightforward, but there are some choices that can make it easier or harder. The
 following is the most consistent way I've found to put one together. This is assuming a v4.1 or beyond stick, with two
 panels to make a long standard stick, and the frame made of pieces.
 1. Prepare the frame top pieces --- `frame-piece-top-{left,right}`: this is your best shot to get auxillary buttons,
   panel connectors, and the like installed, so do it now, and give them a good tighten. You shouldn't need to adjust
   these again, so finish their installation while the pieces are free.
    1. This of course includes decorative plates --- e.g. `misc-decorative-plate-aux-control-three-button-cluster` ---
       you may choose to use. These are held to the top pieces by the buttons or component mounting screws.
 2. Start the top panels --- `top-panel-(inset|overhang)-*`: you want both to get the components installed now
   when it's easy, and to make sure that the overall assembly works with your components, so again get your buttons,
   lever, etc., in place.
    1. If you are using a button decorative plate that spans two panels --- e.g.
       `src/misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one` --- don't tighten the buttons all the way,
       as you may need some wiggle to align the panels to the frame in a later step.
    2. If the above isn't the case, you can tighten all your buttons now.
    3. If using a lever, don't forget the lever mount spacer --- `src/misc-lever-mount-sanwa-seimitsu` --- if you want
       it, and tighten those mounting bolts now as well.
 3. Create the frame box by combining your `frame-piece-*` parts together. This will be relatively stable just via
   friction fit.
 4. Rest the frame top-up on a desk, and put the standoffs through the holes.
 5. Insert the top panels into the frame. The friction on this will probably be tight, and you may not be able to muscle
   it in on your own. Get the panel posts at least partially into the frame columns, in any event. If you get all the
   panels completely in, the next steps will be easier, but it's not imperative.
 6. Start the bolts for the top panels. Get it so that the bolts catch the standoffs, but don't tighten them completely.
   You will want some wiggle when connecting the bottom panels, which is maybe the hardest part. Depending on your bolts
   and how deep into the frame you got the top panels, you might need to push the standoffs up the column in order to
   catch them with the bolts.
 7. At this point you have an open box with access to all your components. Do all of your wiring.
    1. Tighten the buttons and etc. if you didn't in step 2.
    2. TEST YOUR BOARD AND COMPONENTS NOW! You don't want to have to undo the rest of the steps for something trivial,
       trust me.
 8. Insert the bottom panels into the frame. This may be difficult. If you got the top panels into the frame in step 4,
   and left the bolts loose in step 5, you can make the standoffs rise outside of the frame column, which makes it
   easier to line up the standoffs with the bottom panel posts.
 9. Drive the bottom bolts into the standoffs. You probably don't have the panels all the way into the frame, but if you
   can at least get the standoffs in the posts, you can catch them with the bottom bolts, and then let them guide the
   panels into the frame.
 10. Tighten all the bolts. If you didn't get the top panels flush in step 4, you can apply the same logic as in step 8
   and tighten the bolts to guide the panels into the frame.
 In the end, this should be extremely sturdy. None of the frame or panels should be loose at all, and you should be able
 to move, flip, gently toss, etc. the stick without anything moving or feeling loose.
 ## Removing Inset Panels
 As of v4.1 (or in v3), the top and bottom inset panels both insert into the frame, inside the frame "lip", meaning that
 when everything is put together, they create a flush surface (more or less). This can make them hard to get out, as you
 can't grab anything to get any leverage, and especially with v4.1, the plastic posts to aid the friction fit make it
 even harder to muscle out --- in fact, even if you could get an edge and start yanking, you'd probably just break some
 of the plastic.
 You can instead use the reverse side and the hex standoffs to push a panel out, as so:
 1. Loosen, or completely remove, the hex bolts for the panel you would like to remove.
 2. Flip the stick over, and remove the hex bolts on the opposite side.
 3. Screw in longer bolts, or anything else that'll fit into the hole without going flush against the panel.
 4. Push the long bolts in, thus pushing the standoffs, thus pushing the desired panel out from within.
 5. You may have to even get a mallet and tap on a bolt, occasionally, as everything can be *pretty* tight.
--- a/docs/blown-up-demo.png
+++ b/docs/blown-up-demo.png
--- a/docs/finished-v4.1.jpg
+++ b/docs/finished-v4.1.jpg
--- a/docs/finished-v4.2.jpg
+++ b/docs/finished-v4.2.jpg
--- a/docs/materials.md
+++ b/docs/materials.md
@@ -0,0 +1,25 @@
 # Materials
 bss's random thoughts and notes on 3D printing materials.
 ## Bambu Lab PLA
 ### Basic
 * In general, nice texture, but under direct light, you can see a bit of the infill pattern through the walls. Not super
  distracting, but it's there.
 #### White
 * Walls are practically translucent, you can almost always see the infill. Do not use for major components.
 * Looks perfectly good for thin things like the Neutrik plates, decorative pieces, that kind of thing.
 ### Matte
 * I don't like the texture as much, but they do produce nice non-primary color colorways, and you don't see the infill.
 * Seems like their plastic treatment leaves some plate residue, so be better about cleaning it or you'll get ghosts.
 ## Hatchbox PLA
 * **Blue:** very blue. Wife likes it.
 * **White:** more opaque than the Bambu PLA mentioned above, makes a pretty decent (still slightly translucent) frame.
--- a/docs/printing-and-materials.md
+++ b/docs/printing-and-materials.md
@@ -1,67 +0,0 @@
 # Printing and Materials
 bss's random thoughts and notes on the actual printing of the Buildable Stick System.
 ## Printing Settings
 My preferred settings are 3 wall loops with 20% gyroid sparse infill. This gives the models a bit more weight and
 strength against bowing forces, but something more default, like 2 wall loops, 15% grid sparse infill, is fine and does
 not lead to a weak enclosure.
 ### Working With Flatness
 A lot of the pieces are long and flat, so I recommend really dialing in your printer settings. The frame pieces make
 corner curling of the frame less of a problem, but you may still get it on the panels and the beveled frame pieces.
 #### Bottom Layer Notes
 Considering the visible layer (usually, the bottom layer) pattern is ideal. Monotonic prints fast but creates long,
 uniform lines that create reflection patterns on long, flat surfaces. This can be especially distracting for the top
 panels and their decorative plates, since they're what you're looking at 90% of the time, and the holes break up a
 perfect pattern, making the long lines stand out even more.
 * **Top panels:** using a non-uniform pattern reduces if not eliminates the problem of the surface catching the light,
  but for some patterns, it may come at the expense of time. Other patterns may improve beyond monotonic, but hilbert
  curve seems to be the gold standard.
 * **Circle-centric decorative plates:** don't use complex patterns like Archimedean chords on decorative plates, as they
  seem to have issues with filling curves and you still want to try to maximize contact with walls. Concentric is great
  here if you dial it in.
 Panels may have tiny gaps against the circular button cutouts; this is largely not a problem as buttom rims, decorative
 plates, etc. will cover it up. However, I've had some interesting results with:
 * Initial layer line width: 0.42mm (down .08mm)
 * Initial layer height: 0.25mm (up .05mm)
 * Initial layer nozzle temperature: 230°C (up 10°C)
 * Initial layer bed temperature: 70°C (up 5°C)
 * Initial layer pattern: concentric
 These are good defaults and print awesome parts, with the only exception being the top panels, which benefit from using
 a Hilbert curve initial layer pattern instead of concentric.
 ## Materials
 Some notes on PLA brands, usages, etc.
 ### Bambu Lab PLA
 #### Basic
 * In general, nice texture, but under direct light, you can see a bit of the infill pattern through the walls. Not super
  distracting, but it's there.
 ##### White
 * Walls are practically translucent, you can almost always see the infill. 3 wall loops and a varying infill pattern
  definitely help here.
 * Looks perfectly good for thin things like the Neutrik plates, decorative pieces, that kind of thing.
 #### Matte
 * I don't like the texture as much, but they do produce nice non-primary color colorways, and you don't see the infill.
 * Seems like their plastic treatment leaves some plate residue, so be better about cleaning it or you'll get ghosts.
 ### Hatchbox PLA
 * **Blue:** very blue. Wife likes it.
 * **White:** more opaque than the Bambu PLA mentioned above, makes a pretty decent (still slightly translucent) frame.
--- a/src/blown-up-demo.scad
+++ b/src/blown-up-demo.scad
@@ -7,10 +7,10 @@ include <parameters.scad>
 include <components.scad>
 use <frame-left.scad>
 use <frame-right.scad>
-use <top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad>
+use <top-panel-left-lever-and-dir_arc-plus-w-30mm.scad>
-use <top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount.scad>
+use <top-panel-right-sega-2p-plus-one-plus-control-with-mount.scad>
-use <bottom-panel-overhang-left.scad>
+use <bottom-panel-left.scad>
-use <bottom-panel-overhang-right.scad>
+use <bottom-panel-right.scad>
 use <misc-decorative-plate-24mm-button.scad>
 use <misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one.scad>
 use <misc-dustwasher-lsx-nobi.scad>
--- a/src/bottom-panel-inset.scad
+++ b/src/bottom-panel-inset.scad
@@ -6,4 +6,11 @@
 include <parameters.scad>
 include <components.scad>
 module bottom_panel() {
 	difference() {
 		mirror([0, 0, 1]) panel();
 		translate([0, 0, panel_z/2]) cube([panel_x-40, panel_y-40, panel_z], center=true);
 	}
 }
 bottom_panel();
--- a/src/bottom-panel-overhang-left.scad
+++ b/src/bottom-panel-overhang-left.scad
@@ -5,7 +5,7 @@
 include <parameters.scad>
 include <components.scad>
-use <bottom-panel-overhang-solo.scad>
+use <bottom-panel-solo.scad>
 module bottom_panel_left() {
 	difference() {
--- a/src/bottom-panel-overhang-middle.scad
+++ b/src/bottom-panel-overhang-middle.scad
@@ -5,8 +5,8 @@
 include <parameters.scad>
 include <components.scad>
-use <bottom-panel-overhang-left.scad>
+use <bottom-panel-left.scad>
-use <bottom-panel-overhang-right.scad>
+use <bottom-panel-right.scad>
 module bottom_panel_middle() {
 	intersection() {
--- a/src/bottom-panel-overhang-right.scad
+++ b/src/bottom-panel-overhang-right.scad
@@ -5,7 +5,7 @@
 include <parameters.scad>
 include <components.scad>
-use <bottom-panel-overhang-left.scad>
+use <bottom-panel-left.scad>
 module bottom_panel_right() {
 	rotate([0, 0, 180]) bottom_panel_left();
--- a/src/components.scad
+++ b/src/components.scad
@@ -3,6 +3,8 @@
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <roundedcube.scad>
 module m4_hole() {
 	cylinder(r=m4_bolt_radius, h=100, $fn=50, center=true);
 }
@@ -29,9 +31,9 @@ module panel_holes() {
 module button_24mm_hole() {
 	cylinder(r=small_button_radius, h=100, $fn=50, center=true);
 	// carve out space for snap-ins, leave 3mm
-	// slagcoin has screw-in nut diameter at 29.5mm, so radius+3 to leave some space
+	// slagcoin has screw-in nut diameter at 29.5mm, so radius+6 to leave some space
 	// translation is to leave 3mm thickness in the plate without recentering anything
-	translate([0, 0, -25]) cylinder(r=small_button_radius+3, h=49, $fn=50, center=true);
+	translate([0, 0, -25]) cylinder(r=small_button_radius+6, h=49, $fn=50, center=true);
 	// space for decorative button surround stuff
 	translate([0, 0, 50]) cylinder(r=small_button_radius*decorative_radius_scale, h=20, $fn=50, center=true);
 	translate([0, 0, 70]) cylinder(r=small_button_radius*jumbo_decorative_radius_scale, h=20, $fn=50, center=true);
@@ -55,7 +57,7 @@ module frame_hex_bolt_hole() {
 }
 module frame_interchange_hole() {
-	cylinder(r=18, h=50, $fn=4, center=true);
+	cylinder(r=15, h=50, $fn=50, center=true);
 }
 module neutrik_d_hole() {
@@ -81,14 +83,14 @@ module rocker_20mm_mount() {
 // space for a neutrik D mount or 24mm button - Z is to cut the whole inside without affecting panel lip
 module frame_cutout() {
-	cube([30.5, 8, frame_z-(panel_z*2)], center=true);
+	cube([36.5, 8, frame_z-(panel_z*2)], center=true);
 }
 // bank of three 24mm buttons, commonly on a frame face
 module aux_control_three_button_cluster() {
-	translate([-37, 0, 0]) button_24mm_hole();
+	translate([-40, 0, 0]) button_24mm_hole();
 	translate([0, 0, 0]) button_24mm_hole();
-	translate([37, 0, 0]) button_24mm_hole();
+	translate([40, 0, 0]) button_24mm_hole();
 }
 module m2_mount_post() {
@@ -149,9 +151,6 @@ module levermountholes() {
 		m4_hole();
 	translate([-20, -42.5, 0])
 		m4_hole();
 }
 module levermountcountersinks() {
 	// holes for joystick bolt countersinks
 	translate([20, 42.5, 2])
 		m4_hole_countersink();
@@ -164,36 +163,7 @@ module levermountcountersinks() {
 }
 module base_panel() {
-	difference() {
+	cube([panel_x, panel_y, panel_z], center=true);
 		union() {
 			cube([panel_x, panel_y, panel_z], center=true);
 			// add posts that sink into the frame, just to give
 			// a somewhat more sturdy/tight connection
 			translate([panel_to_frame_point_x, panel_to_frame_point_y, -panel_z])
 				scale([1.5, 1.5, 0.1]) frame_hex_bolt_hole();
 			translate([-panel_to_frame_point_x, panel_to_frame_point_y, -panel_z])
 				scale([1.5, 1.5, 0.1]) frame_hex_bolt_hole();
 			translate([panel_to_frame_point_x, -panel_to_frame_point_y, -panel_z])
 				scale([1.5, 1.5, 0.1]) frame_hex_bolt_hole();
 			translate([-panel_to_frame_point_x, -panel_to_frame_point_y, -panel_z])
 				scale([1.5, 1.5, 0.1]) frame_hex_bolt_hole();
 		}
 		// the posts mentioned above need space for the actual hex bolts
 		// used in connecting to the frame
 		translate([panel_to_frame_point_x, panel_to_frame_point_y, -panel_z])
 			scale([1, 1, 0.1]) frame_hex_bolt_hole();
 		translate([-panel_to_frame_point_x, panel_to_frame_point_y, -panel_z])
 			scale([1, 1, 0.1]) frame_hex_bolt_hole();
 		translate([panel_to_frame_point_x, -panel_to_frame_point_y, -panel_z])
 			scale([1, 1, 0.1]) frame_hex_bolt_hole();
 		translate([-panel_to_frame_point_x, -panel_to_frame_point_y, -panel_z])
 			scale([1, 1, 0.1]) frame_hex_bolt_hole();
 	}
 }
 module base_bottom_panel() {
 	mirror([0, 0, 1]) base_panel();
 }
 module panel() {
@@ -203,36 +173,8 @@ module panel() {
 	}
 }
 module bottom_panel() {
 	difference() {
 		base_bottom_panel();
 		mirror([0, 0, 1]) panel_holes();
 	}
 }
 module overhang_plate() {
-	top_points = [
+	roundedcube([overhang_panel_x, overhang_panel_y, panel_z], center=true, radius=1);
 		// top bevel
 		[(overhang_panel_x/2)-(overhang_panel_bevel_height*2),
 		 (overhang_panel_y/2)-(overhang_panel_bevel_height*2),
 		 panel_z/2-overhang_panel_bevel_height/2],
 		[-(overhang_panel_x/2)+(overhang_panel_bevel_height*2),
 		 (overhang_panel_y/2)-(overhang_panel_bevel_height*2),
 		 panel_z/2-overhang_panel_bevel_height/2],
 		[(overhang_panel_x/2)-(overhang_panel_bevel_height*2),
 		 -(overhang_panel_y/2)+(overhang_panel_bevel_height*2),
 		 panel_z/2-overhang_panel_bevel_height/2],
 		[-(overhang_panel_x/2)+(overhang_panel_bevel_height*2),
 		 -(overhang_panel_y/2)+(overhang_panel_bevel_height*2),
 		 panel_z/2-overhang_panel_bevel_height/2],
 	];
 	hull() {
 		for (p = top_points) {
 			translate(p) cylinder(r=overhang_panel_bevel_height, h=overhang_panel_bevel_height, center=true);
 		}
 		translate([0, 0, -overhang_panel_bevel_height])
 			cube([overhang_panel_x, overhang_panel_y, panel_z-overhang_panel_bevel_height*2], center=true);
 	}
 }
 // this takes the base_panel and makes it a small frame, putting a larger top plate
@@ -240,16 +182,12 @@ module base_panel_with_raised_overhang() {
 	// make a frame out of the top plate (and keep the main plate on the center plane)
 	translate([0, 0, -5]) difference() {
 		base_panel();
-		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), panel_z], center=true);
+		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), panel_z*2], center=true);
 	}
-	translate([panel_to_frame_point_x, panel_to_frame_point_y, -2.5]) resize([0, 0, 10])
+	translate([panel_to_frame_point_x, panel_to_frame_point_y, -2.5]) resize([0, 0, 10]) frame_mount_column();
-		frame_mount_column();
+	translate([-(panel_to_frame_point_x), panel_to_frame_point_y, -2.5]) resize([0, 0, 10]) frame_mount_column();
-	translate([-(panel_to_frame_point_x), panel_to_frame_point_y, -2.5]) resize([0, 0, 10])
+	translate([panel_to_frame_point_x, -(panel_to_frame_point_y), -2.5]) resize([0, 0, 10]) frame_mount_column();
-		rotate([0, 0, 90]) frame_mount_column();
+	translate([-(panel_to_frame_point_x), -(panel_to_frame_point_y), -2.5]) resize([0, 0, 10]) frame_mount_column();
 	translate([panel_to_frame_point_x, -(panel_to_frame_point_y), -2.5]) resize([0, 0, 10])
 		rotate([0, 0, 270]) frame_mount_column();
 	translate([-(panel_to_frame_point_x), -(panel_to_frame_point_y), -2.5]) resize([0, 0, 10])
 		rotate([0, 0, 180]) frame_mount_column();
 	overhang_plate();
 }
@@ -262,64 +200,14 @@ module panel_with_raised_overhang() {
 module frame_box() {
 	difference() {
-		top_points = [
+		roundedcube([frame_x, frame_y, frame_z], center=true, radius=3);
 			// top bevel
 			[(frame_x/2)-(frame_bevel_height*2),
 			 (frame_y/2)-(frame_bevel_height*2),
 			 frame_z/2-frame_bevel_height/2],
 			[-(frame_x/2)+(frame_bevel_height*2),
 			 (frame_y/2)-(frame_bevel_height*2),
 			 frame_z/2-frame_bevel_height/2],
 			[(frame_x/2)-(frame_bevel_height*2),
 			 -(frame_y/2)+(frame_bevel_height*2),
 			 frame_z/2-frame_bevel_height/2],
 			[-(frame_x/2)+(frame_bevel_height*2),
 			 -(frame_y/2)+(frame_bevel_height*2),
 			 frame_z/2-frame_bevel_height/2],
 		];
 		base_points = [
 			// majority of shape
 			[(frame_x/2)-frame_bevel_height, (frame_y/2)-frame_bevel_height, 0],
 			[-(frame_x/2)+frame_bevel_height, (frame_y/2)-frame_bevel_height, 0],
 			[(frame_x/2)-frame_bevel_height, -(frame_y/2)+frame_bevel_height, 0],
 			[-(frame_x/2)+frame_bevel_height, -(frame_y/2)+frame_bevel_height, 0],
 		];
 		bottom_points = [
 			// bottom bevel
 			[(frame_x/2)-(frame_bevel_height*2),
 			 (frame_y/2)-(frame_bevel_height*2),
 			 -frame_z/2+frame_bevel_height/2],
 			[-(frame_x/2)+(frame_bevel_height*2),
 			 (frame_y/2)-(frame_bevel_height*2),
 			 -frame_z/2+frame_bevel_height/2],
 			[(frame_x/2)-(frame_bevel_height*2),
 			 -(frame_y/2)+(frame_bevel_height*2),
 			 -frame_z/2+frame_bevel_height/2],
 			[-(frame_x/2)+(frame_bevel_height*2),
 			 -(frame_y/2)+(frame_bevel_height*2),
 			 -frame_z/2+frame_bevel_height/2],
 		];
 		hull() {
 			for (p = top_points) {
 				translate(p) cylinder(r=2, h=frame_bevel_height, center=true);
 			}
 			for (p = base_points) {
 				translate(p) cylinder(r=2, h=frame_z-(frame_bevel_height*2), center=true);
 			}
 			for (p = bottom_points) {
 				translate(p) cylinder(r=2, h=frame_bevel_height, center=true);
 			}
 		}
 		// cut out the middle to make it a box
 		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), frame_z+5], center=true);
 	}
 }
 module frame_mount_column() {
-	cube([frame_mount_column_width, frame_mount_column_width, frame_z], center=true);
+	cube([20, 20, frame_z], center=true);
 	// add some corners back to do a lame chamfer
 	linear_extrude(height=frame_z, center=true)
 		polygon([[10, 10], [-20, 10], [10, -20]]);
 }
 module side_chopper() {
@@ -346,30 +234,20 @@ module frame_cable_routing_hole() {
 module base_frame() {
 	frame_box();
 	translate([panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_mount_column();
-	translate([-panel_to_frame_point_x, panel_to_frame_point_y, 0]) rotate([0, 0, 90]) frame_mount_column();
+	translate([-panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_mount_column();
-	translate([-panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) rotate([0, 0, 180])  frame_mount_column();
+	translate([panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) frame_mount_column();
-	translate([panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) rotate([0, 0, 270])  frame_mount_column();
+	translate([-panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) frame_mount_column();
 }
 module frame() {
 	difference() {
 		base_frame();
 		translate([0, 0, frame_z/2]) scale([1, 1, 2]) base_panel();
-		translate([0, 0, -frame_z/2]) scale([1, 1, 2]) bottom_panel();
+		translate([0, 0, -frame_z/2]) scale([1, 1, 2]) base_panel();
 		translate([panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([-panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([panel_to_frame_point_x, -panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([-panel_to_frame_point_x, -panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		// slightly larger holes than the posts in the base_panel
 		translate([panel_to_frame_point_x, panel_to_frame_point_y, frame_z/2-panel_z-5])
 			scale([1.55, 1.55, 0.2]) frame_hex_bolt_hole();
 		translate([-panel_to_frame_point_x, panel_to_frame_point_y, frame_z/2-panel_z-5])
 			scale([1.55, 1.55, 0.2]) frame_hex_bolt_hole();
 		translate([panel_to_frame_point_x, -panel_to_frame_point_y, frame_z/2-panel_z-5])
 			scale([1.55, 1.55, 0.2]) frame_hex_bolt_hole();
 		translate([-panel_to_frame_point_x, -panel_to_frame_point_y, frame_z/2-panel_z-5])
 			scale([1.55, 1.55, 0.2]) frame_hex_bolt_hole();
 	}
 }
--- a/src/frame-left.scad
+++ b/src/frame-left.scad
@@ -24,10 +24,10 @@ module left_frame() {
 		frame_cable_routing_hole();
 		// aux button holes
-		translate([-35, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
+		translate([-30, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
-		translate([-35, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-30, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([-72, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([2, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 		// neutrix button hole
 		translate([frame_center_to_neutrik, (frame_y/2)-neutrik_panel_thickness, 0])
--- a/src/frame-middle.scad
+++ b/src/frame-middle.scad
@@ -27,14 +27,11 @@ module middle_frame() {
 		mirror([1, 0, 0]) frame_cable_routing_hole();
 		// neutrik mounts for connector, switches
-		translate([0, (frame_y/2)-neutrik_panel_thickness, 0])
+		translate([0, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
 			rotate([90, 0, 0]) neutrik_d_mount();
 		translate([0, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([-40, (frame_y/2)-neutrik_panel_thickness, 0])
+		translate([-40, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
 			rotate([90, 0, 0]) neutrik_d_mount();
 		translate([-40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([40, (frame_y/2)-neutrik_panel_thickness, 0])
+		translate([40, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
 			rotate([90, 0, 0]) neutrik_d_mount();
 		translate([40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 	}
 }
--- a/src/frame-piece-bottom-left-or-right-extended.scad
+++ b/src/frame-piece-bottom-left-or-right-extended.scad
@@ -1,29 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-piece-bottom-left-or-right.scad>
 module bottom_piece_wall() {
 	// get a slice of the piece, to use it in extruding
 	projection(cut=true) rotate([-90, 0, 0]) translate([0, frame_y/2-frame_bevel_height, 0])
 		bottom_left_or_right_frame_piece();
 }
 module bottom_piece_extension() {
 	// combine the original with a shrunken piece to "pull" the wall out
 	hull() {
 		linear_extrude(height=frame_extension_y) scale([1, 0.5, 1]) bottom_piece_wall();
 		linear_extrude(height=frame_bevel_height) bottom_piece_wall();
 	}
 }
 module extended_bottom_left_or_right_frame_piece() {
 	bottom_left_or_right_frame_piece();
 	translate([0, -frame_y/2+frame_bevel_height*2, 0]) rotate([90, 0, 0]) bottom_piece_extension();
 }
 extended_bottom_left_or_right_frame_piece();
--- a/src/frame-piece-bottom-left-or-right.scad
+++ b/src/frame-piece-bottom-left-or-right.scad
@@ -1,26 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-left.scad>
 module bottom_left_or_right_frame_piece() {
 	piece_width = panel_support_width+frame_wall+frame_mount_column_width;
 	intersection() {
 		left_frame();
 		difference() {
 			// include the whole bottom wall (including mount columns)
 			translate([0, -(frame_y/2)+(piece_width/2), 0]) cube([frame_x, piece_width, frame_z], center=true);
 			// ...minus the frame wall and lip on the left
 			translate([-frame_x/2+frame_wall/2, 0, 0])
 				cube([frame_wall, frame_y, frame_z], center=true);
 			// ...minus a slot for the combining piece to go into
 			cube([frame_x, frame_y-(panel_support_width+frame_wall)*2, frame_z/4], center=true);
 		}
 	}
 }
 bottom_left_or_right_frame_piece();
--- a/src/frame-piece-interconnect.scad
+++ b/src/frame-piece-interconnect.scad
@@ -1,28 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-piece-side.scad>
 module interconnect_frame_half_piece() {
 	translate([frame_x/2-frame_wall, 0, 0]) difference() {
 		side_frame_piece();
 		rotate([0, 0, 180]) side_chopper();
 	}
 }
 module interconnect_frame_piece() {
 	difference() {
 		union() {
 			// slight translate is to make this a 2-manifold in OpenSCAD
 			translate([-0.01, 0, 0]) interconnect_frame_half_piece();
 			mirror([1, 0, 0]) interconnect_frame_half_piece();
 		}
 		translate([-frame_x/2, 0, 0]) frame_cable_routing_hole();
 	}
 }
 interconnect_frame_piece();
--- a/src/frame-piece-side-extended-to-bottom.scad
+++ b/src/frame-piece-side-extended-to-bottom.scad
@@ -1,35 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-piece-bottom-left-or-right-extended.scad>
 use <frame-piece-side.scad>
 module side_and_bottom_frame_piece_wall() {
 	// get a slice of the pieces, to use it in extruding
 	projection(cut=true) rotate([0, 90, 0]) translate([frame_x/2-frame_bevel_height, 0, 0])
 		side_frame_piece();
 	projection(cut=true) translate([0, -frame_y/2+frame_wall, 0]) rotate([90, 90, 0]) bottom_piece_extension();
 }
 module side_and_bottom_frame_piece_extension() {
 	// combine the original with a shrunken piece to "pull" the wall out
 	hull() {
 		linear_extrude(height=frame_extension_y) scale([0.5, 0.90, 1]) side_and_bottom_frame_piece_wall();
 		linear_extrude(height=frame_bevel_height) side_and_bottom_frame_piece_wall();
 	}
 }
 module extra_extended_left_or_right_frame_piece() {
 	difference() {
 		side_frame_piece();
 		// chop off the old edge which is getting replaced with the extension
 		translate([-frame_x/2+frame_bevel_height/2, 0, 0]) cube([frame_bevel_height, frame_y, frame_z], center=true);
 	}
 	translate([-frame_x/2+frame_bevel_height*2, 0, 0]) rotate([0, -90, 0]) side_and_bottom_frame_piece_extension();
 }
 extra_extended_left_or_right_frame_piece();
--- a/src/frame-piece-side-extended.scad
+++ b/src/frame-piece-side-extended.scad
@@ -1,33 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-piece-side.scad>
 module side_frame_piece_wall() {
 	// get a slice of the piece, to use it in extruding
 	projection(cut=true) rotate([0, 90, 0]) translate([frame_x/2-frame_bevel_height, 0, 0])
 		side_frame_piece();
 }
 module side_frame_piece_extension() {
 	// combine the original with a shrunken piece to "pull" the wall out
 	hull() {
 		linear_extrude(height=frame_extension_y) scale([0.5, 0.85, 1]) side_frame_piece_wall();
 		linear_extrude(height=frame_bevel_height) side_frame_piece_wall();
 	}
 }
 module extended_bottom_left_or_right_frame_piece() {
 	difference() {
 		side_frame_piece();
 		// chop off the old edge which is getting replaced with the extension
 		translate([-frame_x/2+frame_bevel_height/2, 0, 0]) cube([frame_bevel_height, frame_y, frame_z], center=true);
 	}
 	translate([-frame_x/2+frame_bevel_height*2, 0, 0]) rotate([0, -90, 0]) side_frame_piece_extension();
 }
 extended_bottom_left_or_right_frame_piece();
--- a/src/frame-piece-side.scad
+++ b/src/frame-piece-side.scad
@@ -1,24 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-piece-top-left.scad>
 use <frame-piece-bottom-left-or-right.scad>
 module side_frame_piece() {
 	piece_width = panel_support_width+frame_wall+frame_mount_column_width;
 	difference() {
 		// side piece is left/right agnostic
 		frame();
 		// minus the top and bottom
 		top_left_frame_piece();
 		bottom_left_or_right_frame_piece();
 		// and just chop out the rest of the frame
 		translate([piece_width, 0, 0]) cube([frame_x, frame_y+1, frame_z+1], center=true);
 	}
 }
 side_frame_piece();
--- a/src/frame-piece-top-left.scad
+++ b/src/frame-piece-top-left.scad
@@ -1,26 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-left.scad>
 module top_left_frame_piece() {
 	piece_width = panel_support_width+frame_wall+frame_mount_column_width;
 	intersection() {
 		left_frame();
 		difference() {
 			// include the whole top wall (including mount columns)
 			translate([0, (frame_y/2)-(piece_width/2), 0]) cube([frame_x, piece_width, frame_z], center=true);
 			// ...minus the frame wall and lip on the left
 			translate([-frame_x/2+frame_wall/2, 0, 0])
 				cube([frame_wall, frame_y, frame_z], center=true);
 			// ...minus a slot for the combining piece to go into
 			cube([frame_x, frame_y-(panel_support_width+frame_wall)*2, frame_z/4], center=true);
 		}
 	}
 }
 top_left_frame_piece();
--- a/src/frame-piece-top-right.scad
+++ b/src/frame-piece-top-right.scad
@@ -1,26 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 use <frame-right.scad>
 module top_right_frame_piece() {
 	piece_width = panel_support_width+frame_wall+frame_mount_column_width;
 	intersection() {
 		right_frame();
 		difference() {
 			// include the whole top wall (including mount columns)
 			translate([0, (frame_y/2)-(piece_width/2), 0]) cube([frame_x, piece_width, frame_z], center=true);
 			// ...minus the frame wall and lip on the right
 			translate([frame_x/2-frame_wall/2, 0, 0])
 				cube([frame_wall, frame_y, frame_z], center=true);
 			// ...minus a slot for the combining piece to go into
 			cube([frame_x, frame_y-(panel_support_width+frame_wall)*2, frame_z/4], center=true);
 		}
 	}
 }
 top_right_frame_piece();
--- a/src/frame-right.scad
+++ b/src/frame-right.scad
@@ -24,10 +24,10 @@ module right_frame() {
 		mirror([1, 0, 0]) frame_cable_routing_hole();
 		// aux button holes
-		translate([35, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
+		translate([30, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
-		translate([35, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([30, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([72, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([-2, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 		// neutrix button hole
 		translate([-frame_center_to_neutrik, (frame_y/2)-neutrik_panel_thickness, 0])
--- a/src/frame-solo.scad
+++ b/src/frame-solo.scad
@@ -19,17 +19,15 @@ module solo_frame() {
 		translate([40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 		// aux button holes
-		translate([-frame_x/2+2.5, 0, 0]) rotate([90, 0, 270])
+		translate([-frame_x/2+2.5, 0, 0]) rotate([90, 0, 270]) aux_control_three_button_cluster();
 			aux_control_three_button_cluster();
 		translate([(frame_x/2)-neutrik_panel_thickness-4, 0, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([(frame_x/2)-neutrik_panel_thickness-4, -37, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([(frame_x/2)-neutrik_panel_thickness-4, -40, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([(frame_x/2)-neutrik_panel_thickness-4, 37, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([(frame_x/2)-neutrik_panel_thickness-4, 40, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([frame_x/2+2.5, 0, 0]) rotate([90, 0, 270])
+		translate([frame_x/2+2.5, 0, 0]) rotate([90, 0, 270]) aux_control_three_button_cluster();
 			aux_control_three_button_cluster();
 		translate([-(frame_x/2)+neutrik_panel_thickness+4, 0, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([-(frame_x/2)+neutrik_panel_thickness+4, -37, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([-(frame_x/2)+neutrik_panel_thickness+4, -40, 0]) rotate([0, 0, 90]) frame_cutout();
-		translate([-(frame_x/2)+neutrik_panel_thickness+4, 37, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([-(frame_x/2)+neutrik_panel_thickness+4, 40, 0]) rotate([0, 0, 90]) frame_cutout();
 	}
 }
--- a/src/misc-decorative-plate-aux-control-three-button-cluster.scad
+++ b/src/misc-decorative-plate-aux-control-three-button-cluster.scad
@@ -10,8 +10,8 @@ use <misc-neutrik-d-plate.scad>
 module aux_control_three_button_cluster_decorative_plate() {
 	difference() {
 		hull() {
-			translate([-44, 0, 0]) neutrik_d_plate();
+			translate([-50, 0, 0]) neutrik_d_plate();
-			translate([44, 0, 0]) neutrik_d_plate();
+			translate([50, 0, 0]) neutrik_d_plate();
 		}
 		translate([0, 0, -10]) aux_control_three_button_cluster();
 	}
--- a/src/misc-lever-mount-sanwa-seimitsu.scad
+++ b/src/misc-lever-mount-sanwa-seimitsu.scad
@@ -1,16 +0,0 @@
 /*
 * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
 * SPDX-License-Identifier: GPL-3.0-or-later
 */
 include <parameters.scad>
 include <components.scad>
 module sanwa_seimitsu_lever_mount() {
 	difference() {
 		levermountbase();
 		levermountholes();
 	}
 }
 sanwa_seimitsu_lever_mount();
--- a/src/parameters.scad
+++ b/src/parameters.scad
@@ -35,25 +35,13 @@ lever_plate_hole = 12;
 // base frame box. reminder: top of inside (including mounts) is chopped by panel_z for plates
 frame_x = 233;
 frame_y = 208;
-frame_z = 57;
+frame_z = 55;
 // degree to which the extended frame pieces stick out from the end of the frame
 frame_extension_x = 25;
 frame_extension_y = 25;
 // this sinks the bottom and top of the frame inward a bit, and is used to math out two shapes
 // when creating the frame box / overhang panel
 frame_bevel_height = 2;
 overhang_panel_bevel_height = 1;
 frame_center_to_neutrik = 70;
 // depth of the "lip" of the frame that the top plate sets into/supports the overhang
 frame_wall = 4;
 // width of the column in the frame corners to support the hex bolt
 frame_mount_column_width = 20;
 // per neutrik (mm)
 neutrik_panel_thickness = 3;
--- a/src/roundedcube.scad
+++ b/src/roundedcube.scad
@@ -0,0 +1,55 @@
 // More information: https://danielupshaw.com/openscad-rounded-corners/
 // Set to 0.01 for higher definition curves (renders slower)
 $fs = 0.15;
 module roundedcube(size = [1, 1, 1], center = false, radius = 0.5, apply_to = "all") {
 	// If single value, convert to [x, y, z] vector
 	size = (size[0] == undef) ? [size, size, size] : size;
 	translate_min = radius;
 	translate_xmax = size[0] - radius;
 	translate_ymax = size[1] - radius;
 	translate_zmax = size[2] - radius;
 	diameter = radius * 2;
 	obj_translate = (center == false) ?
 		[0, 0, 0] : [
 			-(size[0] / 2),
 			-(size[1] / 2),
 			-(size[2] / 2)
 		];
 	translate(v = obj_translate) {
 		hull() {
 			for (translate_x = [translate_min, translate_xmax]) {
 				x_at = (translate_x == translate_min) ? "min" : "max";
 				for (translate_y = [translate_min, translate_ymax]) {
 					y_at = (translate_y == translate_min) ? "min" : "max";
 					for (translate_z = [translate_min, translate_zmax]) {
 						z_at = (translate_z == translate_min) ? "min" : "max";
 						translate(v = [translate_x, translate_y, translate_z])
 						if (
 							(apply_to == "all") ||
 							(apply_to == "xmin" && x_at == "min") || (apply_to == "xmax" && x_at == "max") ||
 							(apply_to == "ymin" && y_at == "min") || (apply_to == "ymax" && y_at == "max") ||
 							(apply_to == "zmin" && z_at == "min") || (apply_to == "zmax" && z_at == "max")
 						) {
 							sphere(r = radius);
 						} else {
 							rotate = 
 								(apply_to == "xmin" || apply_to == "xmax" || apply_to == "x") ? [0, 90, 0] : (
 								(apply_to == "ymin" || apply_to == "ymax" || apply_to == "y") ? [90, 90, 0] :
 								[0, 0, 0]
 							);
 							rotate(a = rotate)
 							cylinder(h = diameter, r = radius, center = true);
 						}
 					}
 				}
 			}
 		}
 	}
 }
--- a/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad
+++ b/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad
@@ -8,10 +8,13 @@ include <components.scad>
 module top_panel_inset_lever_and_dir_arc_w_30mm() {
 	difference() {
-		panel();
+		union() {
 			panel();
 			translate([(-panel_x/2)+55, (panel_y/2)-75, -((panel_z/2)+(lever_mount_z/2))])
 				levermountbase();
 		}
 		dir_arc_w_30mm();
 		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountholes();
 		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountcountersinks();
 	}
 }
--- a/src/top-panel-inset-lever.scad
+++ b/src/top-panel-inset-lever.scad
@@ -10,10 +10,12 @@ include <components.scad>
 module lever_panel() {
 	difference() {
 		// base plate
-		translate([0,-20,0]) panel();
+		union() {
 			translate([0,-20,0]) panel();
 			translate([0, 0, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
 		}
 		// holes to mount the lever
 		levermountholes();
 		levermountcountersinks();
 	}
 }
--- a/src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad
+++ b/src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad
@@ -8,11 +8,13 @@ include <components.scad>
 module top_panel_left_lever_and_dir_arc_w_30mm() {
 	difference() {
-		panel_with_raised_overhang();
+		union() {
 			panel_with_raised_overhang();
 			translate([(-panel_x/2)+55, (panel_y/2)-75, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
 		}
 		dir_arc_w_30mm();
 		side_chopper();
 		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountholes();
 		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountcountersinks();
 	}
 }
--- a/src/top-panel-overhang-left-lever.scad
+++ b/src/top-panel-overhang-left-lever.scad
@@ -10,10 +10,12 @@ include <components.scad>
 module top_panel_left_lever() {
 	difference() {
 		// base plate
-		panel_with_raised_overhang();
+		union() {
 			translate([0,-20,0]) panel_with_raised_overhang();
 			translate([0, 0, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
 		}
 		// holes to mount the lever
-		translate([0, 20, 0]) levermountholes();
+		levermountholes();
 		translate([0, 20, 0]) levermountcountersinks();
 		side_chopper();
 	}
 }
--- a/src/top-panel-overhang-middle-dir_arc-plus-w-30mm-with-mount.scad
+++ b/src/top-panel-overhang-middle-dir_arc-plus-w-30mm-with-mount.scad
@@ -5,7 +5,7 @@
 include <parameters.scad>
 include <components.scad>
-use <top-panel-overhang-middle-dir_arc-plus-w-30mm.scad>
+use <top-panel-middle-dir_arc-plus-w-30mm.scad>
 module top_panel_middle_dir_arc_w_30mm_with_mount() {
 	top_panel_middle_dir_arc_w_30mm();
--- a/src/top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount-with-oled.scad
+++ b/src/top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount-with-oled.scad
@@ -5,7 +5,7 @@
 include <parameters.scad>
 include <components.scad>
-use <top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount.scad>
+use <top-panel-right-sega-2p-plus-one-plus-control-with-mount.scad>
 module top_panel_right_sega_2p_plus_one_plus_control_with_mount_with_oled() {
 	difference() {
--- a/src/top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount.scad
+++ b/src/top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount.scad
@@ -5,7 +5,7 @@
 include <parameters.scad>
 include <components.scad>
-use <top-panel-overhang-right-sega-2p-plus-one-plus-control.scad>
+use <top-panel-right-sega-2p-plus-one-plus-control.scad>
 module top_panel_right_sega_2p_plus_one_plus_control_with_mount() {
 	top_panel_right_sega_2p_plus_one_plus_control();
--- a/src/top-panel-overhang-right-sega-2p-plus-one-with-mount.scad
+++ b/src/top-panel-overhang-right-sega-2p-plus-one-with-mount.scad
@@ -5,7 +5,7 @@
 include <parameters.scad>
 include <components.scad>
-use <top-panel-overhang-right-sega-2p-plus-one.scad>
+use <top-panel-right-sega-2p-plus-one.scad>
 module top_panel_right_sega_2p_plus_one_with_mount() {
 	top_panel_right_sega_2p_plus_one();