From e7cb6d1eb0400ee266c56d115cc2a76d16de96e9 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Wed, 7 Jul 2021 15:42:45 +0200 Subject: [PATCH] Now using the external Synth_Dexed library (see folder third_party). --- UI.hpp | 16 +- config.h | 39 - third-party/Synth_Dexed/.gitignore | 88 +++ third-party/Synth_Dexed/LICENSE-APACHE2.txt | 201 ++++++ third-party/Synth_Dexed/LICENSE-GPL3.txt | 674 ++++++++++++++++++ third-party/Synth_Dexed/README.md | 2 + .../Synth_Dexed/examples/synth_dexed.ino | 69 ++ third-party/Synth_Dexed/library.properties | 10 + .../Synth_Dexed/src/synth_dexed.cpp | 460 +++++++++++- .../Synth_Dexed/src/synth_dexed.h | 395 ++++++---- .../Synth_Dexed/src/teensy_board_detection.h | 50 ++ third-party/Synth_Dexed/tools/gen_includes.sh | 26 + third-party/Synth_Dexed/tools/includes.txt | 17 + 13 files changed, 1844 insertions(+), 203 deletions(-) create mode 100644 third-party/Synth_Dexed/.gitignore create mode 100644 third-party/Synth_Dexed/LICENSE-APACHE2.txt create mode 100644 third-party/Synth_Dexed/LICENSE-GPL3.txt create mode 100644 third-party/Synth_Dexed/README.md create mode 100644 third-party/Synth_Dexed/examples/synth_dexed.ino create mode 100644 third-party/Synth_Dexed/library.properties rename synth_dexed.cpp => third-party/Synth_Dexed/src/synth_dexed.cpp (87%) rename synth_dexed.h => third-party/Synth_Dexed/src/synth_dexed.h (81%) create mode 100644 third-party/Synth_Dexed/src/teensy_board_detection.h create mode 100755 third-party/Synth_Dexed/tools/gen_includes.sh create mode 100644 third-party/Synth_Dexed/tools/includes.txt diff --git a/UI.hpp b/UI.hpp index 85bea83..d481c37 100644 --- a/UI.hpp +++ b/UI.hpp @@ -4113,22 +4113,22 @@ void UI_func_volume(uint8_t param) { if (perform_attack_mod[selected_instance_id] == 0) for (uint8_t i = 0; i < 6; i++) { - orig_attack_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getRateOP(i, ATTACK); + orig_attack_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getOPRate(i, ATTACK); } perform_attack_mod[selected_instance_id] = constrain(perform_attack_mod[selected_instance_id] + ENCODER[ENC_L].speed(), -MAX_PERF_MOD, MAX_PERF_MOD); for (uint8_t i = 0; i < 6; i++) - MicroDexed[selected_instance_id]->setRateOP(i, ATTACK, orig_attack_values[selected_instance_id][i] - perform_attack_mod[selected_instance_id] ); + MicroDexed[selected_instance_id]->setOPRate(i, ATTACK, orig_attack_values[selected_instance_id][i] - perform_attack_mod[selected_instance_id] ); } else if (LCDML.BT_checkUp() ) { if (perform_attack_mod[selected_instance_id] == 0) // Save initial Values for (uint8_t i = 0; i < 6; i++) { - orig_attack_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getRateOP(i, ATTACK); + orig_attack_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getOPRate(i, ATTACK); } perform_attack_mod[selected_instance_id] = constrain(perform_attack_mod[selected_instance_id] - ENCODER[ENC_L].speed(), -MAX_PERF_MOD, MAX_PERF_MOD); for (uint8_t i = 0; i < 6; i++) - MicroDexed[selected_instance_id]->setRateOP(i, ATTACK, orig_attack_values[selected_instance_id][i] - perform_attack_mod[selected_instance_id] ); + MicroDexed[selected_instance_id]->setOPRate(i, ATTACK, orig_attack_values[selected_instance_id][i] - perform_attack_mod[selected_instance_id] ); } } @@ -4139,21 +4139,21 @@ void UI_func_volume(uint8_t param) { if (perform_release_mod[selected_instance_id] == 0) // Save initial Values for (uint8_t i = 0; i < 6; i++) { - orig_release_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getRateOP(i, RELEASE); + orig_release_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getOPRate(i, RELEASE); } perform_release_mod[selected_instance_id] = constrain(perform_release_mod[selected_instance_id] + ENCODER[ENC_L].speed(), -MAX_PERF_MOD, MAX_PERF_MOD); for (uint8_t i = 0; i < 6; i++) - MicroDexed[selected_instance_id]->setRateOP(i, RELEASE, orig_release_values[selected_instance_id][i] - perform_release_mod[selected_instance_id] ); + MicroDexed[selected_instance_id]->setOPRate(i, RELEASE, orig_release_values[selected_instance_id][i] - perform_release_mod[selected_instance_id] ); } else if (LCDML.BT_checkUp() ) { if (perform_release_mod[selected_instance_id] == 0) for (uint8_t i = 0; i < 6; i++) { - orig_release_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getRateOP(i, RELEASE); + orig_release_values[selected_instance_id][i] = MicroDexed[selected_instance_id]->getOPRate(i, RELEASE); } perform_release_mod[selected_instance_id] = constrain(perform_release_mod[selected_instance_id] - ENCODER[ENC_L].speed(), -MAX_PERF_MOD, MAX_PERF_MOD); for (uint8_t i = 0; i < 6; i++) - MicroDexed[selected_instance_id]->setRateOP(i, RELEASE, orig_release_values[selected_instance_id][i] - perform_release_mod[selected_instance_id] ); + MicroDexed[selected_instance_id]->setOPRate(i, RELEASE, orig_release_values[selected_instance_id][i] - perform_release_mod[selected_instance_id] ); } } } diff --git a/config.h b/config.h index 3dade09..22ec61b 100644 --- a/config.h +++ b/config.h @@ -305,45 +305,6 @@ #define USBCON 1 #endif -// Teensy-4.x settings -#ifdef TEENSY4 -#define MAX_NOTES 64 -#endif - -// Teensy-3.6 settings -#if defined(TEENSY3_6) -# if defined(USE_FX) -# if F_CPU == 256000000 -# define MAX_NOTES 20 -# elif F_CPU == 240000000 -# define MAX_NOTES 18 -# elif F_CPU == 216000000 -# define MAX_NOTES 16 -# else -# warning >>> You should consider to use 216MHz overclocking to get polyphony of 16 instead 12 voices <<< -# define MAX_NOTES 12 -# endif -# else -# if F_CPU == 256000000 -# define MAX_NOTES 20 -# elif F_CPU == 216000000 -# define MAX_NOTES 20 -# else -# define MAX_NOTES 16 -# endif -# endif -#endif - -#ifdef TEENSY3_5 -#undef MIDI_DEVICE_USB_HOST -#define MAX_NOTES 11 -#undef USE_FX -#endif - -#define TRANSPOSE_FIX 24 -//#define VOICE_SILENCE_LEVEL 1069 -#define VOICE_SILENCE_LEVEL 1100 - // Audio #ifdef TGA_AUDIO_BOARD #endif diff --git a/third-party/Synth_Dexed/.gitignore b/third-party/Synth_Dexed/.gitignore new file mode 100644 index 0000000..7a042f5 --- /dev/null +++ b/third-party/Synth_Dexed/.gitignore @@ -0,0 +1,88 @@ +# ---> C++ +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +# ---> C +# Prerequisites +*.d + +# Object files +*.o +*.ko +*.obj +*.elf + +# Linker output +*.ilk +*.map +*.exp + +# Precompiled Headers +*.gch +*.pch + +# Libraries +*.lib +*.a +*.la +*.lo + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*.i*86 +*.x86_64 +*.hex + +# Debug files +*.dSYM/ +*.su +*.idb +*.pdb + +# Kernel Module Compile Results +*.mod* +*.cmd +.tmp_versions/ +modules.order +Module.symvers +Mkfile.old +dkms.conf + diff --git a/third-party/Synth_Dexed/LICENSE-APACHE2.txt b/third-party/Synth_Dexed/LICENSE-APACHE2.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/third-party/Synth_Dexed/LICENSE-APACHE2.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/third-party/Synth_Dexed/LICENSE-GPL3.txt b/third-party/Synth_Dexed/LICENSE-GPL3.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/third-party/Synth_Dexed/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/third-party/Synth_Dexed/README.md b/third-party/Synth_Dexed/README.md new file mode 100644 index 0000000..bcedf2d --- /dev/null +++ b/third-party/Synth_Dexed/README.md @@ -0,0 +1,2 @@ +# synth_dexed + diff --git a/third-party/Synth_Dexed/examples/synth_dexed.ino b/third-party/Synth_Dexed/examples/synth_dexed.ino new file mode 100644 index 0000000..8f89666 --- /dev/null +++ b/third-party/Synth_Dexed/examples/synth_dexed.ino @@ -0,0 +1,69 @@ +#include +#include "synth_dexed.h" + +uint8_t fmpiano_sysex[156] = { + 95, 29, 20, 50, 99, 95, 00, 00, 41, 00, 19, 00, 00, 03, 00, 06, 79, 00, 01, 00, 14, // OP6 eg_rate_1-4, level_1-4, kbd_lev_scl_brk_pt, kbd_lev_scl_lft_depth, kbd_lev_scl_rht_depth, kbd_lev_scl_lft_curve, kbd_lev_scl_rht_curve, kbd_rate_scaling, amp_mod_sensitivity, key_vel_sensitivity, operator_output_level, osc_mode, osc_freq_coarse, osc_freq_fine, osc_detune + 95, 20, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 00, 99, 00, 01, 00, 00, // OP5 + 95, 29, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 06, 89, 00, 01, 00, 07, // OP4 + 95, 20, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 02, 99, 00, 01, 00, 07, // OP3 + 95, 50, 35, 78, 99, 75, 00, 00, 00, 00, 00, 00, 00, 03, 00, 07, 58, 00, 14, 00, 07, // OP2 + 96, 25, 25, 67, 99, 75, 00, 00, 00, 00, 00, 00, 00, 03, 00, 02, 99, 00, 01, 00, 10, // OP1 + 94, 67, 95, 60, 50, 50, 50, 50, // 4 * pitch EG rates, 4 * pitch EG level + 04, 06, 00, // algorithm, feedback, osc sync + 34, 33, 00, 00, 00, 04, // lfo speed, lfo delay, lfo pitch_mod_depth, lfo_amp_mod_depth, lfo_sync, lfo_waveform + 03, 24, // pitch_mod_sensitivity, transpose + 70, 77, 45, 80, 73, 65, 78, 79, 00, 00 // 10 * char for name ("DEFAULT ") +}; // FM-Piano + +AudioSynthDexed dexed(SAMPLE_RATE); +AudioOutputI2S i2s1; +AudioControlSGTL5000 sgtl5000_1; +AudioConnection patchCord1(dexed, 0, i2s1, 0); +AudioConnection patchCord2(dexed, 0, i2s1, 1); + +void setup() +{ + AudioMemory(32); + + sgtl5000_1.enable(); + sgtl5000_1.lineOutLevel(29); + sgtl5000_1.dacVolumeRamp(); + sgtl5000_1.dacVolume(1.0); + sgtl5000_1.unmuteHeadphone(); + sgtl5000_1.unmuteLineout(); + sgtl5000_1.volume(0.8, 0.8); // Headphone volume +} + +void loop() +{ + static uint8_t count; + + if (count % 2 == 0) + { + dexed.loadInitVoice(); + } + else + { + dexed.loadVoiceParameters(fmpiano_sysex); + dexed.setTranspose(36); + } + + Serial.println("Key-Down"); + dexed.keydown(48, 100); + delay(100); + dexed.keydown(52, 100); + delay(100); + dexed.keydown(55, 100); + delay(100); + dexed.keydown(60, 100); + delay(2000); + + Serial.println("Key-Up"); + dexed.keyup(48); + dexed.keyup(52); + dexed.keyup(55); + dexed.keyup(60); + delay(2000); + + count++; +} diff --git a/third-party/Synth_Dexed/library.properties b/third-party/Synth_Dexed/library.properties new file mode 100644 index 0000000..2352ae8 --- /dev/null +++ b/third-party/Synth_Dexed/library.properties @@ -0,0 +1,10 @@ +name=Synth_Dexed +version=1.0 +author=Holger Wirtz +maintainer= +sentence=Six Operator FM synth object for Teensy audio library +paragraph=This library is the extraction of the Dexed FM sound engine from https://github.com/asb2m10/dexed +category=Audio +url=https://www.parasitstudio.de +architectures=teensy,avr +license=APACHE2,GPL3 diff --git a/synth_dexed.cpp b/third-party/Synth_Dexed/src/synth_dexed.cpp similarity index 87% rename from synth_dexed.cpp rename to third-party/Synth_Dexed/src/synth_dexed.cpp index f57ec2d..fee2581 100644 --- a/synth_dexed.cpp +++ b/third-party/Synth_Dexed/src/synth_dexed.cpp @@ -1,5 +1,30 @@ #include "synth_dexed.h" +/* + synth_dexed + + synth_dexed is a port of the Dexed sound engine (https://github.com/asb2m10/dexed) + as library for the Teensy-3.5/3.6/4.x with an audio shield. + Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android + + (c)2018-2021 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 + +*/ + /** Copyright (c) 2013-2014 Pascal Gauthier. @@ -47,9 +72,9 @@ inline static float tptlpupw(float & state , float inp , float cutoff , float sr // return (param) * (max - min) + min; //} -static float logsc(float param, const float min, const float max, const float rolloff = 19.0f) { - return ((EXP_FUNC(param * LOG_FUNC(rolloff + 1)) - 1.0f) / (rolloff)) * (max - min) + min; -} +// static float logsc(float param, const float min, const float max, const float rolloff = 19.0f) { +// return ((EXP_FUNC(param * LOG_FUNC(rolloff + 1)) - 1.0f) / (rolloff)) * (max - min) + min; +// } PluginFx::PluginFx() { Cutoff = 1.0; @@ -257,7 +282,7 @@ float PluginFx::getGain(void) */ -extern config_t configuration; +//extern config_t configuration; Dexed::Dexed(int rate) { @@ -276,6 +301,8 @@ Dexed::Dexed(int rate) engineMsfa = new FmCore; + loadInitVoice(); + for (i = 0; i < MAX_ACTIVE_NOTES; i++) { voices[i].dx7_note = new Dx7Note; @@ -290,7 +317,6 @@ Dexed::Dexed(int rate) resetControllers(); controllers.masterTune = 0; controllers.opSwitch = 0x3f; // enable all operators - //controllers.opSwitch=0x00; lastKeyDown = -1; vuSignal = 0.0; controllers.core = engineMsfa; @@ -853,6 +879,11 @@ bool Dexed::loadVoiceParameters(uint8_t* new_data) return (true); } +void Dexed::loadInitVoice(void) +{ + loadVoiceParameters(init_voice); +} + void Dexed::setPBController(uint8_t pb_range, uint8_t pb_step) { #ifdef DEBUG @@ -951,7 +982,42 @@ void Dexed::setPortamentoMode(uint8_t portamento_mode, uint8_t portamento_glissa controllers.refresh(); } -void Dexed::setRateAllOP(uint8_t rate) +void AudioSynthDexed::update(void) + { + if (in_update == true) + { + xrun++; + return; + } + else + in_update = true; + + elapsedMicros render_time; + audio_block_t *lblock; + + lblock = allocate(); + + if (!lblock) + { + in_update = false; + return; + } + + getSamples(AUDIO_BLOCK_SAMPLES, lblock->data); + + if (render_time > audio_block_time_us) // everything greater audio_block_time_us (2.9ms for buffer size of 128) is a buffer underrun! + xrun++; + + if (render_time > render_time_max) + render_time_max = render_time; + + transmit(lblock, 0); + release(lblock); + + in_update = false; + }; + +void AudioSynthDexed::setOPRateAll(uint8_t rate) { rate = constrain(rate, 0, 99); @@ -964,7 +1030,7 @@ void Dexed::setRateAllOP(uint8_t rate) } } -void Dexed::setLevelAllOP(uint8_t level) +void AudioSynthDexed::setOPLevelAll(uint8_t level) { level = constrain(level, 0, 99); @@ -977,7 +1043,7 @@ void Dexed::setLevelAllOP(uint8_t level) } } -void Dexed::setRateOPAllModulator(uint8_t step, uint8_t rate) +void AudioSynthDexed::setOPRateAllModulator(uint8_t step, uint8_t rate) { uint8_t op_carrier = controllers.core->get_carrier_operators(data[134]); // look for carriers @@ -991,7 +1057,7 @@ void Dexed::setRateOPAllModulator(uint8_t step, uint8_t rate) } } -void Dexed::setLevelOPAllModulator(uint8_t step, uint8_t level) +void AudioSynthDexed::setOPLevelAllModulator(uint8_t step, uint8_t level) { uint8_t op_carrier = controllers.core->get_carrier_operators(data[134]); // look for carriers @@ -1005,7 +1071,7 @@ void Dexed::setLevelOPAllModulator(uint8_t step, uint8_t level) } } -void Dexed::setRateOPAllCarrier(uint8_t step, uint8_t rate) +void AudioSynthDexed::setOPRateAllCarrier(uint8_t step, uint8_t rate) { uint8_t op_carrier = controllers.core->get_carrier_operators(data[134]); // look for carriers @@ -1019,7 +1085,7 @@ void Dexed::setRateOPAllCarrier(uint8_t step, uint8_t rate) } } -void Dexed::setLevelOPAllCarrier(uint8_t step, uint8_t level) +void AudioSynthDexed::setOPLevelAllCarrier(uint8_t step, uint8_t level) { uint8_t op_carrier = controllers.core->get_carrier_operators(data[134]); // look for carriers @@ -1033,7 +1099,7 @@ void Dexed::setLevelOPAllCarrier(uint8_t step, uint8_t level) } } -void Dexed::setRateOP(uint8_t op, uint8_t step, uint8_t rate) +void AudioSynthDexed::setOPRate(uint8_t op, uint8_t step, uint8_t rate) { op = constrain(op, 0, 5); step = constrain(step, 0, 3); @@ -1042,7 +1108,15 @@ void Dexed::setRateOP(uint8_t op, uint8_t step, uint8_t rate) data[(op * 21) + DEXED_OP_EG_R1 + step] = rate; } -void Dexed::setLevelOP(uint8_t op, uint8_t step, uint8_t level) +uint8_t AudioSynthDexed::getOPRate(uint8_t op, uint8_t step) +{ + op = constrain(op, 0, 5); + step = constrain(step, 0, 3); + + return (data[(op * 21) + DEXED_OP_EG_R1 + step]); +} + +void AudioSynthDexed::setOPLevel(uint8_t op, uint8_t step, uint8_t level) { op = constrain(op, 0, 5); step = constrain(step, 0, 3); @@ -1051,23 +1125,375 @@ void Dexed::setLevelOP(uint8_t op, uint8_t step, uint8_t level) data[(op * 21) + DEXED_OP_EG_L1 + step] = level; } -uint8_t Dexed::getRateOP(uint8_t op, uint8_t step) +uint8_t AudioSynthDexed::getOPLevel(uint8_t op, uint8_t step) { op = constrain(op, 0, 5); step = constrain(step, 0, 3); - return (data[(op * 21) + DEXED_OP_EG_R1 + step]); + return (data[(op * 21) + DEXED_OP_EG_L1 + step]); +} + +void AudioSynthDexed::setOPKeyboardLevelScalingBreakPoint(uint8_t op, uint8_t level) +{ + op = constrain(op, 0, 5); + level = constrain(level, 0, 99); + + data[(op * 21) + DEXED_OP_LEV_SCL_BRK_PT] = level; +} + +uint8_t AudioSynthDexed::getOPKeyboardLevelScalingBreakPoint(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_LEV_SCL_BRK_PT]); +} + +void AudioSynthDexed::setOPKeyboardLevelScalingDepthLeft(uint8_t op, uint8_t depth) +{ + op = constrain(op, 0, 5); + depth = constrain(depth, 0, 99); + + data[(op * 21) + DEXED_OP_SCL_LEFT_DEPTH] = depth; +} + +uint8_t AudioSynthDexed::getOPKeyboardLevelScalingDepthLeft(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_SCL_LEFT_DEPTH]); +} + +void AudioSynthDexed::setOPKeyboardLevelScalingDepthRight(uint8_t op, uint8_t depth) +{ + op = constrain(op, 0, 5); + depth = constrain(depth, 0, 99); + + data[(op * 21) + DEXED_OP_SCL_RGHT_DEPTH] = depth; +} + +uint8_t AudioSynthDexed::getOPKeyboardLevelScalingDepthRight(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_SCL_RGHT_DEPTH]); +} + +void AudioSynthDexed::setOPKeyboardLevelScalingCurveLeft(uint8_t op, uint8_t curve) +{ + op = constrain(op, 0, 5); + curve = constrain(curve, 0, 3); + + data[(op * 21) + DEXED_OP_SCL_LEFT_CURVE] = curve; +} + +uint8_t AudioSynthDexed::getOPKeyboardLevelScalingCurveLeft(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_SCL_LEFT_CURVE]); +} + +void AudioSynthDexed::setOPKeyboardLevelScalingCurveRight(uint8_t op, uint8_t curve) +{ + op = constrain(op, 0, 5); + curve = constrain(curve, 0, 3); + + data[(op * 21) + DEXED_OP_SCL_RGHT_CURVE] = curve; +} + +uint8_t AudioSynthDexed::getOPKeyboardLevelScalingCurveRight(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_SCL_RGHT_CURVE]); +} + +void AudioSynthDexed::setOPKeyboardRateScale(uint8_t op, uint8_t scale) +{ + op = constrain(op, 0, 5); + scale = constrain(scale, 0, 7); + + data[(op * 21) + DEXED_OP_OSC_RATE_SCALE] = scale; +} + +uint8_t AudioSynthDexed::getOPKeyboardRateScale(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_OSC_RATE_SCALE]); +} + +void AudioSynthDexed::setOPAmpModulationSensity(uint8_t op, uint8_t sensitivity) +{ + op = constrain(op, 0, 5); + sensitivity = constrain(sensitivity, 0, 3); + + data[(op * 21) + DEXED_OP_AMP_MOD_SENS] = sensitivity; +} + +uint8_t AudioSynthDexed::getOPAmpModulationSensity(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_AMP_MOD_SENS]); +} + +void AudioSynthDexed::setOPKeyboardVelocitySensity(uint8_t op, uint8_t sensitivity) +{ + op = constrain(op, 0, 5); + sensitivity = constrain(sensitivity, 0, 7); + + data[(op * 21) + DEXED_OP_KEY_VEL_SENS] = sensitivity; +} + +uint8_t AudioSynthDexed::getOPKeyboardVelocitySensity(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_KEY_VEL_SENS]); +} + +void AudioSynthDexed::setOPOutputLevel(uint8_t op, uint8_t level) +{ + op = constrain(op, 0, 5); + level = constrain(level, 0, 99); + + data[(op * 21) + DEXED_OP_OUTPUT_LEV] = level; } -uint8_t Dexed::getLevelOP(uint8_t op, uint8_t step) +uint8_t AudioSynthDexed::getOPOutputLevel(uint8_t op) { op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_OUTPUT_LEV]); +} + +void AudioSynthDexed::setOPMode(uint8_t op, uint8_t mode) +{ + op = constrain(op, 0, 5); + mode = constrain(mode, 0, 1); + + data[(op * 21) + DEXED_OP_OSC_MODE] = mode; +} + +uint8_t AudioSynthDexed::getOPMode(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_OSC_MODE]); +} + +void AudioSynthDexed::setOPFrequencyCoarse(uint8_t op, uint8_t frq_coarse) +{ + op = constrain(op, 0, 5); + frq_coarse = constrain(frq_coarse, 0, 31); + + data[(op * 21) + DEXED_OP_FREQ_COARSE] = frq_coarse; +} + +uint8_t AudioSynthDexed::getOPFrequencyCoarse(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_FREQ_COARSE ]); +} + +void AudioSynthDexed::setOPFrequencyFine(uint8_t op, uint8_t frq_fine) +{ + op = constrain(op, 0, 5); + frq_fine = constrain(frq_fine, 0, 99); + + data[(op * 21) + DEXED_OP_FREQ_FINE] = frq_fine; +} + +uint8_t AudioSynthDexed::getOPFrequencyFine(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_FREQ_FINE]); +} + +void AudioSynthDexed::setOPDetune(uint8_t op, uint8_t detune) +{ + op = constrain(op, 0, 5); + detune = constrain(detune, 0, 14); + + data[(op * 21) + DEXED_OP_OSC_DETUNE] = detune; +} + +uint8_t AudioSynthDexed::getOPDetune(uint8_t op) +{ + op = constrain(op, 0, 5); + + return (data[(op * 21) + DEXED_OP_OSC_DETUNE]); +} + +void AudioSynthDexed::setPitchRate(uint8_t step, uint8_t rate) +{ step = constrain(step, 0, 3); + rate = constrain(rate, 0, 99); - return (data[(op * 21) + DEXED_OP_EG_L1 + step]); + data[DEXED_VOICE_OFFSET + DEXED_PITCH_EG_R1 + step] = rate; +} + +uint8_t AudioSynthDexed::getPitchRate(uint8_t step) +{ + step = constrain(step, 0, 3); + + return (data[DEXED_VOICE_OFFSET + DEXED_PITCH_EG_R1 + step]); +} + +void AudioSynthDexed::setPitchLevel(uint8_t step, uint8_t level) +{ + step = constrain(step, 0, 3); + level = constrain(level, 0, 99); + + data[DEXED_VOICE_OFFSET + DEXED_PITCH_EG_L1 + step] = level; +} + +uint8_t AudioSynthDexed::getPitchLevel(uint8_t step) +{ + step = constrain(step, 0, 3); + + return (data[DEXED_VOICE_OFFSET + DEXED_PITCH_EG_L1 + step]); +} + +void AudioSynthDexed::setAlgorithm(uint8_t algorithm) +{ + algorithm = constrain(algorithm, 0, 31); + + data[DEXED_VOICE_OFFSET + DEXED_ALGORITHM] = algorithm; +} + +uint8_t AudioSynthDexed::getAlgorithm(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_ALGORITHM]); +} + +void AudioSynthDexed::setFeedback(uint8_t feedback) +{ + feedback = constrain(feedback, 0, 31); + + data[DEXED_VOICE_OFFSET + DEXED_FEEDBACK] = feedback; +} + +uint8_t AudioSynthDexed::getFeedback(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_FEEDBACK]); +} + +void AudioSynthDexed::setOscillatorSync(bool sync) +{ + data[DEXED_VOICE_OFFSET + DEXED_OSC_KEY_SYNC] = sync; +} + +bool AudioSynthDexed::getOscillatorSync(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_OSC_KEY_SYNC]); +} + +void AudioSynthDexed::setLFOSpeed(uint8_t speed) +{ + speed = constrain(speed, 0, 99); + + data[DEXED_VOICE_OFFSET + DEXED_LFO_SPEED] = speed; +} + +uint8_t AudioSynthDexed::getLFOSpeed(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_LFO_SPEED]); +} + +void AudioSynthDexed::setLFODelay(uint8_t delay) +{ + delay = constrain(delay, 0, 99); + + data[DEXED_VOICE_OFFSET + DEXED_LFO_DELAY] = delay; +} + +uint8_t AudioSynthDexed::getLFODelay(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_LFO_DELAY]); +} + +void AudioSynthDexed::setLFOPitchModulationDepth(uint8_t depth) +{ + depth = constrain(depth, 0, 99); + + data[DEXED_VOICE_OFFSET + DEXED_LFO_PITCH_MOD_DEP] = depth; +} +uint8_t AudioSynthDexed::getLFOPitchModulationDepth(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_LFO_PITCH_MOD_DEP]); +} + +void AudioSynthDexed::setLFOAmpModulationDepth(uint8_t depth) +{ + depth = constrain(depth, 0, 99); + + data[DEXED_VOICE_OFFSET + DEXED_LFO_AMP_MOD_DEP] = depth; +} + +uint8_t AudioSynthDexed::getLFOAmpModulationDepth(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_LFO_AMP_MOD_DEP]); +} + +void AudioSynthDexed::setLFOSync(bool sync) +{ + data[DEXED_VOICE_OFFSET + DEXED_LFO_SYNC] = sync; +} + +bool AudioSynthDexed::getLFOSync(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_LFO_SYNC]); +} + +void AudioSynthDexed::setLFOWaveform(uint8_t waveform) +{ + waveform = constrain(waveform, 0, 5); + + data[DEXED_VOICE_OFFSET + DEXED_LFO_WAVE] = waveform; } +uint8_t AudioSynthDexed::getLFOWaveform(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_LFO_WAVE]); +} + +void AudioSynthDexed::setLFOPitchModulationSensitivity(uint8_t sensitivity) +{ + sensitivity = constrain(sensitivity, 0, 5); + data[DEXED_VOICE_OFFSET + DEXED_LFO_PITCH_MOD_SENS] = sensitivity; +} + +uint8_t AudioSynthDexed::getLFOPitchModulationSensitivity(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_LFO_PITCH_MOD_SENS]); +} + +void AudioSynthDexed::setTranspose(uint8_t transpose) +{ + transpose = constrain(transpose, 0, 48); + + data[DEXED_VOICE_OFFSET + DEXED_TRANSPOSE] = transpose; +} + +uint8_t AudioSynthDexed::getTranspose(void) +{ + return (data[DEXED_VOICE_OFFSET + DEXED_TRANSPOSE]); +} + +void AudioSynthDexed::setName(char* name) +{ + strncpy(name, (char*)&data[DEXED_VOICE_OFFSET + DEXED_NAME], 10); +} + +void AudioSynthDexed::getName(char* buffer) +{ + strncpy((char*)&data[DEXED_VOICE_OFFSET + DEXED_NAME], buffer, 10); +} /* // https://www.musicdsp.org/en/latest/Effects/169-compressor.html# diff --git a/synth_dexed.h b/third-party/Synth_Dexed/src/synth_dexed.h similarity index 81% rename from synth_dexed.h rename to third-party/Synth_Dexed/src/synth_dexed.h index 9a56761..9359ff9 100644 --- a/synth_dexed.h +++ b/third-party/Synth_Dexed/src/synth_dexed.h @@ -1,6 +1,132 @@ +/* + synth_dexed + + synth_dexed is a port of the Dexed sound engine (https://github.com/asb2m10/dexed) + as library for the Teensy-3.5/3.6/4.x with an audio shield. + Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android + + (c)2018-2021 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 + +*/ + +#pragma once + #include #include -#include "config.h" +#include "teensy_board_detection.h" + +#define SYNTH_DEXED_VERSION "1.0.0" +#define DEBUG 1 +#define SAMPLE_RATE 44100 + +#define MIDI_CONTROLLER_MODE_MAX 2 +#define TRANSPOSE_FIX 24 +#define VOICE_SILENCE_LEVEL 1100 + +// Teensy-4.x settings +#ifdef TEENSY4 +#define MAX_NOTES 32 +#endif + +// Teensy-3.6 settings +#if defined(TEENSY3_6) +# if defined(USE_FX) +# if F_CPU == 256000000 +# define MAX_NOTES 20 +# elif F_CPU == 240000000 +# define MAX_NOTES 18 +# elif F_CPU == 216000000 +# define MAX_NOTES 16 +# else +# warning >>> You should consider to use 216MHz overclocking to get polyphony of 16 instead 12 voices <<< +# define MAX_NOTES 12 +# endif +# else +# if F_CPU == 256000000 +# define MAX_NOTES 20 +# elif F_CPU == 216000000 +# define MAX_NOTES 20 +# else +# define MAX_NOTES 16 +# endif +# endif +#endif + +#ifdef TEENSY3_5 +#undef MIDI_DEVICE_USB_HOST +#define MAX_NOTES 11 +#undef USE_FX +#endif + +#define PB_RANGE_MIN 0 +#define PB_RANGE_MAX 12 +#define PB_RANGE_DEFAULT 1 + +#define PB_STEP_MIN 0 +#define PB_STEP_MAX 12 +#define PB_STEP_DEFAULT 0 + +#define MW_RANGE_MIN 0 +#define MW_RANGE_MAX 99 +#define MW_RANGE_DEFAULT 50 + +#define MW_ASSIGN_MIN 0 +#define MW_ASSIGN_MAX 7 +#define MW_ASSIGN_DEFAULT 0 // Bitmapped: 0: Pitch, 1: Amp, 2: Bias + +#define MW_MODE_MIN 0 +#define MW_MODE_MAX MIDI_CONTROLLER_MODE_MAX +#define MW_MODE_DEFAULT 0 + +#define FC_RANGE_MIN 0 +#define FC_RANGE_MAX 99 +#define FC_RANGE_DEFAULT 50 + +#define FC_ASSIGN_MIN 0 +#define FC_ASSIGN_MAX 7 +#define FC_ASSIGN_DEFAULT 0 // Bitmapped: 0: Pitch, 1: Amp, 2: Bias + +#define FC_MODE_MIN 0 +#define FC_MODE_MAX MIDI_CONTROLLER_MODE_MAX +#define FC_MODE_DEFAULT 0 + +#define BC_RANGE_MIN 0 +#define BC_RANGE_MAX 99 +#define BC_RANGE_DEFAULT 50 + +#define BC_ASSIGN_MIN 0 +#define BC_ASSIGN_MAX 7 +#define BC_ASSIGN_DEFAULT 0 // Bitmapped: 0: Pitch, 1: Amp, 2: Bias + +#define BC_MODE_MIN 0 +#define BC_MODE_MAX MIDI_CONTROLLER_MODE_MAX +#define BC_MODE_DEFAULT 0 + +#define AT_RANGE_MIN 0 +#define AT_RANGE_MAX 99 +#define AT_RANGE_DEFAULT 50 + +#define AT_ASSIGN_MIN 0 +#define AT_ASSIGN_MAX 7 +#define AT_ASSIGN_DEFAULT 0 // Bitmapped: 0: Pitch, 1: Amp, 2: Bias + +#define AT_MODE_MIN 0 +#define AT_MODE_MAX MIDI_CONTROLLER_MODE_MAX +#define AT_MODE_DEFAULT 0 /***************************************************** CODE: orig_code/synth.h @@ -21,37 +147,9 @@ limitations under the License. */ -//#define SUPER_PRECISE - -// This IS not be present on MSVC. -// See http://stackoverflow.com/questions/126279/c99-stdint-h-header-and-ms-visual-studio -#ifdef _MSC_VER -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int16 SInt16; -#endif - #define LG_N 6 #define _N_ (1 << LG_N) -#if defined(__APPLE__) -#include -#define SynthMemoryBarrier() OSMemoryBarrier() -#elif defined(__GNUC__) -#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) -#define SynthMemoryBarrier() __sync_synchronize() -#endif -#endif - - -// #undef SynthMemoryBarrier() - -#ifndef SynthMemoryBarrier -// need to understand why this must be defined -// #warning Memory barrier is not enabled -#define SynthMemoryBarrier() -#endif - template inline static T min(const T& a, const T& b) { return a < b ? a : b; @@ -74,7 +172,6 @@ inline static T max(const T& a, const T& b) { #define SQRT_FUNC sqrtf // #define ARM_SQRT_FUNC arm_sqrt_f32 // fast but not as accurate - //===================================================== /***************************************************** CODE: orig_code/aligned_buf.h @@ -865,8 +962,6 @@ class FmCore { // It will continue to evolve a bit, as note-stealing logic, scaling, // and real-time control of parameters live here. -#pragma once - struct VoiceStatus { uint32_t amp[6]; char ampStep[6]; @@ -917,6 +1012,32 @@ class Dx7Note { int32_t porta_curpitch_[6]; }; +//===================================================== +/***************************************************** + CODE: orig_code/porta.h + *****************************************************/ +/* + Copyright 2019 Jean Pierre Cimalando. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +struct Porta { + public: + static void init_sr(double sampleRate); + static int32_t rates[128]; +}; + //===================================================== /***************************************************** CODE: orig_code/dexed.h @@ -1013,12 +1134,12 @@ enum ADSR { }; enum OPERATORS { - OP1, - OP2, - OP3, - OP4, - OP5, - OP6 + OP1, + OP2, + OP3, + OP4, + OP5, + OP6 }; /* #define DEXED_GLOBAL_PARAMETER_OFFSET 155 @@ -1055,15 +1176,13 @@ class Dexed public: Dexed(int rate); ~Dexed(); + + // Global methods void activate(void); void deactivate(void); bool isMonoMode(void); void setMonoMode(bool mode); void setRefreshMode(bool mode); - //void getSamples(uint16_t n_samples, int16_t* buffer); - void panic(void); - void notesOff(void); - void resetControllers(void); void setMaxNotes(uint8_t n); uint8_t getMaxNotes(void); void doRefreshVoice(void); @@ -1071,14 +1190,20 @@ class Dexed bool decodeVoice(uint8_t* encoded_data, uint8_t* data); bool encodeVoice(uint8_t* encoded_data); bool getVoiceData(uint8_t* data_copy); + void loadInitVoice(void); bool loadVoiceParameters(uint8_t* data); bool loadGlobalParameters(uint8_t* data); bool initGlobalParameters(void); + uint8_t getNumNotesPlaying(void); + + // Sound methods void keyup(int16_t pitch); void keydown(int16_t pitch, uint8_t velo); void setSustain(bool sustain); bool getSustain(void); - uint8_t getNumNotesPlaying(void); + void panic(void); + void notesOff(void); + void resetControllers(void); void setPBController(uint8_t pb_range, uint8_t pb_step); void setMWController(uint8_t mw_range, uint8_t mw_assign, uint8_t mw_mode); void setFCController(uint8_t fc_range, uint8_t fc_assign, uint8_t fc_mode); @@ -1086,39 +1211,28 @@ class Dexed void setATController(uint8_t at_range, uint8_t at_assign, uint8_t at_mode); void setPortamentoMode(uint8_t portamento_mode, uint8_t portamento_glissando, uint8_t portamento_time); - void setRateAllOP(uint8_t rate); - void setLevelAllOP(uint8_t level); - void setRateOPAllCarrier(uint8_t step, uint8_t rate); - void setLevelOPAllCarrier(uint8_t step, uint8_t level); - void setRateOPAllModulator(uint8_t step, uint8_t rate); - void setLevelOPAllModulator(uint8_t step, uint8_t level); - void setRateOP(uint8_t op, uint8_t step, uint8_t rate); - void setLevelOP(uint8_t op, uint8_t step, uint8_t level); - uint8_t getRateOP(uint8_t op, uint8_t step); - uint8_t getLevelOP(uint8_t op, uint8_t step); - - - ProcessorVoice voices[MAX_NOTES]; + uint8_t init_voice[156] = { + 99, 99, 99, 99, 99, 99, 99, 00, 33, 00, 00, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, // OP6 eg_rate_1-4, level_1-4, kbd_lev_scl_brk_pt, kbd_lev_scl_lft_depth, kbd_lev_scl_rht_depth, kbd_lev_scl_lft_curve, kbd_lev_scl_rht_curve, kbd_rate_scaling, amp_mod_sensitivity, key_vel_sensitivity, operator_output_level, osc_mode, osc_freq_coarse, osc_freq_fine, osc_detune + 99, 99, 99, 99, 99, 99, 99, 00, 33, 00, 00, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, // OP5 + 99, 99, 99, 99, 99, 99, 99, 00, 33, 00, 00, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, // OP4 + 99, 99, 99, 99, 99, 99, 99, 00, 33, 00, 00, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, // OP4 + 99, 99, 99, 99, 99, 99, 99, 00, 33, 00, 00, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, // OP4 + 99, 99, 99, 99, 99, 99, 99, 00, 33, 00, 00, 00, 00, 00, 00, 00, 99, 00, 01, 00, 00, // OP4 + 99, 99, 99, 99, 50, 50, 50, 50, // 4 * pitch EG rates, 4 * pitch EG level + 01, 00, 01, // algorithm, feedback, osc sync + 35, 00, 00, 00, 01, 00, // lfo speed, lfo delay, lfo pitch_mod_depth, lfo_amp_mod_depth, lfo_sync, lfo_waveform + 03, 48, // pitch_mod_sensitivity, transpose + 73, 78, 73, 84, 32, 86, 79, 73, 67, 69 // 10 * char for name ("INIT VOICE") + }; // INIT + uint8_t data[156]; + uint16_t render_time_max = 0; Controllers controllers; PluginFx fx; - - uint8_t data[156] = { - 95, 29, 20, 50, 99, 95, 00, 00, 41, 00, 19, 00, 00, 03, 00, 06, 79, 00, 01, 00, 14, // OP6 eg_rate_1-4, level_1-4, kbd_lev_scl_brk_pt, kbd_lev_scl_lft_depth, kbd_lev_scl_rht_depth, kbd_lev_scl_lft_curve, kbd_lev_scl_rht_curve, kbd_rate_scaling, amp_mod_sensitivity, key_vel_sensitivity, operator_output_level, osc_mode, osc_freq_coarse, osc_freq_fine, osc_detune - 95, 20, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 00, 99, 00, 01, 00, 00, // OP5 - 95, 29, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 06, 89, 00, 01, 00, 07, // OP4 - 95, 20, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 02, 99, 00, 01, 00, 07, // OP3 - 95, 50, 35, 78, 99, 75, 00, 00, 00, 00, 00, 00, 00, 03, 00, 07, 58, 00, 14, 00, 07, // OP2 - 96, 25, 25, 67, 99, 75, 00, 00, 00, 00, 00, 00, 00, 03, 00, 02, 99, 00, 01, 00, 10, // OP1 - 94, 67, 95, 60, 50, 50, 50, 50, // 4 * pitch EG rates, 4 * pitch EG level - 04, 06, 00, // algorithm, feedback, osc sync - 34, 33, 00, 00, 00, 04, // lfo speed, lfo delay, lfo pitch_mod_depth, lfo_amp_mod_depth, lfo_sync, lfo_waveform - 03, 24, // pitch_mod_sensitivity, transpose - 69, 68, 80, 56, 85, 76, 84, 00, 00, 00 // 10 * char for name ("DEFAULT ") - }; // FM-Piano - - int lastKeyDown; + ProcessorVoice voices[MAX_NOTES]; + uint32_t xrun = 0; protected: + int lastKeyDown; static const uint8_t MAX_ACTIVE_NOTES = MAX_NOTES; uint8_t max_notes = MAX_ACTIVE_NOTES; int16_t currentNote; @@ -1131,85 +1245,88 @@ class Dexed VoiceStatus voiceStatus; Lfo lfo; FmCore* engineMsfa; - void getSamples(uint16_t n_samples, float32_t* buffer); void getSamples(uint16_t n_samples, int16_t* buffer); }; -//===================================================== -/***************************************************** - CODE: orig_code/porta.h - *****************************************************/ -/* - Copyright 2019 Jean Pierre Cimalando. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -struct Porta { - public: - static void init_sr(double sampleRate); - static int32_t rates[128]; -}; - - //===================================================== /***************************************************** CODE: orig_code/synth_microdexed.h *****************************************************/ -class AudioSynthDexed : public AudioStream, public Dexed { +class AudioSynthDexed : public AudioStream, public Dexed +{ public: - const uint16_t audio_block_time_us = 1000000 / (SAMPLE_RATE / AUDIO_BLOCK_SAMPLES); - uint32_t xrun = 0; - uint16_t render_time_max = 0; AudioSynthDexed(uint16_t sample_rate) : AudioStream(0, NULL), Dexed(sample_rate) { }; - void update(void) - { - if (in_update == true) - { - xrun++; - return; - } - else - in_update = true; - - elapsedMicros render_time; - audio_block_t *lblock; - - lblock = allocate(); - - if (!lblock) - { - in_update = false; - return; - } - - getSamples(AUDIO_BLOCK_SAMPLES, lblock->data); - - if (render_time > audio_block_time_us) // everything greater audio_block_time_us (2.9ms for buffer size of 128) is a buffer underrun! - xrun++; - - if (render_time > render_time_max) - render_time_max = render_time; - - transmit(lblock, 0); - release(lblock); + // Voice configuration methods + void setOPRateAll(uint8_t rate); + void setOPLevelAll(uint8_t level); + void setOPRateAllCarrier(uint8_t step, uint8_t rate); + void setOPLevelAllCarrier(uint8_t step, uint8_t level); + void setOPRateAllModulator(uint8_t step, uint8_t rate); + void setOPLevelAllModulator(uint8_t step, uint8_t level); + void setOPRate(uint8_t op, uint8_t step, uint8_t rate); + uint8_t getOPRate(uint8_t op, uint8_t step); + void setOPLevel(uint8_t op, uint8_t step, uint8_t level); + uint8_t getOPLevel(uint8_t op, uint8_t step); + void setOPKeyboardLevelScalingBreakPoint(uint8_t op, uint8_t level); + uint8_t getOPKeyboardLevelScalingBreakPoint(uint8_t op); + void setOPKeyboardLevelScalingDepthLeft(uint8_t op, uint8_t depth); + uint8_t getOPKeyboardLevelScalingDepthLeft(uint8_t op); + void setOPKeyboardLevelScalingDepthRight(uint8_t op, uint8_t depth); + uint8_t getOPKeyboardLevelScalingDepthRight(uint8_t op); + void setOPKeyboardLevelScalingCurveLeft(uint8_t op, uint8_t curve); + uint8_t getOPKeyboardLevelScalingCurveLeft(uint8_t op); + void setOPKeyboardLevelScalingCurveRight(uint8_t op, uint8_t curve); + uint8_t getOPKeyboardLevelScalingCurveRight(uint8_t op); + void setOPKeyboardRateScale(uint8_t op, uint8_t scale); + uint8_t getOPKeyboardRateScale(uint8_t op); + void setOPAmpModulationSensity(uint8_t op, uint8_t sensitivity); + uint8_t getOPAmpModulationSensity(uint8_t op); + void setOPKeyboardVelocitySensity(uint8_t op, uint8_t sensitivity); + uint8_t getOPKeyboardVelocitySensity(uint8_t op); + void setOPOutputLevel(uint8_t op, uint8_t level); + uint8_t getOPOutputLevel(uint8_t op); + void setOPMode(uint8_t op, uint8_t mode); + uint8_t getOPMode(uint8_t op); + void setOPFrequencyCoarse(uint8_t op, uint8_t frq_coarse); + uint8_t getOPFrequencyCoarse(uint8_t op); + void setOPFrequencyFine(uint8_t op, uint8_t frq_fine); + uint8_t getOPFrequencyFine(uint8_t op); + void setOPDetune(uint8_t op, uint8_t detune); + uint8_t getOPDetune(uint8_t op); + void setPitchRate(uint8_t step, uint8_t rate); + uint8_t getPitchRate(uint8_t step); + void setPitchLevel(uint8_t step, uint8_t level); + uint8_t getPitchLevel(uint8_t step); + void setAlgorithm(uint8_t algorithm); + uint8_t getAlgorithm(void); + void setFeedback(uint8_t feedback); + uint8_t getFeedback(void); + void setOscillatorSync(bool sync); + bool getOscillatorSync(void); + void setLFOSpeed(uint8_t speed); + uint8_t getLFOSpeed(void); + void setLFODelay(uint8_t delay); + uint8_t getLFODelay(void); + void setLFOPitchModulationDepth(uint8_t depth); + uint8_t getLFOPitchModulationDepth(void); + void setLFOAmpModulationDepth(uint8_t delay); + uint8_t getLFOAmpModulationDepth(void); + void setLFOSync(bool sync); + bool getLFOSync(void); + void setLFOWaveform(uint8_t waveform); + uint8_t getLFOWaveform(void); + void setLFOPitchModulationSensitivity(uint8_t sensitivity); + uint8_t getLFOPitchModulationSensitivity(void); + void setTranspose(uint8_t transpose); + uint8_t getTranspose(void); + void setName(char* name); + void getName(char* buffer); - in_update = false; - }; - - private: + protected: + const uint16_t audio_block_time_us = 1000000 / (SAMPLE_RATE / AUDIO_BLOCK_SAMPLES); volatile bool in_update = false; + void update(void); }; diff --git a/third-party/Synth_Dexed/src/teensy_board_detection.h b/third-party/Synth_Dexed/src/teensy_board_detection.h new file mode 100644 index 0000000..83d55ef --- /dev/null +++ b/third-party/Synth_Dexed/src/teensy_board_detection.h @@ -0,0 +1,50 @@ +/* + MicroDexed + + MicroDexed is a port of the Dexed sound engine + (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6/4.x with audio shield. + Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android + + (c)2018-2021 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 TEENSY_BOARD_DETECTION_H_INCLUDED +#define TEENSY_BOARD_DETECTION_H_INCLUDED + + +// Teensy-4.x +#if defined(__IMXRT1062__) || defined (ARDUINO_TEENSY40) || defined (ARDUINO_TEENSY41) +#define TEENSY4 +#if defined (ARDUINO_TEENSY40) +#define TEENSY4_0 +#elif defined (ARDUINO_TEENSY41) +#define TEENSY4_1 +#endif +#endif + +// Teensy-3.6 +#if defined(__MK66FX1M0__) +# define TEENSY3_6 +#endif + +// Teensy-3.5 +#if defined (__MK64FX512__) +#define TEENSY3_5 +#endif + +#endif diff --git a/third-party/Synth_Dexed/tools/gen_includes.sh b/third-party/Synth_Dexed/tools/gen_includes.sh new file mode 100755 index 0000000..07a1efb --- /dev/null +++ b/third-party/Synth_Dexed/tools/gen_includes.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +echo "#include " > synth_dexed.h +echo "#include " >> synth_dexed.h +echo "#include \"config.h\"" >> synth_dexed.h +for i in `cat includes.txt` +do + echo "/*****************************************************" >> synth_dexed.h + echo " * CODE; ${i}" >> synth_dexed.h + echo " *****************************************************/" >> synth_dexed.h + + cat $i >> synth_dexed.h + echo "" >> synth_dexed.h + echo "//=====================================================" >> synth_dexed.h +done + +echo "#include \"synth_dexed.h\"" > synth_dexed.cpp +for i in `ls orig_code/*.cpp` +do + echo "/*****************************************************" >> synth_dexed.cpp + echo " * CODE; ${i}" >> synth_dexed.cpp + echo " *****************************************************/" >> synth_dexed.cpp + cat $i >> synth_dexed.cpp + echo "" >> synth_dexed.cpp + echo "//=====================================================" >> synth_dexed.cpp +done diff --git a/third-party/Synth_Dexed/tools/includes.txt b/third-party/Synth_Dexed/tools/includes.txt new file mode 100644 index 0000000..2835504 --- /dev/null +++ b/third-party/Synth_Dexed/tools/includes.txt @@ -0,0 +1,17 @@ +orig_code/synth.h +orig_code/aligned_buf.h +orig_code/sin.h +orig_code/exp2.h +orig_code/fast_log.h +orig_code/freqlut.h +orig_code/lfo.h +orig_code/env.h +orig_code/pitchenv.h +orig_code/controllers.h +orig_code/PluginFx.h +orig_code/fm_op_kernel.h +orig_code/fm_core.h +orig_code/dx7note.h +orig_code/dexed.h +orig_code/porta.h +orig_code/source_microdexed.h