From 113c35a112d97b1498bb7ef5b6506fabab954c41 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Wed, 30 May 2018 11:19:02 +0200 Subject: [PATCH] Code cleanup add license additions. --- EngineMkI.cpp | 8 - LICENSE => LICENSE-APACHE2.txt | 0 LICENSE-GPL3.txt | 674 +++++++++++++++++++++++++++++++++ MicroDexed.ino | 218 ++--------- config.h | 31 ++ dexed.cpp | 87 ++--- dexed.h | 42 +- dexed_sysex.cpp | 191 ++++++++++ dexed_sysex.h | 30 ++ fm_core.cpp | 2 - trace.h | 11 - 11 files changed, 999 insertions(+), 295 deletions(-) rename LICENSE => LICENSE-APACHE2.txt (100%) create mode 100644 LICENSE-GPL3.txt create mode 100644 config.h create mode 100644 dexed_sysex.cpp create mode 100644 dexed_sysex.h delete mode 100644 trace.h diff --git a/EngineMkI.cpp b/EngineMkI.cpp index efe9254..e7d050a 100644 --- a/EngineMkI.cpp +++ b/EngineMkI.cpp @@ -97,29 +97,22 @@ EngineMkI::EngineMkI() { char buffer[4096]; int pos = 0; - TRACE("****************************************"); for(int i=0;i 90 ) { - TRACE("SINLOGTABLE: %s" ,buffer); buffer[0] = 0; pos = 0; } } - TRACE("SINLOGTABLE: %s", buffer); buffer[0] = 0; pos = 0; - TRACE("----------------------------------------"); for(int i=0;i 90 ) { - TRACE("SINEXTTABLE: %s" ,buffer); buffer[0] = 0; pos = 0; } } - TRACE("SINEXTTABLE: %s", buffer); - TRACE("****************************************"); #endif } @@ -141,7 +134,6 @@ inline int32_t mkiSin(int32_t phase, uint16_t env) { if ( expValShow < 0 ) { expValShow = (expValShow + 0x7FFF) * -1; } - //TRACE(",%d,%d,%d,%d,%d,%d", phase >> (22 - SINLOG_BITDEPTH), env, expValShow, ( expVal & SINEXP_FILTER ) ^ SINEXP_FILTER, resultB4, result); } #endif diff --git a/LICENSE b/LICENSE-APACHE2.txt similarity index 100% rename from LICENSE rename to LICENSE-APACHE2.txt diff --git a/LICENSE-GPL3.txt b/LICENSE-GPL3.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE-GPL3.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/MicroDexed.ino b/MicroDexed.ino index 1c1bd34..aaf76e8 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -1,9 +1,26 @@ -// -// MicroDexed -// -// A port of the Dexed sound engine (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield -// (c)2018 H. Wirtz -// +/* + * MicroDexed + * + * MicroDexed is a port of the Dexed sound engine + * (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield + * + * (c)2018 H. Wirtz + * + * 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, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ #include #include @@ -11,31 +28,8 @@ #include #include #include "dexed.h" - -#define TEST_MIDI 1 -#define TEST_NOTE 40 -#define TEST_VEL_MIN 60 -#define TEST_VEL_MAX 110 - -#define DEBUG 1 -#define SERIAL_SPEED 38400 -#define VOLUME 0.1 -#define SAMPLE_RATE 44100 -#define DEXED_ENGINE DEXED_ENGINE_MODERN -//#define SHOW_DEXED_TIMING 1 -#define SHOW_XRUN 1 -#define SHOW_CPU_LOAD_MSEC 5000 -#define MAX_NOTES 16 -#define AUDIO_MEM 2 - -// Use these with the Teensy Audio Shield -#define SDCARD_CS_PIN 10 -#define SDCARD_MOSI_PIN 7 -#define SDCARD_SCK_PIN 14 -// Use these with the Teensy 3.5 & 3.6 SD card -//#define SDCARD_CS_PIN BUILTIN_SDCARD -//#define SDCARD_MOSI_PIN 11 // not actually used -//#define SDCARD_SCK_PIN 13 // not actually used +#include "dexed_sysex.h" +#include "config.h" // GUItool: begin automatically generated code AudioPlayQueue queue1; //xy=84,294 @@ -89,7 +83,7 @@ void setup() AudioMemoryUsageMaxReset(); #endif - load_sysex("ROM1A.SYX", 6); + load_sysex("ROM1A.SYX", 10); #ifdef DEBUG show_patch(); #endif @@ -242,166 +236,6 @@ void cpu_and_mem_usage(void) } #endif -void load_sysex(char *name, uint8_t voice_number) -{ - File root; - - if (sd_card_available) - { - root = SD.open("/"); - while (42 == 42) - { - File entry = root.openNextFile(); - if (!entry) - break; - else - { - if (!entry.isDirectory()) - { - if (strcmp(name, entry.name()) == 0) - { - Serial.println(entry.name()); - check_sysex(entry); - load_sysex_voice(entry, voice_number); - entry.close(); - break; - } - entry.close(); - } - } - } - } -} - -bool load_sysex_voice(File sysex, uint8_t voice_number) -{ - File file; - - if (file = SD.open(sysex.name())) - { - uint8_t* p_data = dexed->data; - uint8_t i; - uint8_t tmp; - - dexed->notes_off(); - - file.seek(6 + (voice_number * 128)); - for (i = 0; i < 6; i++) - { - file.read(p_data + (i * 21), 11); // R1, R2, R3, R4, L1, L2, L3, L4, LEV SCL BRK PT, SCL LEFT DEPTH, SCL RGHT DEPTH - tmp = file.read(); - *(p_data + 11 + (i * 21)) = (tmp & 0x3); // SCL LEFT CURVE - *(p_data + 12 + (i * 21)) = (tmp & 0x0c) >> 2; // SCL RGHT CURVE - tmp = file.read(); - *(p_data + 20 + (i * 21)) = (tmp & 0x78) >> 3; // DETUNE - *(p_data + 13 + (i * 21)) = (tmp & 0x07); // RS - tmp = file.read(); - *(p_data + 15 + (i * 21)) = (tmp & 0x1c) >> 2; // KVS - *(p_data + 14 + (i * 21)) = (tmp & 0x03); // AMS - *(p_data + 16 + (i * 21)) = file.read(); // OUTPUT LVL - tmp = file.read(); - *(p_data + 18 + (i * 21)) = (tmp & 0x3e) >> 1; // FREQ_CORSE - *(p_data + 17 + (i * 21)) = (tmp & 0x01); // OP MODE - file.read(p_data + 19 + (i * 21), 1); // FREQ FINE - } - file.read(p_data + 125, 8); // PR1, PR2, PR3, PR4, PL1, PL2, PL3, PL4 - tmp = file.read(); - *(p_data + 134) = (tmp & 0x1f); // ALG - tmp = file.read(); - *(p_data + 136) = (tmp & 0x08) >> 3; // OKS - *(p_data + 135) = (tmp & 0x07); // FB - file.read(p_data + 137, 4); // LFS, LFD, LPMD, LAMD - tmp = file.read(); - *(p_data + 143) = (tmp & 0x30) >> 4; // LFO PITCH MOD SENS - *(p_data + 142) = (tmp & 0x0e) >> 1; // LFO WAV - *(p_data + 141) = (tmp & 0x01); // LFO SYNC - file.read(p_data + 144, 1); // TRNSP - file.read(p_data + 145, 10); // NAME - *(p_data + 155) = 1; // PBEND RANGE - *(p_data + 156) = 0; // PBEND STEP - *(p_data + 157) = 99; // MOD RANGE - *(p_data + 158) = 0; // MOD ASSIGN - *(p_data + 159) = 99; // FOOT CTRL RANGE - *(p_data + 160) = 0; // FOOT CTRL ASSIGN - *(p_data + 161) = 99; // BREATH CTRL RANGE - *(p_data + 162) = 0; // BREATH CTRL ASSIGN - *(p_data + 163) = 99; // AT RANGE - *(p_data + 164) = 0; // AT ASSIGN - *(p_data + 165) = 0; // MASTER TUNE - *(p_data + 166) = 1; // OP1 ENABLE - *(p_data + 167) = 1; // OP2 ENABLE - *(p_data + 168) = 1; // OP3 ENABLE - *(p_data + 169) = 1; // OP4 ENABLE - *(p_data + 170) = 1; // OP5 ENABLE - *(p_data + 171) = 1; // OP6 ENABLE - *(p_data + 172) = MAX_NOTES; - - dexed->setOPs((*(p_data + 166) << 5) | (*(p_data + 167) << 4) | (*(p_data + 168) << 3) | (*(p_data + 166) << 2) | (*(p_data + 170) << 1) | *(p_data + 171)); - dexed->setMaxNotes(*(p_data + 172)); - dexed->doRefreshVoice(); - dexed->activate(); - -#ifdef DEBUG - char voicename[11]; - memset(voicename, 0, sizeof(voicename)); - strncpy(voicename, (char *)&dexed->data[145], sizeof(voicename) - 1); - Serial.print(F("[")); - Serial.print(voicename); - Serial.println(F("]")); -#endif - - return (true); - } - else - return (false); -} - -bool check_sysex(File sysex) -{ - File file; - uint16_t i; - uint32_t calc_checksum = 0; - - if (sysex.size() != 4104) // check sysex size - return (false); - if (file = SD.open(sysex.name())) - { - if (file.read() != 0xf0) // check sysex start-byte - { - Serial.println(F("E: SysEx start byte not found.")); - return (false); - } - if (file.read() != 0x43) // check sysex vendor is Yamaha - { - Serial.println(F("E: SysEx vendor not Yamaha.")); - return (false); - } - file.seek(4103); - if (file.read() != 0xf7) // check sysex end-byte - { - Serial.println(F("E: SysEx end byte not found.")); - return (false); - } - file.seek(3); - if (file.read() != 0x09) // check for sysex type (0x09=32 voices) - { - Serial.println(F("E: SysEx type not 32 voices.")); - return (false); - } - file.seek(6); // start of 32*128 (=4096) bytes data - for (i = 0; i < 4096; i++) - calc_checksum += (file.read() & 0x7F); // calculate checksum - calc_checksum = uint8_t(~calc_checksum + 1); - if (calc_checksum != uint8_t(file.read())) - { - Serial.println(F("E: checksum mismatch.")); - return (false); - } - } - file.close(); - return (true); -} - #ifdef DEBUG void show_patch(void) { diff --git a/config.h b/config.h new file mode 100644 index 0000000..c5e36e9 --- /dev/null +++ b/config.h @@ -0,0 +1,31 @@ +// +// MicroDexed +// +// A port of the Dexed sound engine (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield +// (c)2018 H. Wirtz +// + +//#define TEST_MIDI 1 +#define TEST_NOTE 40 +#define TEST_VEL_MIN 60 +#define TEST_VEL_MAX 110 + +//#define DEBUG 1 +#define SERIAL_SPEED 38400 +#define VOLUME 0.1 +#define SAMPLE_RATE 44100 +#define DEXED_ENGINE DEXED_ENGINE_MODERN +//#define SHOW_DEXED_TIMING 1 +#define SHOW_XRUN 1 +#define SHOW_CPU_LOAD_MSEC 5000 +#define MAX_NOTES 16 +#define AUDIO_MEM 2 + +// Use these with the Teensy Audio Shield +#define SDCARD_CS_PIN 10 +#define SDCARD_MOSI_PIN 7 +#define SDCARD_SCK_PIN 14 +// Use these with the Teensy 3.5 & 3.6 SD card +//#define SDCARD_CS_PIN BUILTIN_SDCARD +//#define SDCARD_MOSI_PIN 11 // not actually used +//#define SDCARD_SCK_PIN 13 // not actually used diff --git a/dexed.cpp b/dexed.cpp index 23e809f..5bdb471 100644 --- a/dexed.cpp +++ b/dexed.cpp @@ -1,25 +1,30 @@ -/** - - Copyright (c) 2016-2018 Holger Wirtz - - 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, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ +/* + * MicroDexed + * + * MicroDexed is a port of the Dexed sound engine + * (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield + * + * (c)2018 H. Wirtz + * + * 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, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ #include "synth.h" #include "dexed.h" +#include "config.h" #include "EngineMkI.h" #include "EngineOpl.h" #include "fm_core.h" @@ -27,7 +32,6 @@ #include "sin.h" #include "freqlut.h" #include "controllers.h" -#include "trace.h" #include #include @@ -48,22 +52,6 @@ Dexed::Dexed(int rate) engineOpl = new EngineOpl; engineMsfa = new FmCore; - /* - if(!(engineMkI=new (std::nothrow) EngineMkI)) - TRACE("Cannot not create engine EngineMkI"); - if(!(engineOpl=new (std::nothrow) EngineOpl)) - { - delete(engineMkI); - TRACE("Cannot not create engine EngineOpl"); - } - if(!(engineMsfa=new (std::nothrow) FmCore)) - { - delete(engineMkI); - delete(engineOpl); - TRACE("Cannot create engine FmCore"); - } - */ - for (i = 0; i < MAX_ACTIVE_NOTES; i++) { voices[i].dx7_note = new Dx7Note; voices[i].keydown = false; @@ -169,12 +157,10 @@ bool Dexed::processMidiMessage(uint8_t type, uint8_t data1, uint8_t data2) { switch (type & 0xf0) { case 0x80 : - //TRACE("MIDI keyup event: %d", data1); keyup(data1); return (false); break; case 0x90 : - //TRACE("MIDI keydown event: %d %d", data1, data2); keydown(data1, data2); return (false); break; @@ -184,22 +170,18 @@ bool Dexed::processMidiMessage(uint8_t type, uint8_t data1, uint8_t data2) switch (ctrl) { case 1: - //TRACE("MIDI modwheel event: %d %d", ctrl, value); controllers.modwheel_cc = value; controllers.refresh(); break; case 2: - //TRACE("MIDI breath event: %d %d", ctrl, value); controllers.breath_cc = value; controllers.refresh(); break; case 4: - //TRACE("MIDI footsw event: %d %d", ctrl, value); controllers.foot_cc = value; controllers.refresh(); break; case 64: - //TRACE("MIDI sustain event: %d %d", ctrl, value); sustain = value > 63; if (!sustain) { for (uint8_t note = 0; note < max_notes; note++) { @@ -211,12 +193,10 @@ bool Dexed::processMidiMessage(uint8_t type, uint8_t data1, uint8_t data2) } break; case 120: - //TRACE("MIDI all-sound-off: %d %d", ctrl, value); panic(); return (true); break; case 123: - //TRACE("MIDI all-notes-off: %d %d", ctrl, value); notes_off(); return (true); break; @@ -230,28 +210,22 @@ bool Dexed::processMidiMessage(uint8_t type, uint8_t data1, uint8_t data2) // channel aftertouch case 0xd0 : - //TRACE("MIDI aftertouch 0xd0 event: %d %d", data1); controllers.aftertouch_cc = data1; controllers.refresh(); break; // pitchbend case 0xe0 : - //TRACE("MIDI pitchbend 0xe0 event: %d %d", data1, data2); controllers.values_[kControllerPitch] = data1 | (data2 << 7); break; default: - //TRACE("MIDI event unknown: cmd=%d, val1=%d, val2=%d", cmd, data1, data2); break; } - TRACE("Bye"); return (false); } void Dexed::keydown(uint8_t pitch, uint8_t velo) { - TRACE("Hi"); - TRACE("pitch=%d, velo=%d\n", pitch, velo); if ( velo == 0 ) { keyup(pitch); return; @@ -302,13 +276,9 @@ void Dexed::keydown(uint8_t pitch, uint8_t velo) { } voices[note].live = true; - TRACE("Bye"); } void Dexed::keyup(uint8_t pitch) { - TRACE("Hi"); - TRACE("pitch=%d\n", pitch); - pitch += data[144] - 24; uint8_t note; @@ -321,7 +291,6 @@ void Dexed::keyup(uint8_t pitch) { // note not found ? if ( note >= max_notes ) { - TRACE("note-off not found???"); return; } @@ -347,7 +316,6 @@ void Dexed::keyup(uint8_t pitch) { } else { voices[note].dx7_note->keyup(); } - TRACE("Bye"); } void Dexed::doRefreshVoice(void) @@ -366,7 +334,6 @@ void Dexed::setOPs(uint8_t ops) if (param_val != data_float[param_num]) { - TRACE("Parameter %d change from %f to %f", param_num, data_float[param_num], param_val); #ifdef DEBUG uint8_t tmp = data[param_num]; #endif @@ -445,7 +412,6 @@ void Dexed::setOPs(uint8_t ops) break; } - TRACE("Done: Parameter %d changed from %d to %d", param_num, tmp, data[param_num]); } } */ @@ -455,22 +421,17 @@ uint8_t Dexed::getEngineType() { } void Dexed::setEngineType(uint8_t tp) { - TRACE("settings engine %d", tp); - if (engineType == tp) return; switch (tp) { case DEXED_ENGINE_MARKI: - TRACE("DEXED_ENGINE_MARKI:%d", DEXED_ENGINE_MARKI); controllers.core = engineMkI; break; case DEXED_ENGINE_OPL: - TRACE("DEXED_ENGINE_OPL:%d", DEXED_ENGINE_OPL); controllers.core = engineOpl; break; default: - TRACE("DEXED_ENGINE_MODERN:%d", DEXED_ENGINE_MODERN); controllers.core = engineMsfa; tp = DEXED_ENGINE_MODERN; break; diff --git a/dexed.h b/dexed.h index c7261cd..537fc5e 100644 --- a/dexed.h +++ b/dexed.h @@ -1,22 +1,26 @@ -/** - - Copyright (c) 2013-2015 Pascal Gauthier. - - 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, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ +/* + * MicroDexed + * + * MicroDexed is a port of the Dexed sound engine + * (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield + * + * (c)2018 H. Wirtz + * + * 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, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ #ifndef DEXED_H_INCLUDED #define DEXED_H_INCLUDED diff --git a/dexed_sysex.cpp b/dexed_sysex.cpp new file mode 100644 index 0000000..67de995 --- /dev/null +++ b/dexed_sysex.cpp @@ -0,0 +1,191 @@ +/* + * MicroDexed + * + * MicroDexed is a port of the Dexed sound engine + * (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield + * + * (c)2018 H. Wirtz + * + * 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, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include +#include +#include +#include +#include "dexed.h" +#include "dexed_sysex.h" +#include "config.h" + +void load_sysex(char *name, uint8_t voice_number) +{ + File root; + + if (sd_card_available) + { + root = SD.open("/"); + while (42 == 42) + { + File entry = root.openNextFile(); + if (!entry) + break; + else + { + if (!entry.isDirectory()) + { + if (strcmp(name, entry.name()) == 0) + { + Serial.println(entry.name()); + check_sysex(entry); + load_sysex_voice(entry, voice_number); + entry.close(); + break; + } + entry.close(); + } + } + } + } +} + +bool load_sysex_voice(File sysex, uint8_t voice_number) +{ + File file; + + if (file = SD.open(sysex.name())) + { + uint8_t* p_data = dexed->data; + uint8_t i; + uint8_t tmp; + + dexed->notes_off(); + + file.seek(6 + (voice_number * 128)); + for (i = 0; i < 6; i++) + { + file.read(p_data + (i * 21), 11); // R1, R2, R3, R4, L1, L2, L3, L4, LEV SCL BRK PT, SCL LEFT DEPTH, SCL RGHT DEPTH + tmp = file.read(); + *(p_data + 11 + (i * 21)) = (tmp & 0x3); // SCL LEFT CURVE + *(p_data + 12 + (i * 21)) = (tmp & 0x0c) >> 2; // SCL RGHT CURVE + tmp = file.read(); + *(p_data + 20 + (i * 21)) = (tmp & 0x78) >> 3; // DETUNE + *(p_data + 13 + (i * 21)) = (tmp & 0x07); // RS + tmp = file.read(); + *(p_data + 15 + (i * 21)) = (tmp & 0x1c) >> 2; // KVS + *(p_data + 14 + (i * 21)) = (tmp & 0x03); // AMS + *(p_data + 16 + (i * 21)) = file.read(); // OUTPUT LVL + tmp = file.read(); + *(p_data + 18 + (i * 21)) = (tmp & 0x3e) >> 1; // FREQ_CORSE + *(p_data + 17 + (i * 21)) = (tmp & 0x01); // OP MODE + file.read(p_data + 19 + (i * 21), 1); // FREQ FINE + } + file.read(p_data + 125, 8); // PR1, PR2, PR3, PR4, PL1, PL2, PL3, PL4 + tmp = file.read(); + *(p_data + 134) = (tmp & 0x1f); // ALG + tmp = file.read(); + *(p_data + 136) = (tmp & 0x08) >> 3; // OKS + *(p_data + 135) = (tmp & 0x07); // FB + file.read(p_data + 137, 4); // LFS, LFD, LPMD, LAMD + tmp = file.read(); + *(p_data + 143) = (tmp & 0x30) >> 4; // LFO PITCH MOD SENS + *(p_data + 142) = (tmp & 0x0e) >> 1; // LFO WAV + *(p_data + 141) = (tmp & 0x01); // LFO SYNC + file.read(p_data + 144, 1); // TRNSP + file.read(p_data + 145, 10); // NAME + *(p_data + 155) = 1; // PBEND RANGE + *(p_data + 156) = 0; // PBEND STEP + *(p_data + 157) = 99; // MOD RANGE + *(p_data + 158) = 0; // MOD ASSIGN + *(p_data + 159) = 99; // FOOT CTRL RANGE + *(p_data + 160) = 0; // FOOT CTRL ASSIGN + *(p_data + 161) = 99; // BREATH CTRL RANGE + *(p_data + 162) = 0; // BREATH CTRL ASSIGN + *(p_data + 163) = 99; // AT RANGE + *(p_data + 164) = 0; // AT ASSIGN + *(p_data + 165) = 0; // MASTER TUNE + *(p_data + 166) = 1; // OP1 ENABLE + *(p_data + 167) = 1; // OP2 ENABLE + *(p_data + 168) = 1; // OP3 ENABLE + *(p_data + 169) = 1; // OP4 ENABLE + *(p_data + 170) = 1; // OP5 ENABLE + *(p_data + 171) = 1; // OP6 ENABLE + *(p_data + 172) = MAX_NOTES; + + dexed->setOPs((*(p_data + 166) << 5) | (*(p_data + 167) << 4) | (*(p_data + 168) << 3) | (*(p_data + 166) << 2) | (*(p_data + 170) << 1) | *(p_data + 171)); + dexed->setMaxNotes(*(p_data + 172)); + dexed->doRefreshVoice(); + dexed->activate(); + +#ifdef DEBUG + char voicename[11]; + memset(voicename, 0, sizeof(voicename)); + strncpy(voicename, (char *)&dexed->data[145], sizeof(voicename) - 1); + Serial.print(F("[")); + Serial.print(voicename); + Serial.println(F("]")); +#endif + + return (true); + } + else + return (false); +} + +bool check_sysex(File sysex) +{ + File file; + uint16_t i; + uint32_t calc_checksum = 0; + + if (sysex.size() != 4104) // check sysex size + return (false); + if (file = SD.open(sysex.name())) + { + if (file.read() != 0xf0) // check sysex start-byte + { + Serial.println(F("E: SysEx start byte not found.")); + return (false); + } + if (file.read() != 0x43) // check sysex vendor is Yamaha + { + Serial.println(F("E: SysEx vendor not Yamaha.")); + return (false); + } + file.seek(4103); + if (file.read() != 0xf7) // check sysex end-byte + { + Serial.println(F("E: SysEx end byte not found.")); + return (false); + } + file.seek(3); + if (file.read() != 0x09) // check for sysex type (0x09=32 voices) + { + Serial.println(F("E: SysEx type not 32 voices.")); + return (false); + } + file.seek(6); // start of 32*128 (=4096) bytes data + for (i = 0; i < 4096; i++) + calc_checksum += (file.read() & 0x7F); // calculate checksum + calc_checksum = uint8_t(~calc_checksum + 1); + if (calc_checksum != uint8_t(file.read())) + { + Serial.println(F("E: checksum mismatch.")); + return (false); + } + } + file.close(); + return (true); +} diff --git a/dexed_sysex.h b/dexed_sysex.h new file mode 100644 index 0000000..d22694e --- /dev/null +++ b/dexed_sysex.h @@ -0,0 +1,30 @@ +/* + * MicroDexed + * + * MicroDexed is a port of the Dexed sound engine + * (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield + * + * (c)2018 H. Wirtz + * + * 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, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +extern bool sd_card_available; +extern Dexed* dexed; + +void load_sysex(char *name, uint8_t voice_number); +bool load_sysex_voice(File sysex, uint8_t voice_number); +bool check_sysex(File sysex); diff --git a/fm_core.cpp b/fm_core.cpp index 102e52d..476cd8d 100644 --- a/fm_core.cpp +++ b/fm_core.cpp @@ -78,8 +78,6 @@ uint8_t FmCore::get_carrier_operators(uint8_t algorithm) { if((alg.ops[i]&OUT_BUS_ADD)==OUT_BUS_ADD) op_out|=1<