From 976c6caf2f853870c056ca221e3bae8355047272 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 26 Oct 2026 12:10:34 +0100 Subject: [PATCH 01/12] Tiempos draft: time left on all eight tracks (Octatrack, USB only) Draft of a ColdFire runtime module: hold CUE and press MIDI for one screen with every audio track's time left, measured from each voice's play speed. - Read the trim start and end at voice +0x28/+0x2c (+0x30 is 0 on a playing Static voice, read in the emulator) and count from the trim start. - English column notices (ELAPSED, TOTAL); one UI claim, key:CUE+MIDI. - README lists the stock-flow change (CUE + MIDI no longer switches to MIDI tracks while installed). - TESTING.md: pinned-toolchain build, 13 host checks, and emulator evidence (MKI panel, development base): the gesture and keys, removal, and three 64-bar tracks at 100/120/140 BPM shown within a second of the expected times at project tempos 120 and 140. No hardware results yet. Co-Authored-By: Claude Opus 5.5 --- sdk/drafts/tiempos/CHANGELOG.json | 11 + sdk/drafts/tiempos/LICENSE | 674 ++++++++++++++++++ sdk/drafts/tiempos/README.md | 77 ++ sdk/drafts/tiempos/TESTING.md | 100 +++ sdk/drafts/tiempos/deck_font.h | 87 +++ sdk/drafts/tiempos/deck_keys.h | 46 ++ sdk/drafts/tiempos/manifest.py | 76 ++ sdk/drafts/tiempos/octamod.module.json | 97 +++ sdk/drafts/tiempos/ot_state.h | 87 +++ sdk/drafts/tiempos/presentation/thumbnail.svg | 19 + sdk/drafts/tiempos/qualification.example.json | 84 +++ .../tiempos/resource-impact.example.json | 21 + sdk/drafts/tiempos/runtime.json | 9 + sdk/drafts/tiempos/tiempos.c | 250 +++++++ sdk/drafts/tiempos/tiempos_host.c | 158 ++++ sdk/drafts/tiempos/unit.s | 17 + sdk/drafts/tiempos/verify.py | 2 + 17 files changed, 1815 insertions(+) create mode 100644 sdk/drafts/tiempos/CHANGELOG.json create mode 100644 sdk/drafts/tiempos/LICENSE create mode 100644 sdk/drafts/tiempos/README.md create mode 100644 sdk/drafts/tiempos/TESTING.md create mode 100644 sdk/drafts/tiempos/deck_font.h create mode 100644 sdk/drafts/tiempos/deck_keys.h create mode 100644 sdk/drafts/tiempos/manifest.py create mode 100644 sdk/drafts/tiempos/octamod.module.json create mode 100644 sdk/drafts/tiempos/ot_state.h create mode 100644 sdk/drafts/tiempos/presentation/thumbnail.svg create mode 100644 sdk/drafts/tiempos/qualification.example.json create mode 100644 sdk/drafts/tiempos/resource-impact.example.json create mode 100644 sdk/drafts/tiempos/runtime.json create mode 100644 sdk/drafts/tiempos/tiempos.c create mode 100644 sdk/drafts/tiempos/tiempos_host.c create mode 100644 sdk/drafts/tiempos/unit.s create mode 100644 sdk/drafts/tiempos/verify.py diff --git a/sdk/drafts/tiempos/CHANGELOG.json b/sdk/drafts/tiempos/CHANGELOG.json new file mode 100644 index 000000000..a0067ef7a --- /dev/null +++ b/sdk/drafts/tiempos/CHANGELOG.json @@ -0,0 +1,11 @@ +[ + { + "version": "0.1.0-experimental", + "date": "2026-10-26", + "changes": [ + "First release: hold CUE and press MIDI to see the time left on all eight tracks.", + "The time left follows timestretch, repitch and tempo changes.", + "Known issue: not yet tested on a unit." + ] + } +] diff --git a/sdk/drafts/tiempos/LICENSE b/sdk/drafts/tiempos/LICENSE new file mode 100644 index 000000000..f288702d2 --- /dev/null +++ b/sdk/drafts/tiempos/LICENSE @@ -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/sdk/drafts/tiempos/README.md b/sdk/drafts/tiempos/README.md new file mode 100644 index 000000000..8159943c9 --- /dev/null +++ b/sdk/drafts/tiempos/README.md @@ -0,0 +1,77 @@ +# Tiempos + +Version: 0.1.0-experimental · author: @imdantelo + +## Overview + +Tiempos shows the time left on all eight audio tracks on one screen. It is meant for playing long samples (whole tracks on Static machines) the way a DJ does: you see at a glance which track ends when, without opening each track's pages. + +Each track gets one 8-pixel row: + +| Area | What it shows | +| --- | --- | +| Track number | Filled: playing. Outline: loaded and stopped. Dotted: empty, or a machine with no length (Thru, Neighbor, Pickup). | +| Mark beside the number | The active track. | +| Bar | Solid: what is left to play. Thin line: what has played. A stop mark at the end. | +| Time left | Real time, m:ss. Flashes inverted in the last 30 seconds while the track plays. | +| Right column | Total length or time played, both at the current speed. | + +The time left is real time, not sample time. Tiempos measures how fast each voice's play position moves against the unit's 132 MHz timer, every half second. That speed already includes timestretch, repitch and project tempo changes, so a 126 BPM track in a 128 BPM project shows 7:22 left where the sample length alone would say 7:29. After a tempo change the figure settles within two seconds. Tiempos does not need to know a sample's tempo or which slot a track uses. + +Tiempos only reads memory and draws. It takes no effect slot, adds no knob and changes nothing in the project. + +## Controls + +Tiempos has no knobs. While its screen shows: + +| Key | Action | +| --- | --- | +| CUE + MIDI | Open or close the screen. Tiempos takes this MIDI press, so the unit does not switch to MIDI tracks. | +| NO | Close the screen. | +| LEFT or RIGHT | Switch the right column between total length and time played. A notice names the column (TOTAL or ELAPSED) for one second. | +| SRC, AMP, LFO, FX1, FX2, BANK, PATTERN | Close the screen and reach the unit as usual. | +| Everything else | Reaches the unit as usual: PLAY, STOP, REC, track and trig keys, encoders, the crossfader. The screen stays. | + +Closing the screen redraws the page that was underneath. + +## Usage + +Load whole tracks into Static slots on tracks 1 to 8 and start playback. Hold CUE and press MIDI from any page. Mix with the crossfader and the track keys as usual while the screen shows the time left. Close it with NO or CUE + MIDI when you need to edit. + +## Quick tutorial + +1. **Open it.** Load a sample on track 1, press PLAY, hold CUE and press MIDI. Row 1 shows a filled number, a bar and the time left. +2. **Read the speed.** Change the project tempo. Within two seconds the time left on track 1 changes with it; with timestretch on, a faster tempo leaves less time. +3. **Switch the column and close.** Press RIGHT: the notice says ELAPSED and the right column shows the time played. Press NO: the page you were on comes back. + +### What changes in a stock flow + +One stock gesture changes: + +- **What changes and for whom.** On stock, CUE + MIDI switches to the MIDI tracks, as MIDI alone does. With Tiempos installed it opens and closes the Tiempos screen instead, for everyone who has the module. +- **Why.** The screen has to open from any page with keys a DJ-style player reaches without looking. The MKI has no PROJ key, so CUE + PROJ is not available, and CUE + MIDI adds nothing on stock that MIDI alone does not do. +- **What you see and do differently.** To switch to the MIDI tracks, press MIDI without holding CUE. While the Tiempos screen shows, LEFT, RIGHT and NO act on it; every other key reaches the unit. +- **Turning it off.** Remove Tiempos from the module set. There is no setting. +- **Neighbouring flows checked** (emulator, MKI panel, with and without the module): MIDI alone switches tracks; SRC closes the screen and the page is redrawn. Not checked on a unit. + +## Compatibility and limitations + +- Octatrack MKI and MKII, OS 1.40C, with the Modwerk base over USB. It uses the base's tick, draw, key and encoder events, so card firmware cannot include it. +- Declares one UI claim, the gesture CUE + MIDI on every page (`key:CUE+MIDI`). LEFT, RIGHT and NO act on its own screen only while it shows, which no other module draws, so they are not declared. +- No effect slot, no DSP code, no stock-code sites. +- Not yet tested on a unit. It reads each voice's play position (voice record + 0x44) and its trim start and end (+ 0x28, + 0x2c). The emulator showed those values on a playing Static track; they must be confirmed on hardware. +- The time played and the total length count from the sample's trim start, so a trimmed sample shows its trimmed length. +- A looping track shows the time to the end of the sample, not to the end of the loop. +- Until a track has played for half a second, its time is shown at the sample's original speed. + +## Tests and measurements + +See [TESTING.md](TESTING.md). Host tests only; no hardware, cycle or memory measurements yet. + +## Authorship and licences + +Design, specification and screen layout by Diego Antelo Barba. Code written with Claude (Anthropic) for the author. GPL-3.0-or-later, see [LICENSE](LICENSE). The 3x5 font in `deck_font.h` is original. No Elektron firmware, extracted routines or tables. + +## Screens and audio + +No captures yet: they must come from the headless emulator or the unit's LCD (docs/MODULE_UI_CAPTURES.md). Tiempos makes no sound, so it has no audio preview. diff --git a/sdk/drafts/tiempos/TESTING.md b/sdk/drafts/tiempos/TESTING.md new file mode 100644 index 000000000..4b78efb37 --- /dev/null +++ b/sdk/drafts/tiempos/TESTING.md @@ -0,0 +1,100 @@ +# Tiempos testing + +## Commands and exact revision + +Source: `sdk/drafts/tiempos/` on branch `tiempos`, draft of 26 October 2026, on Modwerk `main` at `d2d517a8` (with #949's ColdFire checks for C runtime modules). Built in `modwerk-source-tools` image `sha256:aa3916ed6ae4…`. + +```sh +# ColdFire package, in the pinned toolchain image (m68k-elf-gcc 16.2.0), with #949's late-combine and MCF54455 index checks +docker run --rm --network none -v "$PWD":/src:ro -v ~/.cache/tiempos-build:/out modwerk-source-tools \ + sh -c 'cd /src && python3 -B sdk/runtime/loader/build.py sdk/drafts/tiempos/tiempos.c -o /out/tiempos.mwrm --cross m68k-elf-' +# -> module 31282ae5, 2156 bytes of code and data, 268 of bss, 33 relocations, 4 hooks, 0 stock-code sites +# SHA-256 225a0170382915f749315e26f4dbf97d4e0c4a047bf85bd347fb0e1bbe35d53e + +# Host tests (simulated OS memory, simulated 132 MHz timer, 60 ticks a second) +cc -Wall -Wextra -DDECK_HOST -I sdk/drafts/tiempos -I sdk/runtime/loader -o tiempos_host \ + sdk/drafts/tiempos/tiempos_host.c sdk/drafts/tiempos/tiempos.c -lm && ./tiempos_host OUT_DIR +``` + +## Host results + +13 of 13 pass, no compiler warnings: + +| Check | Result | +| --- | --- | +| Closed: the stock frame is left untouched | pass | +| CUE + MIDI opens and takes the MIDI press | pass | +| Measured speed of a 126 BPM sample in a 128 BPM project: 44100 × 128/126 frames a second, error under 0.2 % | pass | +| Playing track: filled number | pass | +| Active-track mark | pass | +| Loaded, stopped track whose trim starts at 10 s: outline | pass | +| Empty track: dotted number | pass | +| Empty track: `--:--` | pass | +| Last 30 seconds (trim from 30 s): the time flashes | pass | +| Tempo change to 132 BPM: new speed within 2 s | pass | +| Flex loop retriggered five times: times still shown | pass | +| PLAY reaches the unit | pass | +| SRC closes the screen and the unit redraws its page | pass | + +## Emulator results + +Emulator evidence only: executed code paths, not timing, audio or hardware behaviour. + +Setup, 26 October 2026: `ot_emu` from octabam `dcf93d3`, adapted by `scripts/octatrack-emulator/build.py`; MKI panel (the default); a development base built from the developer's own OS 1.40C file (`build_core.py --dsp-loader --site-events --cached-modules --dev`, base `6a44c813…`); a scratch card with one set and a 120 s, 44.1 kHz stereo test tone (5,292,000 frames) on track 1's Static slot 1, one trig on step 1; the package above installed over the emulated USB link with `npm run device -- serve --emulator` and `scripts/device-send.py`. + +| What | Result | +| --- | --- | +| Install, trial and Keep of the package | accepted | +| Voice record of track 1 while playing (`mem:0x800049d8:168`) | +0x00 = 0xff (active); +0x28 = 0 and +0x2c = 5,292,000 (the trim region STORAGE.md §4 describes); +0x34 and +0x3c also 5,292,000; **+0x30 = 0**; +0x44 grows while it plays (0xb9af → 0xcdb9 over one read) | +| CUE + MIDI | opens the screen; the unit does not switch to MIDI tracks (the only declared UI claim, `key:CUE+MIDI`) | +| Screen, stopped and playing | track 1 outlined (stopped) or filled (playing), bar, time left and total; tracks 2-8 dotted with `--:--` | +| RIGHT, LEFT | the ELAPSED and TOTAL notices; the right column switches | +| SRC | closes; the PLAYBACK page is redrawn | +| CUE + MIDI again | closes | +| Removal | accepted; afterwards CUE + MIDI switches to MIDI tracks as on stock | +| Measured speed in the emulator | about 41,400 frames a second (module test value 0xa1a6), so a total of 2:07 for the 2:00 tone. The emulator's audio clock and its 132 MHz timer are not in the hardware's ratio, so this says nothing about a unit; the stopwatch check below decides it. | + +### Three tracks at different original tempos + +Same setup, a card with three mono 44.1 kHz test tones, each 64 bars of 4/4 (256 beats): `T100.WAV` 6,773,760 frames (153.6 s at 100 BPM) on track 1, `T120.WAV` 5,644,800 frames (128 s) on track 2, `T140.WAV` 4,838,400 frames (109.7 s) on track 3, each loaded through the stock browser (no `.ot` file: the firmware gives a tempo from the length, and TIMESTRETCH NORMAL), one trig on step 1 of each. Package `225a0170…` above. + +Each original tempo was checked from the voices themselves: between two reads of `mem:0x800049d8:504` in one pattern cycle, the play positions (+0x44) advanced in the ratio 1.2000 : 1.0000 : 0.8572 at 120 BPM and again at 140 BPM, which is 100, 120 and 140 BPM against the project tempo. 64 bars last 128 s at 120 BPM and 109.7 s at 140 BPM, whatever the sample's own tempo, so all three tracks should show the same times; the sample lengths alone would say 2:33, 2:08 and 1:49. + +| Project tempo | Expected total | Shown total (T1, T2, T3) | Expected time left at the read | Shown time left | +| --- | --- | --- | --- | --- | +| 120 BPM | 2:08 (128.0 s) | 2:07, 2:07, 2:07 | 2:07 | 2:07, 2:07, 2:07 | +| 140 BPM (raised with TEMPO and LEVEL while playing) | 1:49 (109.7 s) | 1:49, 1:49, 1:49 | 1:48 (T1: (6,773,760 − 99,393) / (44,100 × 140/100) = 108.1 s) | 1:47, 1:47, 1:48 | + +Every figure is within one second of the expected value (the display truncates to whole seconds, and the emulator's clock is not the unit's). Reopened right after the tempo change, the totals already read 1:49, because Tiempos keeps measuring while closed. The one trig per pattern retriggers each track every 16 steps, so these runs show a few seconds of each sample, never a track running out; the last-30-seconds flash, a track reaching its end and minutes-long accuracy are not tested here. Captures, kept outside Git: the 120 BPM screen, the TEMPO popup, the 140 BPM screen right after reopening and later, and the ELAPSED column. + +The draft first read the sample end at voice +0x30, which the emulator shows is 0 on a playing Static voice; it now reads the trim start (+0x28) and end (+0x2c) and measures time played and total from the trim start. + +## Hardware and audio quality + +Not tested. Tiempos makes no sound. To run on a unit, in this order: + +1. Confirm the key codes: with Tiempos installed, CUE + MIDI opens it, LEFT and RIGHT switch the column, NO closes it, and SRC, AMP, LFO, FX1, FX2, BANK and PATTERN close it. +2. Read voice record + 0x44 twice, one second apart, while track 1 plays at its original tempo: it must grow by about 44,100. +3. Compare voice record + 0x28 and + 0x2c with the sample's trim start and end (frames), with and without a trim in the audio editor. +4. Play three long Static tracks at different tempos and compare each time left with a stopwatch over five minutes. +5. Change tempo, switch timestretch modes, retrigger a Flex loop, change Part and reload the project with the screen open and closed. + +## Stock flows + +Compared in the emulator with and without Tiempos (above): CUE + MIDI switches to MIDI tracks on stock and opens Tiempos with it installed. With the screen open, LEFT, RIGHT and NO act on the screen. Not compared: every other key while the screen is open, on a unit. + +## Performance + +Not measured. Closed, each tick reads three words and a byte per track; open, each composition clears and redraws the 1 KB frame pixel by pixel. To measure with the development base's profile (`modwerk_cost`), stopped and playing, open and closed. + +## Resources + +Unmeasured. Package: 2,156 bytes of code and data and 268 bytes of BSS (pinned toolchain build above). No DSP code, no effect slot, no DSP memory. + +## Hardware + +Not tested. + +## OT UI capture evidence + +Development captures from the emulator's display read over USB are kept outside Git. Captures for the module page still have to be made with `scripts/capture-module-ui.py` or from the unit's LCD (docs/MODULE_UI_CAPTURES.md). diff --git a/sdk/drafts/tiempos/deck_font.h b/sdk/drafts/tiempos/deck_font.h new file mode 100644 index 000000000..71cb9f740 --- /dev/null +++ b/sdk/drafts/tiempos/deck_font.h @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later + * DECK: fuente propia de 3 x 5 px (avance de 4 px), solo mayúsculas. + * + * Por qué una fuente propia y no la del Octatrack: la fuente pequeña del OS + * (0x400ba876, "5 px capitals" según Octabam PANEL.md) tiene anchos por glifo + * que todavía no se han medido en la unidad. La columna de datos necesita + * exactamente 4 px por carácter (5 caracteres en 20 px), así que la vista DECK + * dibuja con esta fuente. Misma altura que la del OS: visualmente encaja. + * + * Cada glifo son 15 bits: 5 filas de 3, de arriba abajo; en cada fila el bit + * más alto es la columna izquierda. Índice = ASCII - 32 (de ' ' a '_'). + */ +#ifndef DECK_FONT_H +#define DECK_FONT_H +#include + +#define G(a, b, c, d, e) ((uint16_t)((a) << 12 | (b) << 9 | (c) << 6 | (d) << 3 | (e))) + +static const uint16_t deck_font[64] = { + /* ' ' */ 0, + /* '!' */ G(2, 2, 2, 0, 2), + /* '"' */ G(5, 5, 0, 0, 0), + /* '#' */ G(5, 7, 5, 7, 5), + /* '$' */ G(3, 6, 2, 3, 6), + /* '%' */ G(5, 1, 2, 4, 5), + /* '&' */ G(2, 5, 2, 5, 3), + /* ''' */ G(2, 2, 0, 0, 0), + /* '(' */ G(2, 4, 4, 4, 2), + /* ')' */ G(2, 1, 1, 1, 2), + /* '*' */ G(0, 5, 2, 5, 0), + /* '+' */ G(0, 2, 7, 2, 0), + /* ',' */ G(0, 0, 0, 2, 4), + /* '-' */ G(0, 0, 7, 0, 0), + /* '.' */ G(0, 0, 0, 0, 2), + /* '/' */ G(1, 1, 2, 4, 4), + /* '0' */ G(7, 5, 5, 5, 7), + /* '1' */ G(2, 6, 2, 2, 7), + /* '2' */ G(7, 1, 7, 4, 7), + /* '3' */ G(7, 1, 7, 1, 7), + /* '4' */ G(5, 5, 7, 1, 1), + /* '5' */ G(7, 4, 7, 1, 7), + /* '6' */ G(7, 4, 7, 5, 7), + /* '7' */ G(7, 1, 2, 2, 2), + /* '8' */ G(7, 5, 7, 5, 7), + /* '9' */ G(7, 5, 7, 1, 7), + /* ':' */ G(0, 2, 0, 2, 0), + /* ';' */ G(0, 2, 0, 2, 4), + /* '<' */ G(1, 2, 4, 2, 1), + /* '=' */ G(0, 7, 0, 7, 0), + /* '>' */ G(4, 2, 1, 2, 4), + /* '?' */ G(7, 1, 2, 0, 2), + /* '@' */ G(7, 5, 7, 4, 3), + /* 'A' */ G(2, 5, 7, 5, 5), + /* 'B' */ G(6, 5, 6, 5, 6), + /* 'C' */ G(3, 4, 4, 4, 3), + /* 'D' */ G(6, 5, 5, 5, 6), + /* 'E' */ G(7, 4, 6, 4, 7), + /* 'F' */ G(7, 4, 6, 4, 4), + /* 'G' */ G(3, 4, 5, 5, 3), + /* 'H' */ G(5, 5, 7, 5, 5), + /* 'I' */ G(7, 2, 2, 2, 7), + /* 'J' */ G(1, 1, 1, 5, 2), + /* 'K' */ G(5, 5, 6, 5, 5), + /* 'L' */ G(4, 4, 4, 4, 7), + /* 'M' */ G(5, 7, 7, 5, 5), + /* 'N' */ G(6, 5, 5, 5, 5), + /* 'O' */ G(2, 5, 5, 5, 2), + /* 'P' */ G(6, 5, 6, 4, 4), + /* 'Q' */ G(2, 5, 5, 6, 3), + /* 'R' */ G(6, 5, 6, 5, 5), + /* 'S' */ G(3, 4, 2, 1, 6), + /* 'T' */ G(7, 2, 2, 2, 2), + /* 'U' */ G(5, 5, 5, 5, 7), + /* 'V' */ G(5, 5, 5, 5, 2), + /* 'W' */ G(5, 5, 7, 7, 5), + /* 'X' */ G(5, 5, 2, 5, 5), + /* 'Y' */ G(5, 5, 2, 2, 2), + /* 'Z' */ G(7, 1, 2, 4, 7), + /* '[' */ G(6, 4, 4, 4, 6), + /* '\' */ G(4, 4, 2, 1, 1), + /* ']' */ G(3, 1, 1, 1, 3), + /* '^' */ G(2, 5, 0, 0, 0), + /* '_' */ G(0, 0, 0, 0, 7), +}; +#undef G + +#endif diff --git a/sdk/drafts/tiempos/deck_keys.h b/sdk/drafts/tiempos/deck_keys.h new file mode 100644 index 000000000..1b36ac0e8 --- /dev/null +++ b/sdk/drafts/tiempos/deck_keys.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later + * DECK: códigos de tecla del Octatrack (OS 1.40C). + * + * Fuentes, que coinciden: + * - Modwerk status.c (probado en hardware, MKII): CUE 0x2a, PROJ 0x1c, NO 0x32. + * - Octabam docs/firmware/PANEL.md (sondeo bajo el port, corregido el 25 sep 2026: + * STOP es 0x27, no 0x2a): pistas 0x10..0x17, DOWN 0x20, RIGHT 0x21, páginas + * 0x22..0x26, STOP 0x27, PLAY 0x28, REC 0x29, CUE 0x2a, FUNCTION 0x2d, + * PATTERN 0x2e, BANK 0x2f, YES 0x31, NO 0x32, UP 0x33, LEFT 0x34, MIDI 0x35. + * - El código es fila·8 + bit en la MK1 y en la MKII; la tabla de la MK1 + * (0x400bfc10, 57 registros) no tiene 0x1c: la MK1 no tiene PROJ. + * + * Sin confirmar en una MK1 real: se comprueban con el sondeo de teclas del + * TESTING.md antes de calificar el módulo. Todo el módulo usa solo estas constantes. + */ +#ifndef DECK_KEYS_H +#define DECK_KEYS_H + +#define K_TRACK1 0x10 /* pistas 1..8 = 0x10..0x17 */ +#define K_TRACK8 0x17 +#define K_DOWN 0x20 +#define K_RIGHT 0x21 +#define K_SRC 0x22 /* páginas 0x22..0x26: SRC AMP LFO FX1 FX2 */ +#define K_FX2 0x26 +#define K_STOP 0x27 +#define K_PLAY 0x28 +#define K_REC 0x29 +#define K_CUE 0x2a +#define K_FUNC 0x2d +#define K_PATTERN 0x2e +#define K_BANK 0x2f +#define K_YES 0x31 +#define K_NO 0x32 +#define K_UP 0x33 +#define K_LEFT 0x34 +#define K_MIDI 0x35 + +/* Combinación para abrir y cerrar DECK: mantener CUE y pulsar MIDI. + * Motivo: en la MK1 no hay PROJ (Modwerk usa CUE + PROJ para su página de estado) + * y MIDI, que cambia entre pistas de audio y MIDI, no se usa al pinchar. DECK se + * queda la pulsación de MIDI, así que la máquina no cambia de modo. + * Cámbialo aquí si en tu flujo usas MIDI. */ +#define K_OPEN_MOD K_CUE +#define K_OPEN K_MIDI + +#endif diff --git a/sdk/drafts/tiempos/manifest.py b/sdk/drafts/tiempos/manifest.py new file mode 100644 index 000000000..6cf68d954 --- /dev/null +++ b/sdk/drafts/tiempos/manifest.py @@ -0,0 +1,76 @@ +""" -- one line on what it changes in the firmware. + +THE SKELETON OF A COLDFIRE MODULE: code the build links and places for +you, reached from stock code by detours you name by SYMBOL. Copy this +directory to modules// and edit. Directories starting with `_` +are skipped by the registry, so this file is never built. + +modules/repitch/ is a finished one (one linked unit, detours, pokes); +modules/midi-scenes/ another (units built from the author's repository as +a submodule). docs/remixer/MODULES.md "Declaring a ColdFire +module" is the guide; docs/remixer/PLACEMENT.md says where the bytes go. + +Say what the module is, which stock routines it changes, what is measured +and what is inferred. Delete every comment below once answered. +""" + +from remix.schema import Category, Proof, Gate, Detour, Kind, Linked, Module, Poke +from remix.stock_guard import stock_guard + +MODULE = Module( + # `name` MUST equal the directory name. `key` is the build identifier and + # appears in the build report, which other tools parse -- so it is API. + name="tiempos", + key="TIEMPOS", + kind=Kind.CF_PATCH, # no DSP code, no chooser row + doc="One line, shown by `make modules`.", + category=Category.TRACK, author="imdantelo", author_url="https://github.com/imdantelo", + proof=Proof.UNTESTED, proof_note="Development scaffold; no module behavior has been verified.", + + # ---- the code: GNU-as units, linked by the build ---------------------- + # ORDER IS LINK ORDER: a unit may reference symbols of units before it. + # `dram=True` puts the unit in the platform runtime (linked with every + # other DRAM unit in the remix, appended behind the loader, depacked at + # boot into the platform's 10 MB reserve at the bottom of the audio + # page arena -- where anything bigger than a few hundred bytes + # belongs; the unit gives up 10 MB of sample memory). `dram=False` places + # it in one of the OS image's free zero runs (~8 KB, shared by everyone) + # for code that must be ROM-resident. Sources are `.s` for m68k-elf-as; + # `cpu="5407"` and "5475" encode this ISA subset identically. + linked=( + Linked("unit", "modules/tiempos/unit.s", dram=True), + # Building from someone else's repository? Add it as a submodule + # under modules//upstream and point `source` into it; the + # sources stay theirs and an update is a submodule bump. + # `reference=(addr, sha256)` re-links the unit at the AUTHOR'S own + # address on every build and compares, so a drift from the bytes + # they ratified fails loudly. + ), + + # ---- how stock code reaches it: detours, wired by symbol -------------- + # `site` is a stock instruction; `expect` its bytes (whole instructions, + # asserted before anything is written -- a site that has moved stops + # the build). `kind`: "jmp" for a stub that replays what it displaced + # and jumps on (the common case), "jsr" for a callable that returns, + # "lea" to rewrite a six-byte `lea abs.l,An`'s operand. `pad_to` nops + # the rest of a displaced span longer than six bytes. + detours=( + # Detour(0x400xxxxx, stock_guard(0x400xxxxx, 8, ""), "unit", "my_hook", + # "what this hook is for", kind="jsr", pad_to=None), + ), + + # ---- plain asserted rewrites ------------------------------------------ + pokes=( + # Poke(0x400xxxxx, expect=stock_guard(0x400xxxxx, 2, ""), + # write=bytes.fromhex("6012"), note="bne -> bra: never re-apply"), + ), + + gates=(Gate("modules/tiempos/verify.py", remix_arg=False),), + + # A stock pointer array that needs more entries: TableGrow relocates it + # into free space with your symbols appended and repoints every + # reference. + # tables=(TableGrow("...", old=0x400xxxxx, count=16, + # symbols=(("unit", "my_row"),), + # refs=((0x400xxxxx, 0x400xxxxx),)),), +) diff --git a/sdk/drafts/tiempos/octamod.module.json b/sdk/drafts/tiempos/octamod.module.json new file mode 100644 index 000000000..896578a4c --- /dev/null +++ b/sdk/drafts/tiempos/octamod.module.json @@ -0,0 +1,97 @@ +{ + "schemaVersion": 2, + "id": "tiempos", + "key": "TIEMPOS", + "name": "Tiempos", + "version": "0.1.0-experimental", + "category": "system", + "author": { + "github": "imdantelo", + "credits": [ + "Diego Antelo Barba (design and specification)" + ] + }, + "nativeManifest": "manifest.py", + "presentation": { + "label": "TIME LEFT", + "family": "Display", + "summary": "One screen with the time left on all eight tracks, for playing long samples like a DJ.", + "overview": "Hold CUE and press MIDI to show every track on one screen: a bar of what is left to play, the real time left and the total length. The time left is measured from how fast each voice really plays, so it follows timestretch, repitch and tempo changes. It only reads and draws: no effect slot, no knob, and nothing in the project changes.", + "highlights": [ + "Time left for all eight tracks at once", + "Follows timestretch, repitch and tempo changes", + "The time left flashes in the last 30 seconds", + "Playback keys, track keys, encoders and the crossfader keep working while it shows" + ], + "usage": [ + "Hold CUE and press MIDI from any screen; do the same, or press NO, to close it.", + "LEFT or RIGHT switches the right column between total length and time played." + ] + }, + "controls": [], + "compatibility": { + "firmware": "1.40C", + "location": "Audio tracks", + "conflicts": [], + "uiClaims": [ + "key:CUE+MIDI" + ], + "limitations": [ + "Needs the Modwerk base over USB: it uses the base's draw and key events.", + "Not yet tested on a unit. The voice position (+0x44) and trim start and end (+0x28, +0x2c) were read in the emulator and must be confirmed on hardware.", + "Key codes for CUE, MIDI, LEFT and RIGHT follow Modwerk's status page and octabam's panel notes and worked in the emulator; to be confirmed on an MKI.", + "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", + "A track that loops shows the time left to the end of the sample, not to the end of the loop.", + "Until a track has played for half a second, its time is shown at the sample's original speed.", + "Thru, Neighbor and Pickup tracks show no time." + ], + "effectId": null + }, + "resources": { + "recorded": "Not measured", + "storage": { + "label": "Storage", + "display": "Not measured", + "value": null, + "unit": "unknown", + "method": "unmeasured", + "conditions": "No measurements exist yet. Add exact conditions and source evidence when available.", + "source": "TESTING.md" + }, + "processing": { + "label": "CPU / DSP load", + "display": "Not measured", + "value": null, + "unit": "unknown", + "method": "unmeasured", + "conditions": "No measurements exist yet. Add exact conditions and source evidence when available.", + "source": "TESTING.md" + } + }, + "tests": { + "report": "TESTING.md", + "summary": "Host tests only: 13 checks pass against simulated OS memory and a simulated 132 MHz timer. No unit has run it.", + "hardwareStatus": "untested", + "evidenceRevision": "b8deefc88b2c3e5f3c6158e364eb741df1924e1d", + "gates": [ + "Worst-case cycles under parameter modulation and maximum load", + "Exact memory region and maximum-instance totals", + "Owner-reviewed real-hardware evidence with actual coverage and limitations" + ] + }, + "license": { + "spdx": "GPL-3.0-or-later", + "file": "LICENSE", + "declaration": "Original code by the author, GPL-3.0-or-later. The 3x5 font is original. No Elektron firmware, extracted routines or tables." + }, + "media": [], + "access": { + "location": "Any screen: hold CUE and press MIDI.", + "steps": [ + "Install Tiempos with the Modwerk base over USB.", + "Load samples on some tracks and press PLAY.", + "Hold CUE and press MIDI. Hold CUE and press MIDI again, or press NO, to return to the page you were on." + ], + "screenshots": [] + } +} diff --git a/sdk/drafts/tiempos/ot_state.h b/sdk/drafts/tiempos/ot_state.h new file mode 100644 index 000000000..6158cd809 --- /dev/null +++ b/sdk/drafts/tiempos/ot_state.h @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later + * DECK: todo lo que el módulo lee del OS 1.40C del Octatrack, en un solo sitio. + * + * Cada dirección lleva su fuente y su grado de confianza: + * [OK] usada por código de Modwerk probado en hardware (base o módulos). + * [DOC] documentada en Octabam/Modwerk (lectura estática, emulador o una MK1 + * ajena); hay que confirmarla en TU MK1 con `npm run device -- mem`. + * [??] desconocida: el módulo usa un valor por defecto hasta que se sondee + * (ver PROBES.md). Nada aquí escribe en memoria del OS. + * + * La MK1 y la MKII comparten la imagen 1.40C, así que las direcciones son las + * mismas; lo que cambia es el panel (teclas) y la pantalla (LCD en la MK1). + */ +#ifndef OT_STATE_H +#define OT_STATE_H +#include + +/* ---- Lectura de memoria ------------------------------------------------- */ +#ifdef DECK_HOST +uint32_t host_rd32(uint32_t addr); +uint16_t host_rd16(uint32_t addr); +uint8_t host_rd8(uint32_t addr); +void host_redraw(void); +#define RD32(a) host_rd32(a) +#define RD16(a) host_rd16(a) +#define RD8(a) host_rd8(a) +#define OT_REDRAW() host_redraw() +#else +#define RD32(a) (*(const volatile uint32_t *)(uintptr_t)(a)) +#define RD16(a) (*(const volatile uint16_t *)(uintptr_t)(a)) +#define RD8(a) (*(const volatile uint8_t *)(uintptr_t)(a)) +/* [OK] runtime.c: redibuja la pantalla de pista como hace CUE (0x4004d948(-1)). + * Solo desde la tarea de UI (module_key / module_tick lo son). */ +#define OT_REDRAW() ((void (*)(int))0x4004d948u)(-1) +#endif + +/* ---- Variante de panel --------------------------------------------------- */ +/* [OK] boot_anim.c (PANEL_MKII): palabra que el arranque pone por GPIO; 0 = MK1. */ +#define OT_PANEL_MKII 0x46c8d18cu + +/* ---- Motor de audio ------------------------------------------------------ */ +/* [DOC] Octabam ARCHITECTURE.md §6: estado de voz por pista, 8 x 0xA8 bytes, + * byte 0 = activa. */ +#define OT_VOICE_BASE 0x800049d8u +#define OT_VOICE_STRIDE 0xA8u +#define OT_VOICE_ACTIVE 0x00u /* u8 */ +/* [DOC] Octabam REPITCH.md: "T1's sample position (voice +68)", en frames. */ +#define OT_VOICE_POS 0x44u /* u32 */ +/* [DOC] Octabam STORAGE.md §4: al arrancar la voz, el OS copia la región de + * trim del slot (inicio, fin) a la voz en +40. Leído en ot_emu (MKI, base de + * desarrollo, 26 oct 2026) con un WAV de 120 s en una Static sin trim: + * +0x28 = 0 y +0x2c = 5.292.000 frames (+0x34 y +0x3c también; +0x30 = 0, así + * que +0x30 no es el final). Sin confirmar en una unidad real. */ +#define OT_VOICE_START 0x28u /* u32, frames: inicio del trim */ +#define OT_VOICE_END 0x2cu /* u32, frames: fin del trim, donde la Static se para */ + +/* [DOC] Octabam RECORDER.md: tempo del proyecto, BPM x 24 (720..7200). */ +#define OT_TEMPO24 0x80001814u /* u32 */ + +/* [DOC] Octabam MAINMENU.md §6: pista de audio actual (0..7). */ +#define OT_CUR_TRACK 0x80000000u /* u8 */ + +/* [DOC] Octabam STORAGE.md (MK1): ajustes de cada slot STATIC, paso 0x448; + * REPITCH.md: tempo de la muestra en +0x116 (BPM x 24). */ +#define OT_STATIC_SETTINGS 0x100d5b30u +#define OT_SLOT_STRIDE 0x448u +#define OT_SLOT_TEMPO24 0x116u /* u16 */ + +/* [OK] status.c (DTCN3): contador libre del temporizador de frames, 132 MHz, + * 32 bits (da la vuelta cada 32,5 s). Sirve para medir tiempo real. */ +#define OT_DTCN3 0xfc07c00cu +#define OT_DTCN3_PER_MS 132000u + +/* El Octatrack reproduce a 44,1 kHz; las posiciones de voz son frames. */ +#define OT_RATE 44100u + +/* ---- Desconocidos que hay que sondear (PROBES.md) ------------------------ */ +/* Qué slot STATIC usa cada pista en la Part activa. [??] P4 */ +/* Muteo por pista (FUNC + TRACK). [??] P5 */ +/* Envío a CUE por pista (CUE + TRACK) en modo NORMAL/STUDIO. [??] P6 */ +/* Destinos de Output Matrix (MATRIX): byte de LEVEL/cue de la Part, según su + * README "the choice is stored in the Part". [??] P7 */ +/* Lista de slots, nombres y rutas (para el navegador). [??] P8 */ +/* API de ficheros de la CF para leer los .dkp: + * STORAGE.md §1 (vtable 0x46c823fa..; open 0x46c8242a, size 0x46c8241e). [??] P9 */ + +#endif diff --git a/sdk/drafts/tiempos/presentation/thumbnail.svg b/sdk/drafts/tiempos/presentation/thumbnail.svg new file mode 100644 index 000000000..4d78e30f5 --- /dev/null +++ b/sdk/drafts/tiempos/presentation/thumbnail.svg @@ -0,0 +1,19 @@ +AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYTpkY2ZkYWI5Yi04MTI5LTRjZDAtYTkxNS0zMTVkYjZhNWY0ZjIAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaFmLEi5OKt0tDl6wYJKfLMQAAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDo0NmVmY2FmNS0zZGFjLTQ2OTUtYTMxNS01MTFjNjAxMjI4YzZscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNooBvFDsBYyxXtefUpG7FIyQAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFggxejELNRBKtL/mhwRc5sdKd7t4csfTwkWxXIZpNCdt1GkZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaCenKxIatiqegmbb9fGTdv4AAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCDRmrT1D9pE28FlKFVApLNGnjdfvAAFun724sY9Ip2/aWRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBjkZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOmRjZmRhYjliLTgxMjktNGNkMC1hOTE1LTMxNWRiNmE1ZjRmMi9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOmVkY2YwMjcxLTU5NTEtNGEwOS04Y2EwLWY2Yjc5MzkzNzU1ZHJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCDF6MQs1EEq0v+aHBFzmx0p3u3hyx9PCRbFchmk0J23UaJjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFgg8yTBCasIyHm4m2FtuNceuXyrSwb6oFqPRy0XttCtUnOiY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFgg+yX0RXqxa0It+WDONd0FjYI+RXdHeG6Oj9jgX/3jUQp0Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQLCFjAmLN4Y+t9sVesFmVaG/vQi6Hnsy+Xkjz7l2FLK/GG87HiQzfWDnVHRiFYrxtuIMAHnej3tCiS+FrOiN9QM= +Tiempos — time left on eight tracks +A conceptual diagram of track rows: a solid line for the part of each track still to play, a faint line for what has played, an end mark and the time left. + + + +17:2220:2235:0040:0158:32TIME LEFT · 8 TRACKS + diff --git a/sdk/drafts/tiempos/qualification.example.json b/sdk/drafts/tiempos/qualification.example.json new file mode 100644 index 000000000..f24ba06cd --- /dev/null +++ b/sdk/drafts/tiempos/qualification.example.json @@ -0,0 +1,84 @@ +{ + "moduleVersion": "0.1.0", + "sourceSha256": "REPLACE_WITH_NATIVE_SOURCE_SHA256", + "imageSha256": "REPLACE_WITH_LOCAL_TESTED_IMAGE_SHA256", + "cycles": [ + { + "processor": "dsp", + "worstCase": null, + "maxConfiguration": null, + "maxInstances": null, + "budget": null, + "unit": "cycles/sample", + "method": "emulator", + "conditions": { + "parameterExtremes": "Describe every minimum, maximum and branch boundary tested.", + "parameterModulation": "Describe simultaneous LFOs, p-locks, MIDI CC and scene sweeps; justify each inapplicable mechanism.", + "modeSwitching": "Describe repeated/interrupted mode, bypass and Part changes.", + "maxLoad": "Describe maximum voices/instances, both cores, FX slots, streaming and USB/MIDI load.", + "inputConditions": "Describe silence, impulses, full-scale inputs, feedback and other worst-case signal conditions." + }, + "report": "TESTING.md" + } + ], + "memory": { + "regions": [ + { + "name": "Replace with each code, state, table, buffer, stack/heap and padding allocation", + "space": "dsp-p", + "words": null, + "wordBits": 24, + "bytes": null, + "scope": "shared" + } + ], + "perInstanceBytes": null, + "sharedBytes": null, + "maxInstances": null, + "totalBytes": null, + "conditions": "State exact build options, alignment, accounting convention, allocator/stack bounds and reused stock/shared memory; justify every absent allocation class.", + "report": "TESTING.md" + }, + "hardware": { + "status": "pending", + "model": "MKII", + "testedOn": "YYYY-MM-DD", + "tester": "Your credited tester handle; no email", + "project": { + "name": "Your local stress project", + "sha256": "REPLACE_WITH_PROJECT_FINGERPRINT", + "recipe": "Record generator/tool revision and command, local source template fingerprint, sample recipe, all settings and modifications needed to reproduce this stress project. Keep the project/card/firmware local." + }, + "durationMinutes": null, + "audioTracks": 8, + "midiTracks": null, + "conditions": { + "parameterExtremes": "Describe every minimum, maximum and branch boundary tested.", + "parameterModulation": "Describe simultaneous LFOs, p-locks, MIDI CC and scene sweeps; justify each inapplicable mechanism.", + "modeSwitching": "Describe repeated/interrupted mode, bypass and Part changes.", + "maxLoad": "Describe maximum voices/instances, both cores, FX slots, streaming and USB/MIDI load.", + "inputConditions": "Describe silence, impulses, full-scale inputs, feedback and other worst-case signal conditions." + }, + "checks": { + "audioContinuity": "failed", + "transport": "failed", + "controls": "failed", + "memoryIntegrity": "failed", + "recovery": "failed" + }, + "report": "TESTING.md", + "maxInstances": null + }, + "documentation": { + "tutorial": { + "title": "Quick tutorial", + "steps": [ + "Explain setup and exactly where to select or enable the module.", + "Demonstrate the main controls with a useful example setting.", + "Explain what to hear/observe and how to stop, reset or bypass." + ] + }, + "screenshots": [], + "screenshotStyle": "black-and-white" + } +} diff --git a/sdk/drafts/tiempos/resource-impact.example.json b/sdk/drafts/tiempos/resource-impact.example.json new file mode 100644 index 000000000..8f7457a05 --- /dev/null +++ b/sdk/drafts/tiempos/resource-impact.example.json @@ -0,0 +1,21 @@ +{ + "conditions": "Describe the active workload, expensive modes, changing controls, instance count, and whether shared/stock allocations are included.", + "cpu": { + "level": null, + "basis": "source-estimate", + "rationale": "Choose minimal, low, moderate or high from source inspection or a documented workload comparison. Explain the ColdFire work and cite the record; do not invent a utilization percentage.", + "source": "TESTING.md" + }, + "dsp": { + "level": null, + "basis": "source-estimate", + "rationale": "Choose a relative demand tier covering the expensive DSP modes and modulation. Minimal needs an explanation of the small or absent added DSP path.", + "source": "TESTING.md" + }, + "memory": { + "level": null, + "basis": "source-estimate", + "rationale": "Choose a relative footprint tier covering code, state, tables and buffers. Distinguish shared reservations and reused stock buffers from extra per-instance memory.", + "source": "TESTING.md" + } +} diff --git a/sdk/drafts/tiempos/runtime.json b/sdk/drafts/tiempos/runtime.json new file mode 100644 index 000000000..2ee80c488 --- /dev/null +++ b/sdk/drafts/tiempos/runtime.json @@ -0,0 +1,9 @@ +{ + "schema": 1, + "subscribe": [ + {"event": "module_tick", "fn": "module_tick"}, + {"event": "module_draw", "fn": "module_draw"}, + {"event": "module_key", "fn": "module_key"}, + {"event": "module_enc", "fn": "module_enc"} + ] +} diff --git a/sdk/drafts/tiempos/tiempos.c b/sdk/drafts/tiempos/tiempos.c new file mode 100644 index 000000000..22f1da2be --- /dev/null +++ b/sdk/drafts/tiempos/tiempos.c @@ -0,0 +1,250 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later + * TIEMPOS: el tiempo que le queda a cada una de las 8 pistas, en una pantalla. + * Módulo de runtime de Modwerk para Octatrack MK1 y MKII (OS 1.40C). + * + * python3 -B sdk/runtime/loader/build.py tiempos.c -o tiempos.mwrm + * npm run device -- try tiempos.mwrm --seconds 300 + * + * Solo lee y dibuja: no escribe en memoria del OS ni parchea código de stock. + * No necesita forma de onda, archivos .dkp, tarjeta ni deckprep: solo la posición + * y el final de la muestra de cada voz (sondeos P2 y P3). + * + * Tiempo real sin conocer el BPM de la muestra: el módulo mide a qué velocidad + * avanza la posición de cada voz (frames por segundo de reloj, con el temporizador + * de 132 MHz). Así el tiempo restante ya incluye time-stretch, repitch y cambios de + * tempo, y no hace falta saber qué slot usa cada pista (P4). + * + * Teclas (deck_keys.h): CUE + MIDI abre y cierra · NO cierra · LEFT / RIGHT cambian + * la columna derecha (duración total / tiempo transcurrido) · páginas, BANK y + * PATTERN cierran y llegan al OS · todo lo demás sigue yendo al OS. + * + * Fila de cada pista (8 px de alto, 8 filas): + * x 0-8 número: relleno = suena; contorno = cargada y parada; punteado = vacía + * x 10 marca de la pista seleccionada + * x 13-80 barra: maciza lo que falta, línea fina lo ya sonado, tope al final + * x 84-103 tiempo restante m:ss (parpadea en negativo bajo 30 s si suena) + * x 108-127 duración total o tiempo transcurrido, al tempo actual + */ +#include +#include "modwerk_module.h" +#include "ot_state.h" +#include "deck_keys.h" +#include "deck_font.h" + +#define TRACKS 8 +#define ROW_H 8 +#define BAR_X0 13 +#define BAR_X1 80 +#define REM_END 103 +#define RIGHT_END 127 +#define WINDOW_MS 500u /* ventana de medida de la velocidad */ +#define BLINK_SECS 30u + +/* ---------------------------------------------------------------- dibujo */ +static unsigned char *fb; + +static void px(int x, int y, int on) +{ + if ((unsigned)x > 127u || (unsigned)y > 63u) return; + unsigned char *b = fb + x * 8 + 7 - (y >> 3); + unsigned char m = (unsigned char)(1u << (y & 7)); + if (on) *b |= m; else *b &= (unsigned char)~m; +} + +static void rect(int x0, int y0, int x1, int y1, int on) +{ + for (int x = x0; x <= x1; ++x) + for (int y = y0; y <= y1; ++y) px(x, y, on); +} + +static void text(int x, int y, const char *s, int on) +{ + for (; *s; ++s, x += 4) { + int c = (unsigned char)*s; + if (c < 32 || c >= 96) continue; + unsigned g = deck_font[c - 32]; + for (int r = 0; r < 5; ++r) + for (int k = 0; k < 3; ++k) + if (g & (1u << (14 - r * 3 - k))) px(x + k, y + r, on); + } +} + +static int text_w(const char *s) +{ + int n = 0; + while (s[n]) ++n; + return n ? n * 4 - 1 : 0; +} + +static void fmt_time(char *s, uint32_t secs) +{ + if (secs > 5999u) secs = 5999u; + uint32_t m = secs / 60u; + if (m >= 10u) *s++ = (char)('0' + m / 10u); + *s++ = (char)('0' + m % 10u); + *s++ = ':'; + *s++ = (char)('0' + (secs % 60u) / 10u); + *s++ = (char)('0' + secs % 10u); + *s = 0; +} + +/* ---------------------------------------------------------------- estado */ +struct track { + uint32_t pos, start, len, last_pos; /* frames; start y len: el trim de la voz */ + uint32_t win_pos, win_t; /* inicio de la ventana de medida */ + uint32_t rate; /* frames por segundo real; 0 = sin medir */ + uint8_t active, measuring; +}; + +static struct track tr[TRACKS]; +static int open, show_elapsed, cue_held, taken_key = -1; +static uint32_t ticks; +static uint8_t cur_track; +static uint32_t toast_until; + +/* Velocidad para los cálculos: la medida o, si no hay, la original (44,1 kHz). */ +static uint32_t rate_of(const struct track *t) { return t->rate ? t->rate : OT_RATE; } + +static uint32_t secs_for(uint32_t frames, uint32_t rate) +{ + return rate ? frames / rate : 0u; +} + +/* Lee las voces y actualiza la velocidad medida de cada una. */ +static void sample_tracks(void) +{ + uint32_t now = RD32(OT_DTCN3); + cur_track = RD8(OT_CUR_TRACK); + for (unsigned i = 0; i < TRACKS; ++i) { + struct track *t = &tr[i]; + uint32_t v = OT_VOICE_BASE + i * OT_VOICE_STRIDE; + t->active = RD8(v + OT_VOICE_ACTIVE) != 0; + t->pos = RD32(v + OT_VOICE_POS); + t->start = RD32(v + OT_VOICE_START); + t->len = RD32(v + OT_VOICE_END); + + /* Saltos (retrig, cue, nueva muestra) o parada: se empieza otra ventana, + * conservando la última velocidad medida. */ + int jumped = t->pos < t->last_pos || t->pos - t->last_pos > OT_RATE; /* > 1 s de audio en 1 tick */ + if (!t->active || jumped || !t->measuring) { + t->win_pos = t->pos, t->win_t = now, t->measuring = t->active; + } else { + uint32_t dt = (now - t->win_t) / (OT_DTCN3_PER_MS / 10u); /* décimas de ms */ + if (dt >= WINDOW_MS * 10u) { + uint32_t dp = t->pos - t->win_pos; /* < 2 * 44100 en 0,5 s */ + uint32_t r = dp * 10000u / dt; /* frames por segundo; dp * 1e4 < 2^32 */ + /* suaviza si es parecida a la anterior; si cambia mucho (tempo nuevo), se toma tal cual */ + uint32_t d = r > t->rate ? r - t->rate : t->rate - r; + t->rate = t->rate && d * 50u < t->rate ? (t->rate * 3u + r) / 4u : r; + t->win_pos = t->pos, t->win_t = now; + } + } + t->last_pos = t->pos; + } +} + +/* ---------------------------------------------------------------- vista */ +static void draw_row(unsigned i) +{ + const struct track *t = &tr[i]; + int y = (int)i * ROW_H, loaded = t->len > t->start && t->pos <= t->len; + uint32_t played = t->pos > t->start ? t->pos - t->start : 0u, total = loaded ? t->len - t->start : 0u; + char s[8]; + s[0] = (char)('1' + i), s[1] = 0; + + /* número */ + if (loaded && t->active) { + rect(0, y, 8, y + 6, 1); + text(3, y + 1, s, 0); + } else if (loaded) { + rect(0, y, 8, y, 1), rect(0, y + 6, 8, y + 6, 1), rect(0, y, 0, y + 6, 1), rect(8, y, 8, y + 6, 1); + text(3, y + 1, s, 1); + } else { + for (int x = 0; x <= 8; x += 2) px(x, y, 1), px(x, y + 6, 1); + for (int yy = y; yy <= y + 6; yy += 2) px(0, yy, 1), px(8, yy, 1); + text(3, y + 1, s, 1); + } + if (i == cur_track) rect(10, y + 2, 10, y + 4, 1); + + if (!loaded) { + text(REM_END - text_w("--:--") + 1, y + 1, "--:--", 1); + return; + } + + /* barra: escala por longitud; la parte que falta, maciza */ + int w = BAR_X1 - BAR_X0; + int at = BAR_X0 + (int)((played >> 8) * (uint32_t)w / ((total >> 8) + 1u)); + if (at > BAR_X1) at = BAR_X1; + if (at > BAR_X0) rect(BAR_X0, y + 3, at - 1, y + 3, 1); + rect(at, y + 1, BAR_X1, y + 5, 1); + rect(BAR_X1 + 1, y, BAR_X1 + 1, y + 6, 1); /* tope */ + + /* tiempo restante, real */ + uint32_t rate = rate_of(t), rem = secs_for(t->len - t->pos, rate); + fmt_time(s, rem); + int x = REM_END - text_w(s) + 1; + if (t->active && rem < BLINK_SECS && !((ticks / 30u) & 1u)) { + rect(x - 1, y, REM_END + 1, y + 6, 1); + text(x, y + 1, s, 0); + } else text(x, y + 1, s, 1); + + /* columna derecha: total o transcurrido, a la misma velocidad */ + fmt_time(s, secs_for(show_elapsed ? played : total, rate)); + text(RIGHT_END - text_w(s) + 1, y + 1, s, 1); +} + +/* ---------------------------------------------------------------- eventos */ +void module_tick(struct modwerk_runtime_api *api) +{ + ++ticks; + sample_tracks(); /* también cerrado: así la velocidad ya está medida al abrir */ + if (api) api->value = tr[0].rate; +} + +void module_draw(unsigned char *frame) +{ + if (!open) return; + fb = frame; + for (unsigned i = 0; i < 1024u; ++i) frame[i] = 0; + for (unsigned i = 0; i < TRACKS; ++i) draw_row(i); + /* aviso al cambiar la columna derecha (no hay sitio para una cabecera) */ + if ((int32_t)(toast_until - ticks) > 0) { + const char *m = show_elapsed ? "ELAPSED" : "TOTAL"; + int w = text_w(m), x = 64 - w / 2; + rect(x - 4, 26, x + w + 3, 36, 0); + rect(x - 4, 26, x + w + 3, 26, 1), rect(x - 4, 36, x + w + 3, 36, 1); + rect(x - 4, 26, x - 4, 36, 1), rect(x + w + 3, 26, x + w + 3, 36, 1); + text(x, 29, m, 1); + } +} + +static void close_view(void) +{ + open = 0; + OT_REDRAW(); +} + +int module_key(int code, int pressed) +{ + if (code == K_CUE) cue_held = pressed; + if (!pressed) { + if (code == taken_key) { taken_key = -1; return 1; } + return 0; + } + if (code == K_OPEN && cue_held) { + if (open) close_view(); else open = 1; + taken_key = code; + return 1; + } + if (!open) return 0; + if (code == K_NO) { close_view(); taken_key = code; return 1; } + if (code == K_LEFT || code == K_RIGHT) { show_elapsed = !show_elapsed, toast_until = ticks + 75u; taken_key = code; return 1; } + if ((code >= K_SRC && code <= K_FX2) || code == K_BANK || code == K_PATTERN) { close_view(); return 0; } + return 0; +} + +int module_enc(int encoder, int delta) +{ + (void)encoder, (void)delta; + return 0; +} diff --git a/sdk/drafts/tiempos/tiempos_host.c b/sdk/drafts/tiempos/tiempos_host.c new file mode 100644 index 000000000..f0f498e07 --- /dev/null +++ b/sdk/drafts/tiempos/tiempos_host.c @@ -0,0 +1,158 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later + * Host de pruebas de TIEMPOS: memoria del OS simulada, reloj de 132 MHz simulado, + * 60 ticks por segundo, y volcado de la pantalla a PBM. + * + * cc -DDECK_HOST -I.. -o tiempos_host tiempos_host.c ../tiempos.c && ./tiempos_host out/ + */ +#include +#include +#include +#include +#include "modwerk_module.h" +#include "ot_state.h" +#include "deck_keys.h" + +static double now_s; /* tiempo real simulado */ +static uint8_t active[8], cur; +static double pos[8], speed[8]; /* frames, frames por segundo */ +static uint32_t start[8], len[8]; /* trim de cada voz, frames */ +static int redraws, fails; + +uint32_t host_rd32(uint32_t a) +{ + if (a == OT_DTCN3) return (uint32_t)(uint64_t)llround(now_s * 132e6); + for (unsigned t = 0; t < 8; ++t) { + uint32_t v = OT_VOICE_BASE + t * OT_VOICE_STRIDE; + if (a == v + OT_VOICE_POS) return (uint32_t)pos[t]; + if (a == v + OT_VOICE_START) return start[t]; + if (a == v + OT_VOICE_END) return len[t]; + } + return 0; +} +uint16_t host_rd16(uint32_t a) { (void)a; return 0; } +uint8_t host_rd8(uint32_t a) +{ + if (a == OT_CUR_TRACK) return cur; + for (unsigned t = 0; t < 8; ++t) + if (a == OT_VOICE_BASE + t * OT_VOICE_STRIDE + OT_VOICE_ACTIVE) return active[t]; + return 0; +} +void host_redraw(void) { ++redraws; } + +static unsigned char frame[1024]; +static int pixel(int x, int y) { return (frame[x * 8 + 7 - (y >> 3)] >> (y & 7)) & 1; } +static void check(int ok, const char *what) { printf("%s %s\n", ok ? "OK " : "FALLO", what); if (!ok) ++fails; } + +static void run(double secs) +{ + int n = (int)lround(secs * 60.0); + for (int i = 0; i < n; ++i) { + now_s += 1.0 / 60.0; + for (int t = 0; t < 8; ++t) + if (active[t]) { pos[t] += speed[t] / 60.0; if (pos[t] >= len[t]) pos[t] = len[t], active[t] = 0; } + module_tick(0); + } +} +static void draw(void) { memset(frame, 0xA5, sizeof frame); module_draw(frame); } +static void key(int c, int p) { (void)module_key(c, p); } + +static void dump(const char *dir, const char *name) +{ + char path[512]; + snprintf(path, sizeof path, "%s/%s.pbm", dir, name); + FILE *f = fopen(path, "wb"); + fprintf(f, "P1\n128 64\n"); + for (int y = 0; y < 64; ++y) { for (int x = 0; x < 128; ++x) fputc(pixel(x, y) ? '1' : '0', f); fputc('\n', f); } + fclose(f); +} + +/* Lee los 5 caracteres de una zona comparando con la fuente: lo hace sencillo + * reconstruir "m:ss" contando la anchura del texto encendido no basta, así que las + * pruebas de valores miran el estado interno a través de api->value y la pantalla. */ +static int lit_in(int x0, int x1, int y0, int y1) +{ + int n = 0; + for (int x = x0; x <= x1; ++x) for (int y = y0; y <= y1; ++y) n += pixel(x, y); + return n; +} + +int main(int argc, char **argv) +{ + const char *out = argc > 1 ? argv[1] : "."; + const double R = 44100.0; + + /* T1: tema de 10:52 a 126 BPM en proyecto a 128 (time-stretch: avanza 128/126 más rápido) */ + len[0] = (uint32_t)(652 * R); pos[0] = 200 * R; speed[0] = R * 128.0 / 126.0; active[0] = 1; + /* T2: tema de 6:30 a su tempo, trim desde los 30 s, a 25 s del final */ + start[1] = (uint32_t)(30 * R); len[1] = (uint32_t)(390 * R); pos[1] = (390 - 25) * R; speed[1] = R; active[1] = 1; + /* T3: cargado y parado, con el trim empezando a los 10 s (la posición aún no ha llegado) */ + start[2] = (uint32_t)(10 * R); len[2] = (uint32_t)(300 * R); pos[2] = 0; speed[2] = R; active[2] = 0; + /* T4: loop corto de flex que retriguea */ + len[3] = (uint32_t)(4 * R); pos[3] = 0; speed[3] = R; active[3] = 1; + /* T5-T8 vacías; pista seleccionada: T1 */ + cur = 0; + + run(0.2); + draw(); + int untouched = 1; + for (int i = 0; i < 1024; ++i) untouched &= frame[i] == 0xA5; + check(untouched, "cerrado: el marco del OS queda intacto"); + + key(K_CUE, 1); + check(module_key(K_MIDI, 1) == 1, "CUE + MIDI abre y se queda la pulsación"); + key(K_MIDI, 0); key(K_CUE, 0); + run(2.0); + + /* tiempo restante real de T1 */ + { + struct modwerk_runtime_api api = {0}; + module_tick(&api); + double rate = api.value, want = R * 128.0 / 126.0; + check(fabs(rate - want) / want < 0.002, "T1: velocidad medida = 44100 x 128/126 (error < 0,2 %)"); + double rem_true = (len[0] - pos[0]) / want, rem_naive = (len[0] - pos[0]) / R; + printf(" T1 restante real %.1f s (sin corregir serían %.1f s)\n", rem_true, rem_naive); + } + draw(); + dump(out, "t1_ocho_pistas"); + check(lit_in(0, 8, 0, 6) > 40, "T1 suena: número relleno"); + check(pixel(10, 3), "marca de pista seleccionada en T1"); + check(pixel(0, 16) && pixel(8, 22) && !pixel(1, 17), "T3 cargada y parada: contorno"); + check(pixel(0, 32) && !pixel(1, 32), "T5 vacía: punteada"); + check(lit_in(84, 103, 32, 38) > 10, "T5 vacía: muestra --:--"); + + /* parpadeo de T2 (< 30 s) */ + int a, b; + run(0.25); draw(); a = lit_in(83, 104, 8, 14); + run(0.5); draw(); b = lit_in(83, 104, 8, 14); + check(abs(a - b) > 30, "T2: el tiempo parpadea por debajo de 30 s"); + + /* cambio de tempo del proyecto a 132: la medida se adapta en menos de 2 s */ + speed[0] = R * 132.0 / 126.0; + run(2.0); + { + struct modwerk_runtime_api api = {0}; + module_tick(&api); + double want = R * 132.0 / 126.0; + check(fabs(api.value - want) / want < 0.002, "cambio de tempo: nueva velocidad en < 2 s"); + } + + /* retrig del loop de T4: no rompe la medida */ + for (int i = 0; i < 5; ++i) { pos[3] = 0; run(0.3); } + draw(); + check(lit_in(84, 127, 24, 30) > 10, "T4 con retrigs: sigue mostrando tiempos"); + + /* LEFT: columna derecha a transcurrido */ + key(K_LEFT, 1); key(K_LEFT, 0); + draw(); + dump(out, "t2_transcurrido"); + + /* PLAY no se toma; SRC cierra y pide redibujar */ + check(module_key(K_PLAY, 1) == 0, "PLAY sigue al OS"); + module_key(K_PLAY, 0); + int r0 = redraws; + check(module_key(K_SRC, 1) == 0 && redraws == r0 + 1, "SRC cierra y el OS redibuja"); + module_key(K_SRC, 0); + + printf("\n%d fallo(s)\n", fails); + return fails != 0; +} diff --git a/sdk/drafts/tiempos/unit.s b/sdk/drafts/tiempos/unit.s new file mode 100644 index 000000000..886cafcc8 --- /dev/null +++ b/sdk/drafts/tiempos/unit.s @@ -0,0 +1,17 @@ +| -- one linked unit. GNU as, ColdFire ISA A+ (m68k-elf-as). +| +| Symbols you `.global` here are what the manifest's Detours name. Absolute +| references to stock code are fine (`jsr (0x40001e50).l`); references to +| your own labels are resolved by the link wherever the build places this, +| so write `lea SYM:l,%a0` for a same-unit address you need as a pointer +| (a bare `lea SYM,%a0` assembles pc-relative -- correct, but four bytes +| shorter than a hand-assembled original if you are matching one). + .text + .global my_hook + +| A "jsr" detour lands here and expects an rts. A "jmp" detour's target +| must first REPLAY the instructions the six-byte jmp displaced, then jump +| back to site+6 (or wherever those instructions would have continued). +my_hook: + nop + rts diff --git a/sdk/drafts/tiempos/verify.py b/sdk/drafts/tiempos/verify.py new file mode 100644 index 000000000..b993d5b46 --- /dev/null +++ b/sdk/drafts/tiempos/verify.py @@ -0,0 +1,2 @@ +"""Replace with module-specific, meaningful behavior and resource gates.""" +raise SystemExit("[FAIL] Untested development scaffold: implement verification before qualification.") From 8761d1508a4931f01ae98f8573d158d1d39bce5a Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 28 Oct 2026 22:10:49 +0100 Subject: [PATCH 02/12] Tiempos draft: first results on an Octatrack MKI over USB README: USB-only limit, the CUE + MIDI line kept, and a track that has not played yet shows empty. TESTING: the base the MKI ran (24a0ed57, built from the local site at 976c6caf), two trials of 225a0170 (totals of a whole, trimmed and Flex track, tempo change, keys, as reported), and the DSP stall after USB DISK MODE that the unit's log recorded. Co-Authored-By: Claude Opus 5.5 --- sdk/drafts/tiempos/README.md | 6 +++-- sdk/drafts/tiempos/TESTING.md | 44 +++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/sdk/drafts/tiempos/README.md b/sdk/drafts/tiempos/README.md index 8159943c9..291c2b676 100644 --- a/sdk/drafts/tiempos/README.md +++ b/sdk/drafts/tiempos/README.md @@ -56,10 +56,12 @@ One stock gesture changes: ## Compatibility and limitations -- Octatrack MKI and MKII, OS 1.40C, with the Modwerk base over USB. It uses the base's tick, draw, key and encoder events, so card firmware cannot include it. +- USB only. Tiempos runs only on the Modwerk base, loaded over USB, on an Octatrack MKI or MKII with OS 1.40C. It uses the base's tick, draw, key and encoder events, and card firmware has no base, so card firmware cannot include it: take it out of a set before building card firmware. +- Changes one stock gesture: CUE + MIDI opens Tiempos instead of switching to the MIDI tracks (see [What changes in a stock flow](#what-changes-in-a-stock-flow)). - Declares one UI claim, the gesture CUE + MIDI on every page (`key:CUE+MIDI`). LEFT, RIGHT and NO act on its own screen only while it shows, which no other module draws, so they are not declared. - No effect slot, no DSP code, no stock-code sites. -- Not yet tested on a unit. It reads each voice's play position (voice record + 0x44) and its trim start and end (+ 0x28, + 0x2c). The emulator showed those values on a playing Static track; they must be confirmed on hardware. +- It reads each voice's play position (voice record + 0x44) and its trim start and end (+ 0x28, + 0x2c). On one MKI the totals of a whole Static, a trimmed Static and a Flex track matched the expected times, and followed a tempo change (reported by the author, see TESTING.md); the fields were not read directly on hardware. +- The voice copies the trim only when it starts, so a track that has not played since the project loaded shows as empty (dotted, `--:--`) until it plays. - The time played and the total length count from the sample's trim start, so a trimmed sample shows its trimmed length. - A looping track shows the time to the end of the sample, not to the end of the loop. - Until a track has played for half a second, its time is shown at the sample's original speed. diff --git a/sdk/drafts/tiempos/TESTING.md b/sdk/drafts/tiempos/TESTING.md index 4b78efb37..a688955c9 100644 --- a/sdk/drafts/tiempos/TESTING.md +++ b/sdk/drafts/tiempos/TESTING.md @@ -69,6 +69,50 @@ Every figure is within one second of the expected value (the display truncates t The draft first read the sample end at voice +0x30, which the emulator shows is 0 on a playing Static voice; it now reads the trim start (+0x28) and end (+0x2c) and measures time played and total from the trim start. +## Base on the unit + +Hardware results below come from the developer's Octatrack MKI, OS 1.40C, running a Modwerk base built and installed from a local `npm run dev` checkout of this branch (owner, #953). Not installed yet; fill in before the first hardware result: + +| What | Value | +| --- | --- | +| Unit | Octatrack MKI | +| OS the base was built from | 1.40C (developer's own `OCTATRACK_OS1.40C.bin`, SHA-256 `34695b60…99e1ad`, the file the site requires) | +| Checkout | branch `tiempos`, commit `976c6caf` (`npm run dev`, Vite 8.3.1, Node 24.22.1) | +| Base file | `Modwerk-octatrack-base-739c9d.bin`, 766,404 bytes, SHA-256 `739c9d4f…42259c89`, built in Chrome from the site's Setup page, 28 October 2026 | +| Base identity (as the unit reports it) | `24a0ed5729add7c3…` over USB (`npm run device -- status`), equal to `sdk/machines/octatrack/base-binding.json`; state normal, generation 0, no modules, no trial. A released base: it does not answer development requests (`mem`, `ui`, keys) | +| Installed | 28 October 2026, from the card (PROJECT → SYSTEM → OS UPGRADE). Reported by the developer: it starts, PROJECT shows MODWERK, the project loads and plays normally | + +## First session on the MKI (28 October 2026, base `24a0ed57…`, reported by the developer unless marked read) + +| What | Result | +| --- | --- | +| Base over USB | read: `OCTATRACK 1.40C`, base `24a0ed5729add7c3…`, normal, no modules | +| Trial of package `225a0170…` (`npm run device -- try … --seconds 1200`, not accepted) | read: running, UI ticks about 60 a second; ended after about 7.5 minutes with SIGINT, rolled back (generation 2, bare base) | +| CUE + MIDI, transport stopped | Tiempos opens; the unit does not switch to MIDI tracks (photo) | +| Rows with tracks 1-3 loaded (Static `T120.WAV`, Static `T120.WAV` trimmed 720,000-4,004,800, Flex `T100.WAV`), never played | all eight rows dotted with `--:--`; the active-track mark beside 2. Expected from the code: the voice's trim fields are filled only when a voice starts | +| PLAY | the sequencer stays on step 1, nothing sounds, with Tiempos open, closed, and after its rollback; with the USB session closed too. Not a Tiempos fault, cause not found; no project has played on this base on this unit | + +Not tested: playback, the voice fields, LEFT/RIGHT, NO, timing, Flex. + +The unit's own log (`npm run device -- do diaglog`, read after the trial), all in boot 1, so no power cycle since the install: at +431 s a `hot` incident, CPU 100 % with the transport stopped, tempo 120; then **stall record 1, reason 1 (DSP frames stopped) at UI tick 33,032**, about 550 s after the start. From the tick count at the first USB read, that is about 20:49, when the developer was in USB DISK MODE copying the test samples, before the Tiempos trial (about 20:57). The later five-minute records show 0-18 of 600 frames playing. The stall, not Tiempos, is the likely reason PLAY stays on step 1; whether USB DISK MODE caused it is not shown. After a power cycle (no USB DISK MODE since), PLAY runs the sequencer again (reported). The developer reports that this unit hangs after leaving USB DISK MODE; the developer reports it did so on the stock OS too, before the base. Also run by mistake that evening: `npm run device -- lifecycle`, which keeps and removes the base's test modules; the unit was left with no module (active identity `1030e7c9…`, the empty set). + +## Second trial on the MKI (28 October 2026, 22:01, base `24a0ed57…`, package `225a0170…`, not accepted; reported by the developer) + +After the power cycle, project `tiempos` at 120 BPM, trigs with condition 1ST on step 1 of tracks 1-3, a phone stopwatch started with PLAY. + +| What | Expected | Reported | +| --- | --- | --- | +| Track 1, Static `T120.WAV`, whole | total 2:08 | matches ("cuadra"), plays and sounds | +| Track 2, Static `T120.WAV` trimmed 720,000-4,004,800 (74.5 s) | total 1:14 | matches | +| Track 3, Flex `T100.WAV`, timestretch | total 2:08 (2:33 without) | matches | +| Last 30 seconds | time left flashes inverted | flashes | +| RIGHT, LEFT | ELAPSED and TOTAL notices, right column switches | works | +| NO | closes; the page underneath comes back | closes, the normal page comes back | +| T1, T3 with the screen open | the active-track mark moves to that row | moves | +| Tempo raised to 140 BPM while playing | totals 1:49, 1:03, 1:49 within about 2 s | changes correctly | + +Exact stopwatch figures at each track's end were not written down; "matches" is the developer's word. Not tested: minutes-long accuracy beyond one play of each sample, timestretch modes, Part changes and project reloads, a Keep and persistence across a power cycle, performance. The voice fields (+0x28, +0x2c, +0x44) were not read directly (released base, no `mem`): the totals of the whole, trimmed and Flex tracks are the indirect check. + ## Hardware and audio quality Not tested. Tiempos makes no sound. To run on a unit, in this order: From b7d77c81daad633b1e6b283e9227dfbf783885da Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 30 Oct 2026 20:57:04 +0100 Subject: [PATCH 03/12] Tiempos 0.1.0-experimental: move to modules, USB only, double press closes, MKI evidence Co-Authored-By: Claude Opus 5.5 --- sdk/catalog.json | 5 + sdk/drafts/tiempos/CHANGELOG.json | 11 -- sdk/drafts/tiempos/manifest.py | 76 -------- sdk/drafts/tiempos/octamod.module.json | 97 ---------- sdk/drafts/tiempos/runtime.json | 9 - sdk/drafts/tiempos/unit.s | 17 -- sdk/drafts/tiempos/verify.py | 2 - .../modules}/tiempos/LICENSE | 0 .../modules}/tiempos/README.md | 6 +- .../modules}/tiempos/TESTING.md | 96 +++++++--- .../modules}/tiempos/deck_font.h | 0 .../modules}/tiempos/deck_keys.h | 0 .../modules/tiempos/evidence/performance.json | 30 +++ sdk/octabam/modules/tiempos/manifest.py | 17 ++ .../modules/tiempos/octamod.module.json | 174 ++++++++++++++++++ .../modules}/tiempos/ot_state.h | 0 .../tiempos/presentation/thumbnail.svg | 0 .../tiempos/qualification.example.json | 0 .../tiempos/resource-impact.example.json | 0 .../modules}/tiempos/tiempos.c | 20 +- .../modules}/tiempos/tiempos_host.c | 19 ++ sdk/octabam/modules/tiempos/verify.py | 42 +++++ src/community/module-changelogs/tiempos.json | 13 ++ .../assets/octatrack-module-packages.json | 8 + 24 files changed, 400 insertions(+), 242 deletions(-) delete mode 100644 sdk/drafts/tiempos/CHANGELOG.json delete mode 100644 sdk/drafts/tiempos/manifest.py delete mode 100644 sdk/drafts/tiempos/octamod.module.json delete mode 100644 sdk/drafts/tiempos/runtime.json delete mode 100644 sdk/drafts/tiempos/unit.s delete mode 100644 sdk/drafts/tiempos/verify.py rename sdk/{drafts => octabam/modules}/tiempos/LICENSE (100%) rename sdk/{drafts => octabam/modules}/tiempos/README.md (93%) rename sdk/{drafts => octabam/modules}/tiempos/TESTING.md (52%) rename sdk/{drafts => octabam/modules}/tiempos/deck_font.h (100%) rename sdk/{drafts => octabam/modules}/tiempos/deck_keys.h (100%) create mode 100644 sdk/octabam/modules/tiempos/evidence/performance.json create mode 100644 sdk/octabam/modules/tiempos/manifest.py create mode 100644 sdk/octabam/modules/tiempos/octamod.module.json rename sdk/{drafts => octabam/modules}/tiempos/ot_state.h (100%) rename sdk/{drafts => octabam/modules}/tiempos/presentation/thumbnail.svg (100%) rename sdk/{drafts => octabam/modules}/tiempos/qualification.example.json (100%) rename sdk/{drafts => octabam/modules}/tiempos/resource-impact.example.json (100%) rename sdk/{drafts => octabam/modules}/tiempos/tiempos.c (90%) rename sdk/{drafts => octabam/modules}/tiempos/tiempos_host.c (85%) create mode 100644 sdk/octabam/modules/tiempos/verify.py create mode 100644 src/community/module-changelogs/tiempos.json diff --git a/sdk/catalog.json b/sdk/catalog.json index e03abb303..16bc159fc 100644 --- a/sdk/catalog.json +++ b/sdk/catalog.json @@ -166,6 +166,11 @@ "id": "beat-slicer", "version": "0.1.66-experimental", "addedAt": "2026-10-27T20:00:00Z" + }, + { + "id": "tiempos", + "version": "0.1.0-experimental", + "addedAt": "2026-10-30T12:00:00Z" } ] } diff --git a/sdk/drafts/tiempos/CHANGELOG.json b/sdk/drafts/tiempos/CHANGELOG.json deleted file mode 100644 index a0067ef7a..000000000 --- a/sdk/drafts/tiempos/CHANGELOG.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "version": "0.1.0-experimental", - "date": "2026-10-26", - "changes": [ - "First release: hold CUE and press MIDI to see the time left on all eight tracks.", - "The time left follows timestretch, repitch and tempo changes.", - "Known issue: not yet tested on a unit." - ] - } -] diff --git a/sdk/drafts/tiempos/manifest.py b/sdk/drafts/tiempos/manifest.py deleted file mode 100644 index 6cf68d954..000000000 --- a/sdk/drafts/tiempos/manifest.py +++ /dev/null @@ -1,76 +0,0 @@ -""" -- one line on what it changes in the firmware. - -THE SKELETON OF A COLDFIRE MODULE: code the build links and places for -you, reached from stock code by detours you name by SYMBOL. Copy this -directory to modules// and edit. Directories starting with `_` -are skipped by the registry, so this file is never built. - -modules/repitch/ is a finished one (one linked unit, detours, pokes); -modules/midi-scenes/ another (units built from the author's repository as -a submodule). docs/remixer/MODULES.md "Declaring a ColdFire -module" is the guide; docs/remixer/PLACEMENT.md says where the bytes go. - -Say what the module is, which stock routines it changes, what is measured -and what is inferred. Delete every comment below once answered. -""" - -from remix.schema import Category, Proof, Gate, Detour, Kind, Linked, Module, Poke -from remix.stock_guard import stock_guard - -MODULE = Module( - # `name` MUST equal the directory name. `key` is the build identifier and - # appears in the build report, which other tools parse -- so it is API. - name="tiempos", - key="TIEMPOS", - kind=Kind.CF_PATCH, # no DSP code, no chooser row - doc="One line, shown by `make modules`.", - category=Category.TRACK, author="imdantelo", author_url="https://github.com/imdantelo", - proof=Proof.UNTESTED, proof_note="Development scaffold; no module behavior has been verified.", - - # ---- the code: GNU-as units, linked by the build ---------------------- - # ORDER IS LINK ORDER: a unit may reference symbols of units before it. - # `dram=True` puts the unit in the platform runtime (linked with every - # other DRAM unit in the remix, appended behind the loader, depacked at - # boot into the platform's 10 MB reserve at the bottom of the audio - # page arena -- where anything bigger than a few hundred bytes - # belongs; the unit gives up 10 MB of sample memory). `dram=False` places - # it in one of the OS image's free zero runs (~8 KB, shared by everyone) - # for code that must be ROM-resident. Sources are `.s` for m68k-elf-as; - # `cpu="5407"` and "5475" encode this ISA subset identically. - linked=( - Linked("unit", "modules/tiempos/unit.s", dram=True), - # Building from someone else's repository? Add it as a submodule - # under modules//upstream and point `source` into it; the - # sources stay theirs and an update is a submodule bump. - # `reference=(addr, sha256)` re-links the unit at the AUTHOR'S own - # address on every build and compares, so a drift from the bytes - # they ratified fails loudly. - ), - - # ---- how stock code reaches it: detours, wired by symbol -------------- - # `site` is a stock instruction; `expect` its bytes (whole instructions, - # asserted before anything is written -- a site that has moved stops - # the build). `kind`: "jmp" for a stub that replays what it displaced - # and jumps on (the common case), "jsr" for a callable that returns, - # "lea" to rewrite a six-byte `lea abs.l,An`'s operand. `pad_to` nops - # the rest of a displaced span longer than six bytes. - detours=( - # Detour(0x400xxxxx, stock_guard(0x400xxxxx, 8, ""), "unit", "my_hook", - # "what this hook is for", kind="jsr", pad_to=None), - ), - - # ---- plain asserted rewrites ------------------------------------------ - pokes=( - # Poke(0x400xxxxx, expect=stock_guard(0x400xxxxx, 2, ""), - # write=bytes.fromhex("6012"), note="bne -> bra: never re-apply"), - ), - - gates=(Gate("modules/tiempos/verify.py", remix_arg=False),), - - # A stock pointer array that needs more entries: TableGrow relocates it - # into free space with your symbols appended and repoints every - # reference. - # tables=(TableGrow("...", old=0x400xxxxx, count=16, - # symbols=(("unit", "my_row"),), - # refs=((0x400xxxxx, 0x400xxxxx),)),), -) diff --git a/sdk/drafts/tiempos/octamod.module.json b/sdk/drafts/tiempos/octamod.module.json deleted file mode 100644 index 896578a4c..000000000 --- a/sdk/drafts/tiempos/octamod.module.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "schemaVersion": 2, - "id": "tiempos", - "key": "TIEMPOS", - "name": "Tiempos", - "version": "0.1.0-experimental", - "category": "system", - "author": { - "github": "imdantelo", - "credits": [ - "Diego Antelo Barba (design and specification)" - ] - }, - "nativeManifest": "manifest.py", - "presentation": { - "label": "TIME LEFT", - "family": "Display", - "summary": "One screen with the time left on all eight tracks, for playing long samples like a DJ.", - "overview": "Hold CUE and press MIDI to show every track on one screen: a bar of what is left to play, the real time left and the total length. The time left is measured from how fast each voice really plays, so it follows timestretch, repitch and tempo changes. It only reads and draws: no effect slot, no knob, and nothing in the project changes.", - "highlights": [ - "Time left for all eight tracks at once", - "Follows timestretch, repitch and tempo changes", - "The time left flashes in the last 30 seconds", - "Playback keys, track keys, encoders and the crossfader keep working while it shows" - ], - "usage": [ - "Hold CUE and press MIDI from any screen; do the same, or press NO, to close it.", - "LEFT or RIGHT switches the right column between total length and time played." - ] - }, - "controls": [], - "compatibility": { - "firmware": "1.40C", - "location": "Audio tracks", - "conflicts": [], - "uiClaims": [ - "key:CUE+MIDI" - ], - "limitations": [ - "Needs the Modwerk base over USB: it uses the base's draw and key events.", - "Not yet tested on a unit. The voice position (+0x44) and trim start and end (+0x28, +0x2c) were read in the emulator and must be confirmed on hardware.", - "Key codes for CUE, MIDI, LEFT and RIGHT follow Modwerk's status page and octabam's panel notes and worked in the emulator; to be confirmed on an MKI.", - "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", - "A track that loops shows the time left to the end of the sample, not to the end of the loop.", - "Until a track has played for half a second, its time is shown at the sample's original speed.", - "Thru, Neighbor and Pickup tracks show no time." - ], - "effectId": null - }, - "resources": { - "recorded": "Not measured", - "storage": { - "label": "Storage", - "display": "Not measured", - "value": null, - "unit": "unknown", - "method": "unmeasured", - "conditions": "No measurements exist yet. Add exact conditions and source evidence when available.", - "source": "TESTING.md" - }, - "processing": { - "label": "CPU / DSP load", - "display": "Not measured", - "value": null, - "unit": "unknown", - "method": "unmeasured", - "conditions": "No measurements exist yet. Add exact conditions and source evidence when available.", - "source": "TESTING.md" - } - }, - "tests": { - "report": "TESTING.md", - "summary": "Host tests only: 13 checks pass against simulated OS memory and a simulated 132 MHz timer. No unit has run it.", - "hardwareStatus": "untested", - "evidenceRevision": "b8deefc88b2c3e5f3c6158e364eb741df1924e1d", - "gates": [ - "Worst-case cycles under parameter modulation and maximum load", - "Exact memory region and maximum-instance totals", - "Owner-reviewed real-hardware evidence with actual coverage and limitations" - ] - }, - "license": { - "spdx": "GPL-3.0-or-later", - "file": "LICENSE", - "declaration": "Original code by the author, GPL-3.0-or-later. The 3x5 font is original. No Elektron firmware, extracted routines or tables." - }, - "media": [], - "access": { - "location": "Any screen: hold CUE and press MIDI.", - "steps": [ - "Install Tiempos with the Modwerk base over USB.", - "Load samples on some tracks and press PLAY.", - "Hold CUE and press MIDI. Hold CUE and press MIDI again, or press NO, to return to the page you were on." - ], - "screenshots": [] - } -} diff --git a/sdk/drafts/tiempos/runtime.json b/sdk/drafts/tiempos/runtime.json deleted file mode 100644 index 2ee80c488..000000000 --- a/sdk/drafts/tiempos/runtime.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "schema": 1, - "subscribe": [ - {"event": "module_tick", "fn": "module_tick"}, - {"event": "module_draw", "fn": "module_draw"}, - {"event": "module_key", "fn": "module_key"}, - {"event": "module_enc", "fn": "module_enc"} - ] -} diff --git a/sdk/drafts/tiempos/unit.s b/sdk/drafts/tiempos/unit.s deleted file mode 100644 index 886cafcc8..000000000 --- a/sdk/drafts/tiempos/unit.s +++ /dev/null @@ -1,17 +0,0 @@ -| -- one linked unit. GNU as, ColdFire ISA A+ (m68k-elf-as). -| -| Symbols you `.global` here are what the manifest's Detours name. Absolute -| references to stock code are fine (`jsr (0x40001e50).l`); references to -| your own labels are resolved by the link wherever the build places this, -| so write `lea SYM:l,%a0` for a same-unit address you need as a pointer -| (a bare `lea SYM,%a0` assembles pc-relative -- correct, but four bytes -| shorter than a hand-assembled original if you are matching one). - .text - .global my_hook - -| A "jsr" detour lands here and expects an rts. A "jmp" detour's target -| must first REPLAY the instructions the six-byte jmp displaced, then jump -| back to site+6 (or wherever those instructions would have continued). -my_hook: - nop - rts diff --git a/sdk/drafts/tiempos/verify.py b/sdk/drafts/tiempos/verify.py deleted file mode 100644 index b993d5b46..000000000 --- a/sdk/drafts/tiempos/verify.py +++ /dev/null @@ -1,2 +0,0 @@ -"""Replace with module-specific, meaningful behavior and resource gates.""" -raise SystemExit("[FAIL] Untested development scaffold: implement verification before qualification.") diff --git a/sdk/drafts/tiempos/LICENSE b/sdk/octabam/modules/tiempos/LICENSE similarity index 100% rename from sdk/drafts/tiempos/LICENSE rename to sdk/octabam/modules/tiempos/LICENSE diff --git a/sdk/drafts/tiempos/README.md b/sdk/octabam/modules/tiempos/README.md similarity index 93% rename from sdk/drafts/tiempos/README.md rename to sdk/octabam/modules/tiempos/README.md index 291c2b676..d7d88ea92 100644 --- a/sdk/drafts/tiempos/README.md +++ b/sdk/octabam/modules/tiempos/README.md @@ -30,13 +30,15 @@ Tiempos has no knobs. While its screen shows: | NO | Close the screen. | | LEFT or RIGHT | Switch the right column between total length and time played. A notice names the column (TOTAL or ELAPSED) for one second. | | SRC, AMP, LFO, FX1, FX2, BANK, PATTERN | Close the screen and reach the unit as usual. | -| Everything else | Reaches the unit as usual: PLAY, STOP, REC, track and trig keys, encoders, the crossfader. The screen stays. | +| A track key | Selects the track as usual; the screen stays. | +| The same track key twice within 0.4 s | Closes the screen. Both presses reach the unit, so it opens QUICK ASSIGN for that track, as a double press does on stock. | +| Everything else | Reaches the unit as usual: PLAY, STOP, REC, trig keys, encoders, the crossfader. The screen stays. | Closing the screen redraws the page that was underneath. ## Usage -Load whole tracks into Static slots on tracks 1 to 8 and start playback. Hold CUE and press MIDI from any page. Mix with the crossfader and the track keys as usual while the screen shows the time left. Close it with NO or CUE + MIDI when you need to edit. +Load whole tracks into Static slots on tracks 1 to 8 and start playback. Hold CUE and press MIDI from any page. Mix with the crossfader and the track keys as usual while the screen shows the time left. Close it with NO or CUE + MIDI when you need to edit, or press a track key twice to close it and open that track's QUICK ASSIGN. ## Quick tutorial diff --git a/sdk/drafts/tiempos/TESTING.md b/sdk/octabam/modules/tiempos/TESTING.md similarity index 52% rename from sdk/drafts/tiempos/TESTING.md rename to sdk/octabam/modules/tiempos/TESTING.md index a688955c9..2014e3a63 100644 --- a/sdk/drafts/tiempos/TESTING.md +++ b/sdk/octabam/modules/tiempos/TESTING.md @@ -2,23 +2,25 @@ ## Commands and exact revision -Source: `sdk/drafts/tiempos/` on branch `tiempos`, draft of 26 October 2026, on Modwerk `main` at `d2d517a8` (with #949's ColdFire checks for C runtime modules). Built in `modwerk-source-tools` image `sha256:aa3916ed6ae4…`. +Source: `sdk/octabam/modules/tiempos/` on branch `tiempos`, on Modwerk `main` at `886098f5` (merged 30 October 2026). Packages built with m68k-elf-gcc 16.2.0 (Homebrew), the same compiler as the pinned `modwerk-source-tools` image, which rebuilt the 26 October package byte for byte. ```sh -# ColdFire package, in the pinned toolchain image (m68k-elf-gcc 16.2.0), with #949's late-combine and MCF54455 index checks -docker run --rm --network none -v "$PWD":/src:ro -v ~/.cache/tiempos-build:/out modwerk-source-tools \ - sh -c 'cd /src && python3 -B sdk/runtime/loader/build.py sdk/drafts/tiempos/tiempos.c -o /out/tiempos.mwrm --cross m68k-elf-' -# -> module 31282ae5, 2156 bytes of code and data, 268 of bss, 33 relocations, 4 hooks, 0 stock-code sites -# SHA-256 225a0170382915f749315e26f4dbf97d4e0c4a047bf85bd347fb0e1bbe35d53e - -# Host tests (simulated OS memory, simulated 132 MHz timer, 60 ticks a second) -cc -Wall -Wextra -DDECK_HOST -I sdk/drafts/tiempos -I sdk/runtime/loader -o tiempos_host \ - sdk/drafts/tiempos/tiempos_host.c sdk/drafts/tiempos/tiempos.c -lm && ./tiempos_host OUT_DIR +# ColdFire package (ABI 4: the four core hooks, no site events, no stock-code sites) +python3 -B sdk/runtime/loader/build.py sdk/octabam/modules/tiempos/tiempos.c -o tiempos.mwrm +# Host tests and the package check (simulated OS memory, simulated 132 MHz timer, 60 ticks a second) +python3 -B sdk/octabam/modules/tiempos/verify.py ``` +| Package | Source | Bytes | SHA-256 | Where it ran | +| --- | --- | --- | --- | --- | +| `225a0170…` | before the double press | 2,336 (2,156 code and data, 268 BSS, 33 relocations) | `225a0170382915f749315e26f4dbf97d4e0c4a047bf85bd347fb0e1bbe35d53e` | emulator 26 October; MKI 28 and 30 October | +| `0506a245…` | with the double press on a track key (current) | 2,444 (2,240 code and data, 272 BSS, 39 relocations) | `0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7` | MKI 30 October (fourth trial, USB lifecycle, load trial) | + +Hook words of `0506a245…`: `module_tick` 0x1ca, `module_draw` 0x2d0, `module_key` 0x6e6, `module_enc` 0x81e; none after the core four. + ## Host results -13 of 13 pass, no compiler warnings: +16 of 16 pass on `0506a245…`, no compiler warnings (`-Werror`): | Check | Result | | --- | --- | @@ -35,6 +37,9 @@ cc -Wall -Wextra -DDECK_HOST -I sdk/drafts/tiempos -I sdk/runtime/loader -o tiem | Flex loop retriggered five times: times still shown | pass | | PLAY reaches the unit | pass | | SRC closes the screen and the unit redraws its page | pass | +| Track key T3 twice, 500 ms apart: both reach the unit, the screen stays | pass | +| T4, then T3 200 ms later: both reach the unit, the screen stays | pass | +| T3 twice within 250 ms: both reach the unit, the screen closes and the unit redraws | pass | ## Emulator results @@ -71,7 +76,7 @@ The draft first read the sample end at voice +0x30, which the emulator shows is ## Base on the unit -Hardware results below come from the developer's Octatrack MKI, OS 1.40C, running a Modwerk base built and installed from a local `npm run dev` checkout of this branch (owner, #953). Not installed yet; fill in before the first hardware result: +Hardware results below come from the developer's Octatrack MKI, OS 1.40C, running a Modwerk base built and installed from a local `npm run dev` checkout of this branch (owner, #953). | What | Value | | --- | --- | @@ -113,31 +118,68 @@ After the power cycle, project `tiempos` at 120 BPM, trigs with condition 1ST on Exact stopwatch figures at each track's end were not written down; "matches" is the developer's word. Not tested: minutes-long accuracy beyond one play of each sample, timestretch modes, Part changes and project reloads, a Keep and persistence across a power cycle, performance. The voice fields (+0x28, +0x2c, +0x44) were not read directly (released base, no `mem`): the totals of the whole, trimmed and Flex tracks are the indirect check. -## Hardware and audio quality +## Third trial on the MKI (30 October 2026, 19:29-19:59, base `24a0ed57…`, package `225a0170…`, not accepted; reported by the developer, photos checked) -Not tested. Tiempos makes no sound. To run on a unit, in this order: +Project `tiempos`, samples as the developer later confirmed them: track 1 `T100.WAV`, track 2 `T120.WAV` **without** the trim this time (the trim was checked on 28 October), track 3 `T140.WAV`. Tiempos' own reading of track 1's speed agrees: 61,742 frames a second at 140 BPM (read over USB as the module's test value, 0xf12e), which is 44,100 × 140/100. The earlier sessions' notes named the samples differently (track 1 `T120.WAV`, track 3 Flex `T100.WAV`); the 28 October reading of 52,922 frames a second at 120 BPM (0xceba) is also 44,100 × 120/100, so track 1 most likely held `T100.WAV` then too. All three tones are 64 bars, so the expected totals are the same either way. The trial ended by its own timer and rolled back (read: generation 2, bare base). Photos are kept outside Git. -1. Confirm the key codes: with Tiempos installed, CUE + MIDI opens it, LEFT and RIGHT switch the column, NO closes it, and SRC, AMP, LFO, FX1, FX2, BANK and PATTERN close it. -2. Read voice record + 0x44 twice, one second apart, while track 1 plays at its original tempo: it must grow by about 44,100. -3. Compare voice record + 0x28 and + 0x2c with the sample's trim start and end (frames), with and without a trim in the audio editor. -4. Play three long Static tracks at different tempos and compare each time left with a stopwatch over five minutes. -5. Change tempo, switch timestretch modes, retrigger a Flex loop, change Part and reload the project with the screen open and closed. +| What | Expected | Reported | +| --- | --- | --- | +| 120 BPM, all three tracks | total 2:08, all three end together | the three lasted the same and matched 2:08; stopwatch time not written down | +| 140 BPM, tempo set while stopped, then PLAY | totals 1:49 | 1:49 on all three (photo) | +| 140 BPM, stopwatch 0:24.28 (lap 0:24.25) | time left about 1:24-1:25, elapsed about 0:24-0:25 | 1:25 left and 0:24 ELAPSED on all three (photo). The stopwatch started 1-2 s after PLAY: at 0:00 the screen already showed 1:48 left (photo) | +| Last 30 seconds | flashes | tracks 2 and 3 inverted at stopwatch 1:22 (photo) | +| Track 1 retriggered by hand with a trig at about 0:48 | counts again from the start | 1:15 left at stopwatch 1:22 (photo), as expected from a restart about 34 s earlier | +| Track 3 (Flex, LOOP on) reaching its end | starts again | restarted by itself; what Tiempos showed at that moment was not noted | -## Stock flows +At 0:24 the screen's elapsed time (0:24, left 1:25 of 1:49) trails the stopwatch-based estimate (0:25-0:26) by up to about a second; the start of the stopwatch is only known to 1-2 s, and the display truncates to whole seconds. + +## Fourth trial on the MKI (30 October 2026, from 20:07, base `24a0ed57…`, package `0506a245…`, not accepted; reported by the developer, one photo) + +| What | Expected | Reported | +| --- | --- | --- | +| STOP, tempo 140, PLAY | stock: playback resumes where it stopped until a trig restarts the track | as stock | +| T2 once, screen open | the track is selected, the screen stays | selected, the screen stays | +| T3 twice quickly | the screen closes; both presses reach the unit | Tiempos closes and stock's QUICK ASSIGN opens on track 3's Flex slot list (photo): the stock double press, which both presses reach. Kept on purpose (the developer's choice): no stock gesture changes | +| T1, about a second, T1 | the screen stays | stays | -Compared in the emulator with and without Tiempos (above): CUE + MIDI switches to MIDI tracks on stock and opens Tiempos with it installed. With the screen open, LEFT, RIGHT and NO act on the screen. Not compared: every other key while the screen is open, on a unit. +Not reported in this trial: the totals at 140 BPM after PLAY. -## Performance +## USB lifecycle on the MKI (30 October 2026, base `24a0ed57…`, package `0506a245…`) -Not measured. Closed, each tick reads three words and a byte per track; open, each composition clears and redraws the 1 KB frame pixel by pixel. To measure with the development base's profile (`modwerk_cost`), stopped and playing, open and closed. +| Step | Result | +| --- | --- | +| Install with Keep (`npm run device -- try … --seconds 10 --accept`) | read: 10 s trial, accepted; generation 5, active `0506a24500c2aa17…` | +| Power cycle (the developer) | read: the boot's log records the saved set restored with one module, `31282ae5` (Tiempos), 5 s after the start (`set a=1 [31282ae5]`); `status` then reports the bare base identity, as the base does after a restore until the next sync. Reported: the project plays and CUE + MIDI opens Tiempos | +| Undo (`npm run device -- remove … --accept`) | read: accepted, slot empty; generation 1, active `75b95b9e…` (the empty set) | + +Not tested: a power cycle after the Undo, the site's guided sync, a set with other modules beside Tiempos. + +## Load on the MKI (30 October 2026, the base's MODWERK > LOAD page, reported by the developer, one photo) + +| Condition | Working now: CPU | Working now: tracks 1-4 | Working now: tracks 5-8 | DSP space used: tracks 1-4 / 5-8 | +| --- | --- | --- | --- | --- | +| Tiempos installed, closed, stopped | 45 % | 33 % | 42 % | 32 % / 37 % | +| Tiempos installed, just closed after being open, playing (photo) | 52 % | 33 % | 42 % | 32 % / 37 % | +| Tiempos removed, stopped | 45 % | 33 % | 42 % | 32 % / 37 % | +| Tiempos removed, playing | 53 % | 33 % | 42 % | 32 % / 37 % | +| No Tiempos, three tracks playing (peak) | 64 % | 33 % | 42 % | 32 % / 37 % | +| Tiempos in trial (`0506a245…`), three tracks playing, open for about a minute, read on LOAD just after closing | 62 % | 33 % | 42 % | 32 % / 37 % | + +Closed, Tiempos adds no load the page shows. The base's five-minute record for the first minutes after the power cycle (Tiempos installed, including the boot and the set's restore) reads CPU 45.5 % mean, 94.9 % peak and a UI tick gap of 1,901 frames; the boot is the likely cause, not separated here. Open, it stays within the stock range: 62 % read just after closing against a 64 % peak without Tiempos, with three tracks playing (LOAD cannot be shown while Tiempos holds the screen). During that trial the base's tick count grew 60 per second without gaps and Tiempos measured T1 at 0xf12c–0xf136 frames per second, as on 30 October. The base's five-minute records agree: minutes 15–20 (no Tiempos, three tracks) CPU 51.3 % mean / 64.7 % peak, tick gap 69 frames, playing 261/600; minutes 20–25 (mostly the trial, Tiempos opened and closed) 51.1 % / 62.7 %, tick gap 63 frames, playing 228/600; tracks 1-4 and 5-8 unchanged at 32.7–32.8 % and 41.9 %. The trial rolled back by itself after 420 s (generation 3, active `75b95b9e…`); no new stall record. The 28 October records near 1.5 % CPU were taken while the DSPs were stalled and are no baseline. -## Resources +## Hardware and audio quality + +Tiempos makes no sound. On the MKI with the released base `24a0ed57…` (above): CUE + MIDI, LEFT, RIGHT, NO, track keys and the double press as described; totals, time left, the last-30-seconds flash, a hand retrigger, trimmed and Flex tracks and tempo changes against the stopwatch and the expected 64-bar times. The voice fields were not read directly (a released base answers no `mem` request): the totals are the indirect check. + +Not tested: an MKII; timestretch modes other than NORMAL; Part changes and project reloads with the screen open; minutes-long accuracy beyond one play of each 64-bar sample; SRC, AMP, LFO, FX1, FX2, BANK and PATTERN closing the screen on a unit (emulator only); a set with other modules beside Tiempos. + +## Stock flows -Unmeasured. Package: 2,156 bytes of code and data and 268 bytes of BSS (pinned toolchain build above). No DSP code, no effect slot, no DSP memory. +On the unit, with Tiempos installed: PLAY, STOP, TEMPO and track keys behave as stock with the screen open; a double press of a track key closes Tiempos and the unit opens its own QUICK ASSIGN, as on stock. In the emulator: CUE + MIDI switches to MIDI tracks on stock and opens Tiempos with it installed, and again after removal. Not compared on a unit: every other key while the screen is open. -## Hardware +## Performance and resources -Not tested. +Package `0506a245…`: 2,240 bytes of code and data, 272 bytes of BSS. No DSP code, no effect slot, no DSP memory; the DSP load and space on LOAD are the same with and without it (above). ColdFire load: no change the LOAD page or the base's five-minute records show, closed or open (above). Cycles per tick not measured: the released base has no `modwerk_cost` profile. ## OT UI capture evidence diff --git a/sdk/drafts/tiempos/deck_font.h b/sdk/octabam/modules/tiempos/deck_font.h similarity index 100% rename from sdk/drafts/tiempos/deck_font.h rename to sdk/octabam/modules/tiempos/deck_font.h diff --git a/sdk/drafts/tiempos/deck_keys.h b/sdk/octabam/modules/tiempos/deck_keys.h similarity index 100% rename from sdk/drafts/tiempos/deck_keys.h rename to sdk/octabam/modules/tiempos/deck_keys.h diff --git a/sdk/octabam/modules/tiempos/evidence/performance.json b/sdk/octabam/modules/tiempos/evidence/performance.json new file mode 100644 index 000000000..aab175549 --- /dev/null +++ b/sdk/octabam/modules/tiempos/evidence/performance.json @@ -0,0 +1,30 @@ +{ + "schema": 1, + "module": "tiempos", + "version": "0.1.0-experimental", + "kind": "coldfire", + "cycles": { + "unit": "cycles/event", + "static": null, + "measured": 1133300, + "budget": 4330000, + "method": "An event is one composed screen frame while Tiempos is open: module_draw clears and redraws the 128x64 frame on the UI task, not in an interrupt; closed it returns at once. Emulator, not hardware: ot_emu (octabam dcf93d3, adapted by scripts/octatrack-emulator/build.py), MKI panel, development base 6a44c813 (26 Oct 2026), package 0506a245, 30 Oct 2026. The base's modwerk_cost read twice 10 s apart: runtime module draw [22] 12.5 us a tick with no module, 18.8 us installed and closed, 260.6 us open and stopped, 314.6 us open and playing, with all eight rows empty in that project; runtime tick [1] 15.0 us with no module, 16.1-17.9 us with Tiempos (all eight voices read every tick, open or closed). Worst case estimated, not measured: the host build counts 341 pixel writes a draw for eight empty rows and 4,653 for eight playing rows in their last 30 s (the dearest layout), and 314.6 x 4,653 / 341 = 4,293 us, 1,133,300 cycles at 264 MHz; this scales the whole draw, frame clear included, by the pixel count, so it overstates. No static bound. Budget: one UI tick, 16.4 ms at 61 ticks a second (4,330,000 cycles). On the developer's MKI (released base 24a0ed57, which has no modwerk_cost) the CPU on MODWERK > LOAD read 62 % just after a minute open with three tracks playing, against a 64 % peak without Tiempos, and the base's five-minute records read 51.1 % mean / 62.7 % peak with the trial against 51.3 % / 64.7 % without it (TESTING.md)." + }, + "load": { + "frameUs": 362.8, + "stockLongestUs": null, + "moduleLongestUs": null, + "stockIdlePercent": null, + "moduleIdlePercent": null, + "method": "No cfmeter.py capture and no frame-guard reading: the developer's MKI runs the released base 24a0ed57, which answers no development request. Tiempos adds nothing to the frame interrupt (it has no frame, MIDI or DSP hook: only the core's tick, draw, key and encoder hooks on the UI task). On that unit, the base's MODWERK > LOAD page and five-minute records, three tracks playing: CPU 51.3 % mean / 64.7 % peak without Tiempos (minutes 15-20), 51.1 % / 62.7 % with Tiempos in trial and opened for about a minute (minutes 20-25); DSP load tracks 1-4 / 5-8 32.7-32.8 % / 41.9 % and DSP space 32 % / 37 % in both; the UI tick gap 69 frames without, 63 with." + }, + "stress": { + "floodMessagesPerSecond": null, + "clockBpm": null, + "seconds": null, + "stuckNotes": null, + "hangs": null, + "dropped": null, + "droppedExplanation": "No MIDI flood ran: Tiempos has no MIDI path and nothing on this Mac sends MIDI. Instead three tracks played for about seven minutes with the screen opened and closed, tempo changes and retriggers, on the developer's MKI: the base's tick count grew 60 a second without a gap and no stall was recorded (TESTING.md)." + } +} diff --git a/sdk/octabam/modules/tiempos/manifest.py b/sdk/octabam/modules/tiempos/manifest.py new file mode 100644 index 000000000..bcc086fcc --- /dev/null +++ b/sdk/octabam/modules/tiempos/manifest.py @@ -0,0 +1,17 @@ +"""TIEMPOS: the time left on all eight audio tracks, on one screen behind CUE + MIDI. + +A C runtime module (tiempos.c) on the base's four core hooks (module_tick, module_draw, module_key, module_enc). +It reads each voice's play position and trim, measures how fast the position moves against the 132 MHz timer and +draws its own screen; the package holds no stock-code site. It has no card form: its USB package is built from its +row in src/engine/assets/octatrack-module-packages.json, and verify.py checks it. +""" +from remix.schema import Category, Proof, Gate, Kind, Module + +MODULE = Module( + name="tiempos", key="TIEMPOS", kind=Kind.CF_PATCH, + doc="The time left on all eight audio tracks, measured from how fast each voice plays.", + category=Category.TRACK, author="imdantelo", author_url="https://github.com/imdantelo", + proof=Proof.UNTESTED, + proof_note="USB package only; host and package checks in verify.py, hardware results in TESTING.md.", + gates=(Gate("modules/tiempos/verify.py", remix_arg=False),), +) diff --git a/sdk/octabam/modules/tiempos/octamod.module.json b/sdk/octabam/modules/tiempos/octamod.module.json new file mode 100644 index 000000000..4944b0444 --- /dev/null +++ b/sdk/octabam/modules/tiempos/octamod.module.json @@ -0,0 +1,174 @@ +{ + "schemaVersion": 2, + "id": "tiempos", + "key": "TIEMPOS", + "name": "Tiempos", + "version": "0.1.0-experimental", + "category": "system", + "author": { + "github": "imdantelo", + "credits": [ + "Diego Antelo Barba (design and specification)" + ] + }, + "nativeManifest": "manifest.py", + "presentation": { + "label": "TIME LEFT", + "family": "Display", + "summary": "One screen with the time left on all eight tracks, for playing long samples like a DJ.", + "overview": "Hold CUE and press MIDI to show every track on one screen: a bar of what is left to play, the real time left and the total length. The time left is measured from how fast each voice really plays, so it follows timestretch, repitch and tempo changes. It only reads and draws: no effect slot, no knob, and nothing in the project changes.", + "highlights": [ + "Time left for all eight tracks at once", + "Follows timestretch, repitch and tempo changes", + "The time left flashes in the last 30 seconds", + "Playback keys, track keys, encoders and the crossfader keep working while it shows" + ], + "usage": [ + "Hold CUE and press MIDI from any screen; do the same, or press NO, to close it.", + "LEFT or RIGHT switches the right column between total length and time played." + ] + }, + "controls": [], + "compatibility": { + "firmware": "1.40C", + "location": "Audio tracks", + "conflicts": [], + "uiClaims": [ + "key:CUE+MIDI" + ], + "limitations": [ + "Needs the Modwerk base over USB: it uses the base's draw and key events.", + "Not yet tested on a unit. The voice position (+0x44) and trim start and end (+0x28, +0x2c) were read in the emulator and must be confirmed on hardware.", + "Key codes for CUE, MIDI, LEFT and RIGHT follow Modwerk's status page and octabam's panel notes and worked in the emulator; to be confirmed on an MKI.", + "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", + "A track that loops shows the time left to the end of the sample, not to the end of the loop.", + "Until a track has played for half a second, its time is shown at the sample's original speed.", + "Thru, Neighbor and Pickup tracks show no time." + ], + "effectId": null + }, + "resources": { + "recorded": "Not measured", + "storage": { + "label": "Storage", + "display": "Not measured", + "value": null, + "unit": "unknown", + "method": "unmeasured", + "conditions": "No measurements exist yet. Add exact conditions and source evidence when available.", + "source": "TESTING.md" + }, + "processing": { + "label": "CPU / DSP load", + "display": "Not measured", + "value": null, + "unit": "unknown", + "method": "unmeasured", + "conditions": "No measurements exist yet. Add exact conditions and source evidence when available.", + "source": "TESTING.md" + } + }, + "tests": { + "report": "TESTING.md", + "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes and the double press that closes it; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 16/16. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", + "hardwareStatus": "reported", + "gates": [ + "modules/tiempos/verify.py" + ], + "qualification": { + "moduleVersion": "0.1.0-experimental", + "sourceSha256": "fa47d8783bcb42b636514d6e256fad6ce2022e8e66d7ebd18a9236ed28f03b85", + "imageSha256": "0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7", + "cycles": [ + { + "processor": "coldfire", + "worstCase": 1133300, + "maxConfiguration": 1133300, + "maxInstances": 1, + "budget": 4330000, + "unit": "cycles/event", + "method": "emulator", + "conditions": { + "parameterExtremes": "Not applicable: no parameters. The dearest layout, eight playing rows in their last 30 s, is estimated from the host build's pixel count (4,653 writes against 341 for eight empty rows).", + "parameterModulation": "Not applicable: LEFT and RIGHT switch the right column; the draw cost does not depend on it.", + "modeSwitching": "Closed and open, stopped and playing, in the emulator; opened and closed while three tracks played on the MKI.", + "maxLoad": "One instance. The cost is the screen's draw on the UI task, once per composed frame while open; closed it draws nothing. Budget: one UI tick, 16.4 ms at 61 ticks a second, 4,330,000 cycles at 264 MHz.", + "inputConditions": "ot_emu with development base 6a44c813: modwerk_cost[22] (runtime module draw) 314.6 us a tick open and playing with eight empty rows, scaled by the pixel count to 4,293 us (1,133,300 cycles at 264 MHz), an overstatement. No static bound; not measured on hardware." + }, + "report": "evidence/performance.json" + } + ], + "memory": { + "regions": [ + { + "name": "ColdFire code and data (tiempos.c, deck_font.h, DRAM)", + "space": "sdram", + "words": 2240, + "wordBits": 8, + "bytes": 2240, + "scope": "shared" + }, + { + "name": "State (bss): eight track records, screen and key state", + "space": "sdram", + "words": 272, + "wordBits": 8, + "bytes": 272, + "scope": "shared" + } + ], + "perInstanceBytes": 0, + "sharedBytes": 2512, + "maxInstances": 1, + "totalBytes": 2512, + "conditions": "From the USB package header (2,240 bytes of code and data, 272 of bss, 39 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", + "report": "TESTING.md" + }, + "hardware": { + "kind": "functional", + "status": "reported", + "model": "MKI", + "testedOn": "2026-10-30", + "tester": "imdantelo", + "sourceRevision": "", + "imageSha256": "0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7", + "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger.", + "limitations": [ + "One MKI; no MKII.", + "The stopwatch figures come from the developer's photos and readings; the voice fields were not read directly (a released base answers no mem request).", + "Part changes, project reloads, timestretch modes other than NORMAL and other modules beside Tiempos were not run.", + "Draw cost estimated in the emulator, not measured on the unit; no static bound and no MIDI flood." + ], + "report": "TESTING.md" + }, + "documentation": { + "tutorial": { + "title": "Quick tutorial: see how long every track has left", + "steps": [ + "Load long samples on audio tracks and press PLAY.", + "Hold CUE and press MIDI: Tiempos shows all eight tracks, with the time left in the middle column.", + "Press LEFT or RIGHT to switch the right column between total length and time elapsed.", + "Press NO, CUE + MIDI, or the same track key twice to go back to the page you were on." + ] + }, + "screenshots": [], + "screenshotStyle": "black-and-white" + } + } + }, + "license": { + "spdx": "GPL-3.0-or-later", + "file": "LICENSE", + "declaration": "Original code by the author, GPL-3.0-or-later. The 3x5 font is original. No Elektron firmware, extracted routines or tables." + }, + "media": [], + "access": { + "location": "Any screen: hold CUE and press MIDI.", + "steps": [ + "Install Tiempos with the Modwerk base over USB.", + "Load samples on some tracks and press PLAY.", + "Hold CUE and press MIDI. Hold CUE and press MIDI again, or press NO, to return to the page you were on." + ], + "screenshots": [] + } +} diff --git a/sdk/drafts/tiempos/ot_state.h b/sdk/octabam/modules/tiempos/ot_state.h similarity index 100% rename from sdk/drafts/tiempos/ot_state.h rename to sdk/octabam/modules/tiempos/ot_state.h diff --git a/sdk/drafts/tiempos/presentation/thumbnail.svg b/sdk/octabam/modules/tiempos/presentation/thumbnail.svg similarity index 100% rename from sdk/drafts/tiempos/presentation/thumbnail.svg rename to sdk/octabam/modules/tiempos/presentation/thumbnail.svg diff --git a/sdk/drafts/tiempos/qualification.example.json b/sdk/octabam/modules/tiempos/qualification.example.json similarity index 100% rename from sdk/drafts/tiempos/qualification.example.json rename to sdk/octabam/modules/tiempos/qualification.example.json diff --git a/sdk/drafts/tiempos/resource-impact.example.json b/sdk/octabam/modules/tiempos/resource-impact.example.json similarity index 100% rename from sdk/drafts/tiempos/resource-impact.example.json rename to sdk/octabam/modules/tiempos/resource-impact.example.json diff --git a/sdk/drafts/tiempos/tiempos.c b/sdk/octabam/modules/tiempos/tiempos.c similarity index 90% rename from sdk/drafts/tiempos/tiempos.c rename to sdk/octabam/modules/tiempos/tiempos.c index 22f1da2be..7dbbde30f 100644 --- a/sdk/drafts/tiempos/tiempos.c +++ b/sdk/octabam/modules/tiempos/tiempos.c @@ -16,7 +16,8 @@ * * Teclas (deck_keys.h): CUE + MIDI abre y cierra · NO cierra · LEFT / RIGHT cambian * la columna derecha (duración total / tiempo transcurrido) · páginas, BANK y - * PATTERN cierran y llegan al OS · todo lo demás sigue yendo al OS. + * PATTERN cierran y llegan al OS · dos pulsaciones de la misma tecla de pista en + * menos de 400 ms cierran y llegan al OS · todo lo demás sigue yendo al OS. * * Fila de cada pista (8 px de alto, 8 filas): * x 0-8 número: relleno = suena; contorno = cargada y parada; punteado = vacía @@ -39,6 +40,7 @@ #define RIGHT_END 127 #define WINDOW_MS 500u /* ventana de medida de la velocidad */ #define BLINK_SECS 30u +#define DOUBLE_MS 400u /* dos pulsaciones de la misma pista: cierra */ /* ---------------------------------------------------------------- dibujo */ static unsigned char *fb; @@ -98,6 +100,8 @@ struct track { static struct track tr[TRACKS]; static int open, show_elapsed, cue_held, taken_key = -1; +static int last_track_key = -1; /* última tecla de pista pulsada con la pantalla abierta */ +static uint32_t last_track_at; /* su instante, en cuentas del temporizador de 132 MHz */ static uint32_t ticks; static uint8_t cur_track; static uint32_t toast_until; @@ -233,10 +237,24 @@ int module_key(int code, int pressed) } if (code == K_OPEN && cue_held) { if (open) close_view(); else open = 1; + last_track_key = -1; taken_key = code; return 1; } if (!open) return 0; + /* Pista: una pulsación la selecciona y la pantalla sigue; la segunda de la misma + * pista en menos de DOUBLE_MS cierra. Las dos llegan al OS. */ + if (code >= K_TRACK1 && code <= K_TRACK8) { + uint32_t now = RD32(OT_DTCN3); + if (code == last_track_key && now - last_track_at < DOUBLE_MS * OT_DTCN3_PER_MS) { + last_track_key = -1; + close_view(); + return 0; + } + last_track_key = code, last_track_at = now; + return 0; + } + last_track_key = -1; if (code == K_NO) { close_view(); taken_key = code; return 1; } if (code == K_LEFT || code == K_RIGHT) { show_elapsed = !show_elapsed, toast_until = ticks + 75u; taken_key = code; return 1; } if ((code >= K_SRC && code <= K_FX2) || code == K_BANK || code == K_PATTERN) { close_view(); return 0; } diff --git a/sdk/drafts/tiempos/tiempos_host.c b/sdk/octabam/modules/tiempos/tiempos_host.c similarity index 85% rename from sdk/drafts/tiempos/tiempos_host.c rename to sdk/octabam/modules/tiempos/tiempos_host.c index f0f498e07..50f5e3410 100644 --- a/sdk/drafts/tiempos/tiempos_host.c +++ b/sdk/octabam/modules/tiempos/tiempos_host.c @@ -153,6 +153,25 @@ int main(int argc, char **argv) check(module_key(K_SRC, 1) == 0 && redraws == r0 + 1, "SRC cierra y el OS redibuja"); module_key(K_SRC, 0); + /* Teclas de pista con la pantalla abierta: llegan siempre al OS; una sola deja la + * pantalla, dos de la misma pista en menos de 400 ms la cierran. */ + key(K_CUE, 1); key(K_MIDI, 1); key(K_MIDI, 0); key(K_CUE, 0); + int pass = module_key(K_TRACK1 + 2, 1) == 0; module_key(K_TRACK1 + 2, 0); + run(0.5); + pass &= module_key(K_TRACK1 + 2, 1) == 0; module_key(K_TRACK1 + 2, 0); + draw(); + check(pass && frame[0] != 0xA5, "T3 dos veces con 500 ms entre medias: llega al OS y la pantalla sigue"); + pass = module_key(K_TRACK1 + 3, 1) == 0; module_key(K_TRACK1 + 3, 0); + run(0.2); + pass &= module_key(K_TRACK1 + 2, 1) == 0; module_key(K_TRACK1 + 2, 0); + draw(); + check(pass && frame[0] != 0xA5, "T4 y luego T3 en 200 ms: llegan al OS y la pantalla sigue"); + r0 = redraws; + run(0.25); + pass = module_key(K_TRACK1 + 2, 1) == 0; module_key(K_TRACK1 + 2, 0); + draw(); + check(pass && frame[0] == 0xA5 && redraws == r0 + 1, "T3 dos veces en 250 ms: llega al OS, cierra y el OS redibuja"); + printf("\n%d fallo(s)\n", fails); return fails != 0; } diff --git a/sdk/octabam/modules/tiempos/verify.py b/sdk/octabam/modules/tiempos/verify.py new file mode 100644 index 000000000..c5590ff3c --- /dev/null +++ b/sdk/octabam/modules/tiempos/verify.py @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: GPL-3.0-or-later +"""Tiempos: the C module and its USB package. + +1. tiempos_host.c: the module against simulated OS memory and a simulated 132 MHz timer on the host (13 checks: + the stock frame left alone while closed, CUE + MIDI, the measured speed, the row marks, the last 30 seconds, + a tempo change, a retriggered Flex loop, PLAY and SRC reaching the unit). +2. The package build.py makes from the sources is byte for byte the published one + (src/engine/assets/octatrack-module-packages.json). +Needs a host C compiler, and m68k-elf-gcc for the package; host-only checks still run without it. +""" +from pathlib import Path +import hashlib +import json +import shutil +import subprocess +import sys +import tempfile + +HERE = Path(__file__).resolve().parent +ROOT = HERE.parents[3] + +with tempfile.TemporaryDirectory() as folder: + host = Path(folder) / 'tiempos_host' + subprocess.run(['cc', '-Wall', '-Wextra', '-Werror', '-DDECK_HOST', '-I', str(HERE), '-I', str(ROOT / 'sdk/runtime/loader'), + '-o', str(host), str(HERE / 'tiempos_host.c'), str(HERE / 'tiempos.c'), '-lm'], check=True) + subprocess.run([str(host), folder], check=True) +if not shutil.which('m68k-elf-gcc'): + sys.exit('[SKIP] package: no m68k-elf-gcc here; the host checks passed.') +row = next(r for r in json.loads((ROOT / 'src/engine/assets/octatrack-module-packages.json').read_text())['packages'] + if r['id'] == 'tiempos') +with tempfile.TemporaryDirectory() as folder: + out = Path(folder) / 'tiempos.mwrm' + subprocess.run([sys.executable, '-B', str(ROOT / 'sdk/runtime/loader/build.py'), *[str(ROOT / s) for s in row['sources']], + *[arg for hook in row.get('subscribe', []) for arg in ('--subscribe', hook)], '-o', str(out)], + check=True, capture_output=True, cwd=ROOT) + data = out.read_bytes() +digest = hashlib.sha256(data).hexdigest() +if 'sha256' not in row: + sys.exit('[FAIL] the package row is not completed yet: run npm run octatrack:module-packages (built %s)' % digest[:16]) +if digest != row['sha256'] or (ROOT / 'public' / row['path']).read_bytes() != data: + sys.exit('[FAIL] the package built from source (%s) is not the published one (%s)' % (digest[:16], row['sha256'][:16])) +print('[PASS] Tiempos %s: host checks, package %s identical to the published one' % (row['version'], digest[:16])) diff --git a/src/community/module-changelogs/tiempos.json b/src/community/module-changelogs/tiempos.json new file mode 100644 index 000000000..385169abf --- /dev/null +++ b/src/community/module-changelogs/tiempos.json @@ -0,0 +1,13 @@ +[ + { + "version": "0.1.0-experimental", + "date": "2026-10-30", + "changes": [ + "New: hold CUE and press MIDI to see the time left on all eight audio tracks on one screen.", + "The time left is real time: it follows timestretch, repitch and tempo changes, and flashes in the last 30 seconds.", + "Close it with NO or CUE + MIDI; a track key pressed twice closes it and opens that track's QUICK ASSIGN, as on stock. LEFT and RIGHT switch the right column between total and time played.", + "Needs the Modwerk base loaded over USB, which is in the beta. Card firmware cannot include it. While installed, CUE + MIDI no longer switches to the MIDI tracks; MIDI alone still does.", + "Known issues: a track shows as empty until it has played once since the project loaded; a looping track shows the time to the end of the sample." + ] + } +] diff --git a/src/engine/assets/octatrack-module-packages.json b/src/engine/assets/octatrack-module-packages.json index 88abfc082..b07fba011 100644 --- a/src/engine/assets/octatrack-module-packages.json +++ b/src/engine/assets/octatrack-module-packages.json @@ -492,6 +492,14 @@ "module": "c8d078f2", "bytes": 5780, "sha256": "6650ef77a837a61a570a300c3bd0b2d4dfd4c9bed6e52bb355034d39bf5ff90d" + }, + { + "id": "tiempos", + "sources": [ + "sdk/octabam/modules/tiempos/tiempos.c" + ], + "version": "0.1.0-experimental", + "path": "octatrack-modules/tiempos/0.1.0-experimental.mwrm" } ] } From c868378af242eae8948114d3f93dc6bb1935b7cd Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 30 Oct 2026 21:47:53 +0100 Subject: [PATCH 04/12] Tiempos: qualification, performance record, LCD photos, generated catalogue Co-Authored-By: Claude Opus 5.5 --- sdk/octabam/modules/tiempos/README.md | 8 +- .../tiempos/media/ot-tiempos-last-30s.png | Bin 0 -> 53136 bytes .../modules/tiempos/media/ot-tiempos-open.png | Bin 0 -> 39436 bytes .../modules/tiempos/octamod.module.json | 102 ++++++-- src/catalog/compatibility-pairs.json | 1 + src/catalog/module-documents.json | 236 ++++++++++++++++++ 6 files changed, 326 insertions(+), 21 deletions(-) create mode 100644 sdk/octabam/modules/tiempos/media/ot-tiempos-last-30s.png create mode 100644 sdk/octabam/modules/tiempos/media/ot-tiempos-open.png diff --git a/sdk/octabam/modules/tiempos/README.md b/sdk/octabam/modules/tiempos/README.md index d7d88ea92..b6aa8c1b6 100644 --- a/sdk/octabam/modules/tiempos/README.md +++ b/sdk/octabam/modules/tiempos/README.md @@ -78,4 +78,10 @@ Design, specification and screen layout by Diego Antelo Barba. Code written with ## Screens and audio -No captures yet: they must come from the headless emulator or the unit's LCD (docs/MODULE_UI_CAPTURES.md). Tiempos makes no sound, so it has no audio preview. +Photographs of the developer's MKI LCD, cropped and turned to greyscale (30 October 2026, project at 140 BPM, three 64-bar tones on tracks 1-3). + +![Tiempos open just after PLAY](media/ot-tiempos-open.png) + +![The last 30 seconds flash; track 1 was retriggered](media/ot-tiempos-last-30s.png) + +Tiempos makes no sound, so it has no audio preview. diff --git a/sdk/octabam/modules/tiempos/media/ot-tiempos-last-30s.png b/sdk/octabam/modules/tiempos/media/ot-tiempos-last-30s.png new file mode 100644 index 0000000000000000000000000000000000000000..c87e74264f6f5b31f78d92ed5aca029dbcf1b5be GIT binary patch literal 53136 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 Q8UO$Q07*qoM6N<$f|hiCxBvhE literal 0 HcmV?d00001 diff --git a/sdk/octabam/modules/tiempos/media/ot-tiempos-open.png b/sdk/octabam/modules/tiempos/media/ot-tiempos-open.png new file mode 100644 index 0000000000000000000000000000000000000000..1e6d8e4caf945348d6f3a11f486a7afa7fe719dd GIT binary patch literal 39436 zcmZs?18^o$&^8*|+1S|Fw#|)gTW@UJwz09zjW#yl*tU81)BpYV)}5*|)2F+i#yNGm zr)p{;KG6R?AS{ICg+V|X;^9AxApcE; ztVBhB*@#MtI@mfmt2i2&m`R%1n>kyVNIDyNf`D+v#;WPq0#&iURCups8$1H+)=Q>v z)8&zQvHJ=Ah0CN4931j zjQgY#(CFUS^9ek5Qc_ahxaiy5ZYq?h>FBvG0^iT~-``^-xZSlKwd@5b?3eu$sq@h@ zbcAY9edVA@RuN2Wo9+w4dkBNACU}dS_6B7TK*m@mozD+{g0ZOG^VJy>9t;Bqw4bV^ zR>JN*0hTvvv!jX-41;n~hiD)OoI>Ao;jx0|!uxs%=)hQvdDe0yp z0By#ml!4FSeO6Gf&Xxu*%MLU05--!v{36o)vM0qoQZUhQaSmpgt9jNQu%^$GrS0N$@A|9ufJOM^wsOb|V0BOr zc(H)7AKZdNaB4Rg*qocWvP1||znE-BX4pjZn$?fFy2x4 zMu-c4uIl+!p2EzTQaH1H|9NhlS*X&=j5~gJtW<0-?=0|>z~GL=Gy5YTC)NEg@))bL z%oZ(C3g?73)93-UCl(iwN2{?2uHI|--gcgJMop74dz%9BgF>AiQ-ca`!gG)CVC|w~ z_ndS4ppE%L1bQ2H3Oo}KbpF;Yz;RwJaA|h6Da|**LS>INI^+X@Uf9#$_;XtO&NXds zr9pXe+k46Ln?znli&{P^C5fVh`4naluW_Eik+Ob|h>J-9>OyIZ>nh1&`7E$eQjJJ$ z{>6nYrMo5`i8jlOI_Ho!Zx>G=SP_HfT{U=oGE@G7m$M2`a`3!7iIpMmC3(ZcNl&b4 zv7>?iS6hfpq?F}BK)fhGKmtPk)t!H=fD;f9S0)gUGeZy%o(vEWEXSNqCBA}>5_cs%$?|5JnKAN?O}MpEMcQ~}uV zlWNNUA{KRUHY4U>U}9h*6@ViqCgyWCHRn+lllX7=zZpNNB>>>a!^r6F?#|%O%HZH^ z!N|OP4(nTv_Dl_S8)!Jha(>>3$6xB~b| zN&myq|GEAvPBRay|Mg_=^51FwOOWwDB#g`qOpO1>_CF}!e{gyJw|EOM^Zlpd|IPYe zFaM?e%gV#dR#VK%&dlEBUqk|ItW5t6`u|G)f00`Mi)3N{e?#dE~Mvmn&5 z6*pXe2*W=?FObh>4E;gB3x7?dU`7{RG&Irw2XuBXDELfBa^SQ@T3TDRh)V2#WMhR>ztN_%x{&QQEA+FmP5@l*oI$6gn10KIs^_% zPb|45Y_Q3PN1F@U)oo=rQL_E~xmpl?ZzzfihCcvDg7R$L9oPw1fW+3p(1it zj=V|U1^&VOImvxfA;7I%Ov3ACh zpx<;0&PbNTv`S~ODN8f^GjMP>!ClT(io18to1Zqvln$A26G|y83Zhfxvy5D&#*-ZK za$pdBV09OJG!64Q&Lhq3?(b~5=Mp|kMwO(v+;s^H{jrm?cffDu8W2t83}KTbOD}#K z-p4JJIg(e@RCti5-y_mOGI=!WOqbUk34&9F7LtV4q<3%tk5MK90R}&<>4n0zhcB)k0bT(cFMcAKdDXiEq0}gW(y)bx@@MVZw6fy`z}v@z zPnN-bu7Dsyc|*v;v-Z`g%T)PcFYV@g-nlop19AwA4z`tq!C3#wdEbWC8P_7~eE;q{ zqsDbS?duOjL54PxP@?R^%~MD{<%2mYqEk$+tg#EmuvS>5Z*9x&r4}OXoi3iTnHGHh zKDD_q@G1AZ7wGM;f)7GA3Rog`nVXUhq8_f=_lHpPS+?@)Z7)BOKi4vKuMZ!+UJBbb zy$knNzFF4~ukTli6HDIzB0IZx&t?DY+R8rO(kYdvlQ}>li|tF@QA~R_(N`WcsJ$Ut zND$0aA9yjz_M)-2{CS;y&%XJb7uqQiD4EUfH1c`jnxRLCRj(+>zkHP=u;T6eUGbwr zb6e1Bda5h$TXrG$$a|${x$1JsTi)NRZic;QtB-aw-naHJvkAJrBtVper~KDvKFCqA z$d@?hB9-XguiL(g6o1}K1>T~Qh5P){(jbQ5YEe6$^6u#BFS^Gpk>)Z%gUIhN86J=a zr{XWQlY6mTRtR&sROQADmIGMISJq_gcty`zb>6oo@`;M7-@|%Wr68^-RE*_#d<08U zr%7p5ho_kj$_1g|5=7GH6&8Ht`MN|sZ0T?M({~OJL~mq_r4^#Qgjm(f$;EenZ!10| zpZ^`y6>oY29_m=&cJ@ZNx3pl(XupXUy&cC9NNDtmr<+l@a@;Bc^4N%Mvu}+wT#C)T z$bjEE--kpAx__psA4FWFTeG$uhgsC2zhYPTv5D*hA?NSk=^te~gG|^9uKVXbW2>5c zRynORndZY`3|!dOR4Xa0PtKjYC7+e0SOrT&(cAt+^YQU)|BiFWx?;_CM#1CZoYuWG zk5xj(qD77-3dk?5`67T`00#DNrdpI3lp(j&Pv7!dqND2+PmN0#z6ky#RloK?#j zU*SCLk!0l0KGoXOWO2dJWvbLhL44UvjO4r$2!^y2mlo=0b(QmkAc5Nu>X%PS zF7n2mjGGM@lW<7#7ChoIJu7b*oAbzay}upk>}PW1ev=`=<@N#mxL(LC=RuI) zj%^!ZB9X!F;%yaiJaeYDn|(U@rD~1y{*#)JsQhyA%jTca@O&h!-&gGd^5xfq4WCCk zZ{>1a*aJvD2fvrx{ku<37FO%q<{(+w=|NA+%*fd2~@fAWzj`SuDM+v_T=4oCY_)T;IoEZX#1EVLRrLrSXk~vsj1+AFVX8 z`1{sjNa@|xSM^?HiD;qZ6x}J#gP*HeA5+2{`Y!!cv{9on3u=CY2}%v&{cl@YyrOH=ScZ*QlX(FVXg`q zc(meX<13;8M#(SsMyl%&Pj6@^u$OlUT8N}VuQ(9DD4hyHEf0D6{`&xRvU}m}u_xzM z(vb)`6i*0C6}D{1)s{VYzm-ic42bF~?FM}8W_u!m!zNwj1$myegG}deue95~1qUfJ zzd(;Eb~9b!aX*{b&l<7Nj%%L4U#Lhwm6BxvDQ&r%!wyf(Kq?e?|Im)ZKx^32i)79S_;zUz1@PQ@pmW-$G>1tRZz?jhrNl52MzNT^)sA* zj;5T$=rOqn<}sRE&A!W7-N<%27t}6TD_j$)k+Dm=;(HNZBW;(zB0Fq3JqiF6*4Q#z zkM)k3Hv>DFv;%3$Ub8jA7D3RPx_tmNct(sn=uQe^=!q5ueb0}_Kaj3vXS{Jd!TLp) z!8>7Uoq{}i<*>#KDgBOdU&XWq2)+DPHXf0PvlBVvo=3O;b?h0%f$EvZYTw!WRmLj` zKKzljl-&e-FXB^TRQmX)v0`LE^LY}&zZxSc94azGTCmXIFXOrn{QT@)zZL0NwCY$_ zAo)tBi-+($5NDJ#w`X&q@2eVy>o2SU$29>jBi-V$+RYN4xwgLgdgbl>jbYiL-6x~G z2@$`rTYRlJ;G|7-ncN4ijp(wd4u3Z~XlPJhgqSt`?hUTNJeKEE_H=qP_e6{P{Hi#< zq+giX&uVnT^ei+;c)(e=Th}I>y~j;t;Z!UC+;f{A zJij=KeegkdBH#Y;vR7YxyYP!T(tP&5_s{L;;(};6@)|_B_e77nhpGS!xL5h;BC}oH z)4ii#j_?9OUYsH!zu<{pTjP-m7Xan%%ZFDEKE&)H78AMnt zPmdr33S3RkTcrc#k+HKZ%Tzgz!Zmw7hsI2npFhR8LCjobnKgG-J^+lwswr^MFC+8! znx_2ZJ;%j43BY>0_8o*Vx2(x##tOgAiWk`C#mUfY2p%`^6xIkI+)Do;o`H38xeEQK zQo@Mj;Jw4J0Nw&sF?Y)L zxti;H<;(94pmMpIyOMSrzi1{vduO}^;CKaLA=n-bl39INy6#+XSr*k^9-@YJ_%-KM za+IOcNF_kpB)M3vZkLz>)!1yZ=WpMSNFM4p)M6fc&z~u*?7~lp>It-g;u^RFq>FRx zz7fAG;?V0%q(U@p-dfKu3S9L1u&!&zxLc0`Y9rz63Y*Jw9A!L~uM6k=TGn5|JbZ!fG8I9cOjNI2f7hCWC=@+rn=s|Z z$jlK$=-azrvB{myyo4xE+PJF=XuY9|k+5c^G&}cA6M@DRm9a2VoSusMbcA*%%QdVe z^2f{%KHKy(X#s$&T>o zfvjp%h2r$fMw|T@?;#$<@_U|^>k1a7c&~B+A&n^!cm|_OK56}Fs+y-HP)Da*t2fvS{HV*>bD^?#x{`8Y(GBlTsF|FScerQAzyy-gP4dY*ONrZ*T<4) zoYj&P$Bs8cmzPSYI%M1~qho+iwc&IBsXV=fH3&V0ZGU67&5&&a^N?|92Z1yaF>@^SaO2q~0zx}7W&@36TEF`=Wcz@w*v@raa zZn#90q+j8fp+@bub9^uV-Y6vxXKc;9st9`wc%?v#@x=tB%+VlD3d?tlBx4Q~-M-@S zARW>xxU75I`={L!PcITy+gSx9)H;yh>asm`mA1RlamfR5ufvOw;Gi7|L7?;ZwI87rL*&7c z4XGhB>+WLt(*3#PQ1s)DSyXLn7B~%O(d6Wqtq}w@h<(^oq~^`piFX)FJ-VC$m%Bfi zU0eq)LIEJ?NtP97M1j(iYp1-%*npC3mS_*~5lc!4PCO??cqZ`;Yczb@U@c^BdXct< zUduob*pI>n6C<7F*$M)l`uefW> z6em*uQjb`)1J-@b^2=5_e7%f~ZXVrVHdb%>G~FDbWf>9k2B{piF9feR2gEBCk^VJ* zK5BJGT-fOd5dXCcpByuNmWqIT6^m~bGCaDYR!N-yTg#)mgQ;KCAp^HyhvVcpGp~H5 z45>rif1QjBB`B;&a-qsFe$U8Mqzvo`!Mi=Xf}<@^dBt5=5a8q0XKo%Keb}^)Jh-e> zcFaZi_ikv4X@D4KTIAY$9 zfE~-h2@5m1U1fY*^D)V-Ynb&`-wqM~!AV~va`~LS*3?v1S5t9XM6$Yg&k+9(CCqkL z2{?b5+Hr3MYU!5na&ABkP~5ql;P|y8cG1*Kh-(c$CZs$%n^5xFq#+OZqE!zbOh>l* zB|tKut#LeYMpy4TEUOyL%}iK7?m(O2VNBUte%ExS|AUeZDsSXS~wJ0?*GgrNOm}ue7-NsSkt<&t8458kVY6#AVM(y zMepc7HCbWk9s9-iv6&ec?NEf|55YUu}1-{nM7ftMBvTs43 zB`G0qNyL%JIq`(>?tRG!40#+O+Px=CPDg~9nB%whtfa!^A<;Cw&-UrQ%M&&vN^FPP zXR`PhJ---Z^T%R1=m{bR*_|BrY6L};*zA>Mr3RgsSRWy)Cy{6%QttrYZh1f>j4-*( zU^=@utF7I+Z|c&;x6>Z$pMooE#?4n(pGGb@)3+`2TfBwsk(FpCV?p?zMG8d ziH8vOJRw%yw=%qu3x>DJypY4X>l4Fh1veT>26Bc>kYt>9+z*=d+F{d zM_;ep?DgKuQhj}nbfV)qK|D+g8gSYmq}4wIl}0zLr-Y=5RJ|nv!1yE93i!fe>bD_e zLuvidi>*cWi+rZiTEy|P3n8m*SPNro5pNT}fi<{^1VQc>s16k7PDm~yo|$kQ+%?t~ zG=P%3=7WnXK@~4ZHbP1tlk4LA%Y_OSHaR$)^tJbj2cKSW-b) z^sa~t($hvWCB`%3HHmaT@7*WX8STzbt?L}EuZ_l;Xg24K%wvcGd8E@aHb~AStWvjh z9LL?u)aCiDvxz!B-Bz6gTV^I zc;Wr#-cns%CC4~VpM6fR|L6M@sav4F83wR-obz^i!tEx$ed?_mB&Au3S-1!K4DH9b zB^%jY0DU!^aw(qp%RI15gcA7=%3QcUq;LwudaIbM!-)(wg?c(0qNd>n178JvN#`%D zNhVnQyH`IciaK)IMGW?(qH3}ixm7wh^$pk&Fu{aDtdDhbLvWGXG?^w;2ptK(!Sbf_ z!qZN_;}_nUE!V@c+cv)@`<$ZI@iGI^;J=%8>0Q~&ekaknYL{VO1NPTFcUxEX_m2CA znXKC!7`E=fmcKq)$A{ud=}T+ho=^Pje(qTF5p=T?Jlk6IPk$@wW$-dl)DkU9gwjNK=&}HWlzGPF450 zf5!3aFmNH7^jUvYP=;b%h-i|!Xe1o^<}SLbA-j@^S=(LmG_5;VtguhkYlqvZzl&d{ z#CDx`=jyepZzZh$<|X2Y2vZ@0Y!lvv2t76$v*Dw|B%U`?Hu}qV2Ej=PMd8l0jdpg} zm3Mu6Oz!%lSuP}cS*L*fT|Q`jVQ}8;%4mya2YQ40S2d0QwC>1-8DbyROuDcYaAIjz zk9QECR?(T`zLGOf(13nNJdB3~IYQm>X!&!4J}BSs;_Ca$w8sQaOTsdvu*J>S!<0D$DaW4 z*Hxv)A*pIDfaHglC_i9`D+*(zS@~^}e!Rmd5DguA0NXrb3UWe==|O6Cwg77#)x;G$ z2^aHt)b+uB5+h68gvF{rBjIMT&fzhTZS z&en9e#_|edCDt)~ih*PwwXMXy3v&%lP-72fq>mFFAuBODQr-*h9n!q1c&LF)> z4}~(K7ut9c5+0e@|J6* zgC6B0ay%|?rG8ONW_1hYKsrq-p`Dl_(FI}aR#D^;8d2Aw9Cc+itRc#udwjaBbjfk* zsi>L#B*QGY`rVD3z{vklIADf!YTSneEbwyeiX!WNo|zclTiOF&o^dA&CJ9Q5et`N?C*tB(XiIorGjwdTt~uXJJ5B&#G7k6a zjjH)iKRh^Z%%2M927gMmA8fq_d7N{9?iy0_-^H_t%@q365|lIhl3J~*4gEqL>6y!x zW3itX3Od@61v{@V>o_O0Q29IF+%uo2+OX~uE=K=~)I8&TFb(pYCQ1RjZ$m|U-Wa>S zA4z{ly-1@8zK(cxjFdFIl}Lx#J@fSH1CV+p`Na$#Zi-_bC@3^(P$o!834(3TdZ5{= zXe`yS!E%^p+6K|I5pmNys^h`Bs`(X1lmijWSlPjdAVkwwJxc^AE5M*=Tr@O?L?gKN zI;ppN@g}3NQ74h#V7MWKdmlv*^7SsJnakb=0&wGU@So|eZRWXt2PYubVIS#ucU;YE zP*uOTTc;yiqUrApNeS6Q9ERCrBAYErHdVx;l1IOc6Q$*L)%W~$D!RYQw9|WCvgVBE zbpUlERIbzH@yNEOuyjPfEch|!0NbTSNpj>-P~0@p_{Z2XQK>P+_5H+cQx(X8G@pFVRwX>)1RTT}If&U#4LwH01;yx_X? zE(^ugFpEjW6mEe}Xw((VOw~Nde8<%xkDZHjAA-}84r<1Kx|GjmU?`qi_6uuF_fSg@ zgXux@nN&p^j;?C-2~BN}K<9)lj2JziiUFN#mgRy)dhdK3oF%XQv3G_KN?|9nOI z`?>7Q3C_8C$8Eng^7-cN4i0tk)?ZDJE`giLP&ftQ%dxd$f3^3Mrdtvy7Pg-uWT`-q z_GGx~^L{wo>hn1(PV{H3cvz8{MToDU3bDG3s?}ky%l{22N+G)7FQP;oJa+^xAEXvb zpMZb|)6S7Cm{>%i_1gv{Y2HhE!y~8s(qkSau-%wK+$fFXj*&I&$LMHi6IX4bM!krr zs>g^}9x;}s`6y>Y4H|#U%bbVb&S(TVX_QC3%tSn||8leRWqEIGV-D0Hja!p&A|5LfT8z$QqL)AP)_-*W3 zSHoM*tx0OFia8EID;|xlKq!J^^yz*k*RbnT@mUa_@m3T;QM<2_FGn>7v`cstSbbhy z>;G&F1vVkE5ptB#IH+_Hr=(-RnUQ_(rhvNC&$UNwXkz>5x-b5Oxr+_6dw&-`2_IXk z87;KPbu!7vHk(&Drvl9yvj-qFYNl};MnSwZ&v=b70-A`?H&&@N0<`$>LZr`#FNO6; zDl*&!b|PnOJ4q^POr=nso+lGdp#n1@QF4O^`I>WJ9{z^^`(#ug50ea?`rx5^fG>^ z5zt0dS_#8ac$>4eoW>8KFJ2)czBCR4bgn^v3rMuq0z*x_LB%4WaVBUEhP>)t%dsqo zo;Ca*=f;00;hhh{L^l^1@ez@WdXfNcUwZiPI^)*Jf}U#(j!&XiY|g2(66UbNjl!H( zge_?%D(k~YEfYB!oKmJnSQla@^`ydXF?F`{aExOk;j#HAQP!}3mf*0g67Sg9CF1uG zyX%&WG+t>#o3E;`DsPU6R7r$9Gzo|#3TJcIk@Wx;ndhE?ewY>lh|wSf(h;35O5Y2GIxO)BE!T3o4PrnP&^kz)1#} zlWe0L!GmR|Whx_}8*kp#pZ);xN_L za8+YbjW=M4%{gPeX!5(AbdEf6qI4uJtF0?yzTd~X^q$t$CJw%rRL-ypZW-?=irkqU zWP5f=Wf-wSx4QB>R7Gd+-i;_;D_Q2W3#B3KK{Jkjl0SFLTW_=4l=|)?zHY2joRH;f z3^TBf5P^cm=y&J)!uGjVxrI5^j973L^cA?aV4}HfzgS*va=@iG?aBM37vFVHo$Eo`I?%wARUh1R8bmuIH@91ZLodH3Djr{9)x z&_|(UEg_j!m~DeK&+Cjpy$dpJ8IPED6QzrE_4hMc>0OAf*geE@7tR1G38SRNGE&o{ z38%}1*$YhE%p(bJ|Lm@=#F!m|=o3Ci7S{NS9|91qYJ<=0I{Ojb=2Rb2=z{91ff?nR zpZ1t}EQzEZF=XE`3sp-mghx=Jn1zW12`8EbH`Lb=_IY573Yr)a52oaZ+r>w} zm?!Gpj}HM0;zEE%_JWkLSt=-o%N+kl>$2pJ=Kg%hXIR5tM3$)YRtTWf6B$4}7NavZ zIv={-X#Z}#T>>vj$YH~7RYtrIysJq|i%Z|@2}(au{I8*}H5|PdJdSi4cJ9H)=|YG9 zlPLoY%qPkb7@5meU%R+`*ypQ^;Py&7lyzKJ43)QidE%r$Y7GScX4BEI~PQpX`F_5F*go z1$S1A-*UFb5fZiJ$}z|EQ;Bdn<4)S6)MioT>XbdNm7k9G1f%HVws5}8sDC%zHf=@gu}6kkc9*Win_Dn^h}QB<8km;Xwyg}FbW3nSs5YUSkxuG{1L9C z^$Rp1t1=GAgWbSMBfw zEW;Y^%-E4T%I#&8fK61|G}vj|f$@S;BF&G?rr8*PZ!|+s8fCydPYM(5vp9{Xz0w)t z!h~}ennmDwAwtEUGVzI9;~MFjFb{0~cBm;RYVtsYWGT{P6PQ=q9+{{8pJ7wx_J8yehS6(hxVG5|Bd@c&}L~ zhOQ?@ax)vX4yhCzV0)qA`3ZsQmrte*#HvJ$^@o^dq`H)a#i3Yj+xa*t!0J3V@J>{N z?VtU6@wo^<%LA9-zZD==owyOwbm*n`6UZj$=NBHL?1h~g3}GEFM)lL=tp=H(mf*H^ zc8qC-#&8QpU?EVoLn(7K`WukiIwzzeYgi4&u7DP&1WzSgd@Z9CLX=F9O$+g=ef|o+P@cGv(>wFISsXfsMR+P) zGFw?Jg5!y5e-yMMK;0w18&{Cs1<#$7HX}X*=0Nno*?|hZMcUrTJZb76g;3)GlrL(X z5+wjD8_xUr&0XsOetTO5Iy5`DozWOEvdYJ2(hIn*{5NtZdAC7qZ^0BwOZnZS z#B#-|ew)+oA96>eNE`t1Dd?SYZFLr$WR@eZ#E^lVDXE`0RuiSKHRo<>_?Y z*|IVq#)G`jA}8#tE!7ibT4*HcY8NM36>%E zlfx((!e?I!4Gj}8t9d{}eshZg43|n&PLmUiV)$WeJ7U?4L<;up`t!v3*W>yY(@JD# zM4p==Pbi%rL^F&v{5RdONzG->^q$7c+eGvsplV5z@vHDX`*?~-u(Wr$0=T+T$DExrxo^Wwd2QlPe%J7GC}d zMkfqM;dRR?>K7L_PVvidrWBUe6bSU6xP#(q1rU}%HCo!MjZkt-}_TjxfZANoa zIPEO{(%^+G;r*>ti}vtKk49dYs7Bd4ilk^pPELm{#|Fl@kcM!W&dz@u>8WL!>2eZS zx_v-s8|039x`!!n4Fte1F5NcQ&2~6;C6BdMAL|^7A*Ib2%5h#D-o?XyBI^WW7z?f% zS>1sjjFPrC?ApOdjKrir4OiP+gzVLT2T9+A(k&C-3eK$~GK(CdCR!_?zGN5Fplzs` zbx{F5_4PM+oUDEh*SAOS#iC!5<`cKuVQ)%uwQtz*s76>GWT#(N+otLCb~RTr620BK z3R1Q@TF|!+zK-bYmk+w`nehKzFwFJBY2DE>kbJyq{420pBE4q9W1*6HyJI`DBWbYx zrf9ED#22xfj{)O`Q}*|A)7B_|>1nC-aT58c>E7Ur_j%%cLTyr)nJ^(7#MctbbzvsQ zps(FJxnpU>W7X^X?R)I&$)p`TFK?@h@{bqmfr9Jzh2ZLNogV&@a4dRMDU6gelmm}M zd1K$Psym?(ov*vOYnPV}H$fA~NU6|8gk3C=$+$~fmmLc!GBhbwb$vZ^H(V!-H#M2C zhH#9IG?kj#p=!w9|S7M3f*%Za|M+8g!k^C%g=#vG;oS5d4G5CNlZ}gtc zBSIHJJsKx3zB8w7xKSqWpbNRkSgDOUZb{{r&*!#&*dcgYYNW!~_0bsPQ7)cun_FX1 zXHWE2$mY>jTfW)j;3J~2I3=X&5a#OAQ`fdbG(kYsB?F-Hk-$k4!IjC%)vl8%GH z0e+z!BA;XGqdjLqBz`+~wi+KQ)NgB{DV`YR|G<{LRlQ7Xe!%#>s=zGcIRxEE5_ zjmP9dKw@^kYZN2K9lKCSH9&SYHh&sM+d8^MjJJ_Nx?9`4T3Ti!Kre_mJK9qO-k2ef zErIC;O@yS@mdbIY=%kiY7?w5U)Hbv^D^~-3JG-rmC1m&Q+>^|{ytQ9=4WMT2RF5g5_Uo(&&lpeZDA~=XJVK8R4wtJkC5dE8*)BwzmLchTdMCId} zAu%4+PgGU6N_b-UPXKNhr_0P_Gi@~TC)2ffH3xQ+06jxwFi|DBb=!7}e2DC3?BLff zd{F3-v{cE%KG}npx@?aBlk`WI+z%Km4Woz2c<&<3U#P&d=BhUb zYcxp|8Fnp+)oVzVeoF=4UJt$NKk6)zU@%H$<`HLt7-vZ5&>k4J*hUIwBnB8zC2SXS zPI1y8wH~4~ag>R9w_2l*Fd-{xYCHb@Uh7E%3EVV1nv^xfvA+lRLWm>Fl2GYJvmF5Vn11_KFU<51h%^ zjG)TM=ff`^c`qqKP~@+~7kNSlA`czwVU>4`UfiL<=cLY1I%iiuY`S2N&?OiCe^Jrm-7 zLBb7o^-FapgHfd2k{g{23g9s|5g~diqPCH9au!Gj124fseOrPKrrF7!M0S7lDO#CUhl`aK>;`%;HkLkAFX2^*)-R@BDVh%=hE? z$eXPx5fs_y=?7S%3dzTEEw7kOoF8Qp*%A8#Z}EQAIp&N$-lO^=;hRrE4HxjfrTtkl37n z1ibE-qA9XdE~%{yNHr)CN%gA1?Qu&*balQN3X_&dM#j^sduQ-Bx0osvY;s-d`XKkM zNFF-)9fA2d7o73mm3s?_DiWRdxkk%l$fR9jRjo9|+Hl!6oyKOe`ZQtx-OgxR%){RX z)37RSmmO-mvB)(X&F7YuFoTis%p2W5af~sqeD@wG>^9$^-(M|UV%~{Hn|9P(a=X^1 zryG|fcL#~iaG%^{V2~DRXQG_54_{n3xyEYVHL}Zn7i)l3kop-%Pl(JqBx19v;x-6O zC#~bXrY{*H!`Q^e4Vl4(yL=M1SW9<437{s5KbHp?vz4~hG$v$H+ygWOM z{pBr{&?MYBW))SCgm4rl*;3z_d=54oP(qMxt<|2xn{+lEqoOm2B%q~&eG1i0@d8vt ztLXy-ObYh?W{1@$bk#e4b3Vp;Vox8BN7dsD0uAcX-8a$1x5)z2YAxadCZ2e@OsRL2+Nq^bZwGWM3Sb*UL6m3$=zOc5sTGdi?B?L`g z9C&l$rgA%nh3`TT71-HK_gbd(kqtk$rp|en9Z@Id$m;hM>(_sh(lF13G_ykt?IH&+ zd9FI+Wd)gulg7*$S3(iS_>DPRg%!4w?3zRblj4l&#^6uMhy~CfYn>1?2=iKRT1F^i zhQ0f?^Mbm+_22DI>|8zJV3H?&+qt*?d0I_}V5FEMy~UjA3{RK-jy=rRqZbKV^q|T_ zqX+`u|C*>P>az3R^!~=Xj1}~033Tt4x&)e9&_EcJ4fR%u|7 zYj(l(f1ETxk}W;N$`;2=p^kIN0bHojENd9yjJQKM3Ts3Q##3cljz~#do*HkE%AE(( zEj-X##IaDSSkWbJg>-8l2evqNs$J9NKJg(j@>-}rH;w44Hr2;sy0+8pi*c}Px&1WC zio9gN^^nW~VAwoakk}-_GEjIqfrSPEL%vh%s(>@ykmn%gefF~PIIcR4ZXD6 z8#VV13vQa*uBmSmKkQa%jKqcqqg|@IZT6@W*9>316Uim+kyqbYC&e)vddyN#82OS0 z^N4!$J2kO_ys*lv^D9Ji#HpeQZXIr>D79FTMfkb_QegZF`ndF2OhY7PX2x`r z+P){+Lpa2t);m%7;M7Kwww&A~LM`=NMYH29K8{+4Ye#8xV%n0A>+7~)m~%YY)ipw% zwirY2XpaOq03(`>b}NsNZF_( zBw;d@r_YXImHF^=|E6YIRg-ODjkFy-wU9J50)H<7ou`TKuLU&&6cCTZdI*&U{E&SwIjkkDw#a;=o( zJwd6KIy)|?vNJckP_vw-8(5B$Kdzd=gs?Hx@6twV`9n&y$2ZKY0{+VJARAy%`7L#Bpg^1O(>&6k)n;q^aLl{L=Hs;fc*?v}v#c0$*8L^pVHz9(L z6gADJpG;h~@K8ui3S~gL+%=0w0pcU#pFWA zXyU?i&OiBXU7cZ(;s1XCPC&80Vgc;4fp9v)o~^dVFwYvPN!X*V4J(r&C3pvmUXfL| z_~~FOC)Bm)(Z@(UzGi2sGO0R5@vepiAZ2U*{(LYYT=?ov?DodJM21P zeILx6se!e{AxjC^Q>zn05G%QTxNlwV?(#zCEQLjZ6pgfug$9<)2W$}zVAX^{0(%^J zEt>%_f3I0OiuAqTMn&^uZ>s{V*KDyupm#q!!w4nzF{MJ6xI2PD*dPLFRjdo}0LHF( z>*W~n^nU7st@KUt&~9k=NJzK=L*3}Ogpk@8oRlj*wA;3dR=#{YWE3R_7?fp zaz22UqY?0SJhU8QojY%4!{rG6v?6v&kaz~ZrgQ_|}O z)jn~E?B2xEOWC}Fh+BjuW&)HlR(ukzE4he(61j)SrHc15CkD8!iC=8Wv$Z!Pd|cZt zl}N$FCk1e6_Ja_o_P8Ak?`W-$?*nHDG*38RSD`HiRU=WJV*D_0kz|rbP8CCr@X;s} zTQg7LdN|x{hH{n;#hk7+HG6rMY3Yibz3@Dob7$ryrh^b%5mo!09W3k#XD@n7)E z3MT&CN<>^GEAxtA*iS1NAYV8GsCfXX; zCDg^XCWK8R;SOTe5mfiE-Jr+BB{MvzWm;yN5mpjy{+RqU@j~5xa%u){2HE_jZ=^r; zfYJ>n#E{jo;iupm8bw`~*)$285@q5 zo%jV<0zq7*W|T8?*GLdjxj~iy+cZRzu@4DzabHE4B-mTW#700}c!h9O6UsKC%OWg} z8-CabC`~XoB`8&BnOG9&4AeD2U-~7b5EUhRCdzOU;?m@@z|##_t*GUAbV_2JWJpL- z)?lK8btv$HELM!kdI}TZJ*Hr>pGDX*&L~@K?viiCbk|s?FMj|4 zKmbWZK~y5G$uJHgdyU^Blx4zmkIg&ak=Irl7d4vCasH9IOvm;BlJ|$3ke}gTsanTs zR-rBoHEdsD6b9B}#z`=ZG6K*b5n*0nOX|}S@LrjZQW?>>lrP(xjR$Ua8H#}1hz|5v z4xyIsKcE`fT~3145!6Tpi-N6~$Y+^BMZZG50%vTHifAu^<}x-CtOn4I?6@Hx9H}s0 zHc!A4%^(-{G#=1yIlvZAYiDsZyQ@SiLDx7?7(n#3eejdOt?#>N?%r=uiu+ozwK6gHg)~{Y%JWsaY-iPdwb?<)sGg+&+2c(q3 z#2|I@5#GW7TL-G~?W-E;1I{XQ7uH6Je+DDC123P98wrq0eh-Vbirvn9v>-)`w%sgU zhY)pcGQWRCy$G%>HDE!rX$V9$Q6JJ0RPDmLrnw8KdSU_;vj(%6IQ_Y02Lv;l0YBz0 zEUyFM0HVe-R)ra&Fr!1W7DhlOA6B9fBt0&9V1VIj@N6W~cE|cm*+&0J)G%E^Td!VR zUwo?l7-wI5c=cQNmuDS2rnOI;@4j&DhgH`+W6z!m-dHQp%Z^*jy=DOkt}1CCU{fg;E-;XwXn=7(^E%mz#& zViQ&)8OoAQ(8V4d1R-Mg-Cb;&4fe|uK#7o%z5FWw$$>eIFnW05{p7N`eHlGD z>t25s#@D!&f-Hvh0z8ADsUss%TI?j#z}p*az*s&D{I!ra_UdSH(aniq3vkGsFWcZ- ziArcr2*{vI;6P!5u9Mfah^?`sI8K2BqAWBvmr(PNDwy8g<IEX7G}o#yzK5b95i|!P_PcF1*g;rhDMnZG5if}>PDh6`=qioK zKp3YWfx7+1u~}Kn(kWD51ZEshq_dE1u|Sg#G?*5*>{umxwm|4iX-M?EX$g|Srd2yE z;@bmxy1vZi=;^aAKG$=GfhmFyk1JSXt$;>l{Uy-(RIg?b(%%ak)%ul!Z}0jpUt z9LP?Q_kYFqJQ%R&cDJcxCNB21i=X|%3H~pvq^z!-psB!;v*{+RSpu55VKNjm+w^?R zD6ripPkgJnf4M<@iR}L3C-ZXX?qAgNerKQ$=$bFyh?pD_kCw5bo7M=7+#>3mq^Z)9 zjcR)qpe;558x=-a0P}!Y4mO}=gB55W(}^fa?8wx!v??r|cZ;~RuS708Bnk# zV$6C>7qJjS0&eGuRgzfxaDL(so|O`@ad91lJ11GQrJ}`(z4JFwxN`|hOdk@qw@L5k zcFx-6q~ETpdR|wnCc9j>XG9}zO&sDKf-n|rXm5g$h%mxt>o4vD_hNtWueG21tc99Ii@tPL7&E3ddP z)Fl*$35&Vhj@VHvI%BhEE3apZm{sho!A%l;xZ^QP67lp!>{~#97N!NX%?>%0kRF6f z!4)e3@sSvV8|ASnI~I2v`IvR7So2FZ$soGQ#gbMI10mK0&m4-kbJrrWsPG7R>)7dv zUE_!!m3=p`-`V|!EjVh-OL^0gwXQ=}&2C*N80sQ$NtRTz@Uv*@Z7Un-fs~?T`wwFixl6KAxe-(t@f>jO-pVt*vDnIXxs{>j)M z*ia6RM>xD!VLqoUCKXd!k^HT zlV=~^qOKc00uQtP+kIlPXZC&yi6eLIn0OpSOb6>GxRgB{j4PH{JG@{L z2Sr?z0F(fi-h~qh(IG8DT`ZEoYzuD`X2?EhY*o@0Zi}yonrmm+xdm*jaES6kHiog} z>`>&fPn0YzDT(wT(gh~jx4V}8-iWwl<0sjxw_tlHx2|*cpeSL6gs%{03U`SL~-LCvmbnHYej zwQy%U97QD*>I~QawfH5jOwW5Bcvr8Y@)mbu@`;6SGJ#|zRtjp_Q_d;6POv59D`N{B z4@8c4+1;A;T@k_HnU#0!-PPnG-;76riwN(o#g5iF!Q*UbfG*9hp)f;)6t))x2h3yzFY-T+F)F z+Fovk^H~cuua-!nQ@?(pD}*}-RKfuT*L&8=QYBCFc65z&qAQ~ zDtt{jC)A~7oAZcO*)a*&Lt-!#U@5jcww1(@V64iNI398*CPa1%6j1}W2Gj)`#Bs#Z zP6?mFQq5w?RQ5!U*vwJ(LSdD<5S>JWISBGm*Cg!R77lDr#ySWBEmc zuR8)BnN*p6w@tn7*}Q1I9d-}S{2|(`_WMB4IU`eIYM(HpFE|H`;tIDxOhgxCX*k*| zE!P1jgKX$ZtlTX3XAeHTMbHsr zniySRee}O00$~Ou*_|lrSy!LzV~* zEQ|z-d-$FB;T%?&%FmU_8buro4vvC?od#LWi1oz=HPbdB7?A~C*rV}P48)S-nuAfW z@(~V;e;B`_c#r|`D7uQn2=!=)2`5Edk@fOyaS~VwxR&@n5L2y)BW{4v0;k!*y?GQxx*2~6&Ov-59@@3Qr$pTHI@ z`>$9H)z@Wxj>y{PJHnP}Y<^w8Op7wvMdL(r1jov%k%hK*-*|)|AzS@V(>tm#2Z0ea z`w!gkds65sY^@^u#xlW8ugBBlyZtL+dD9K>5itWn8LmyA26lfzN)DlYffypbut(g3 zxOoJp?9V3~;-NW0cruj;j}%Tx&A?X{aEiyzf~MRm^HPOr9bx ziJ~K_9@A-M7fpxSkBY%sBm#0-%Yc!@$})B>XL~qyMxrYU08k~;Wp)3CNW1!VzQO#9 z=lO~XuyqTsf-%s9YD+Xhz2nz{yo7CA)GDGdja-~qb~3vHFN6>gm_HthE_6BP13R62 zXFuo1TAR!3_8EdQo~GmDZFDhq_YIYlF~4bry&R+XkZsv;4H5`hT!Xz0dopUl$TSEx zpVc0-x?d0ufGL>m6WI6+4$4F#!PgK4hD`$P@Fp9<*i7M|S^S#vFVqD;3wA81;fJuy z4`N}2%XaL|#ZKn#He-D;ZZUOtb*pM}fd{>;jjs3VVnNPc46*dS!}^PeK6BNj7_ zkB2(e_}KvOqbGj)diC^T$p-sR%Q=Jg2cV0JfZ|jdEFP^Nt$}?$HZLA}M0D1=FbVW1 z&LV}#uCr(qPF@nYCE*;16ojeCCILjEx$MF!5mEe@qM)noYgXgsASH0&<%B)69S`uL z0x8m}y1eS(ehBh72zwm*m?(|ThuB~|(89FvutSvuWwBUoh$QfVU9;!?jK!F_y^2^m zh@(VY1#Gn%^*~oJ!Uey~OOdGb~>G4Q+}=vatDK7lL?J5AOW~D^M^43M$QK z1jXXBhR_c@EHf6YF#&@usEZvHP}HpeIM3?f>2fh#E!!PxM|Wz3+RYe*>?G912+S?f zlM3MJ%#gy`#s=N8A3IVJJ_8AgQQ{j@eJ^$K>VPgt9vMTnmeI7+2Ad+XY9Gl^BQ}D?D7z> z$h?+#ezWx#AvpnCWwD5yXvB)&=wP@1F3pD+GYvm_*7QqncqrV>+{A*=ozc82vLSLd z#0`t@iVg*z;Rlz;QHn)H0KKSpdBPUfTP!=S@Vis$0zNjeuwaI0`?L zx$D_d+~aPzk(dq%am7!{CfID+ImR2xK0sm9rI`zN3o)1@8RM`hXHb?BOqM61B zzm-NKG744!DppT+5*;Eox8#SDMg`)OdRWrMavcy55`E3@Xy|)I8$MJCutV;t2nR!0 z#Da#^)%>KWrukmU5G);ti)(&RCEwP>3d;{u3?(ZSkPZn7XCW(r*RnmMNQO?t#^Hp$ zU_l{Ru$BGfajjD=os%W!0xln>iVRkxQDJSvFT;)pBM|ZOa0wL?#7Yx^D4SRlP2upH z4M;Zf1Dw)k%D{+^ssm>f9)-&bhKWgp7eICVk`fWAC=KK>Z$beQj3YCR2t1&hC|-dcDD4a-XgnM`}QxFfxhZ`8rhVUNbU}+l2 zN7Y5t#dye1i#$G9fbGnPHNfc7qSfr9)zuVCU928tof=poj+u@5(SwY}BjrqUll`G7 zlsg(ezqqug=Lp6eep5 zol2fgrugHp{YaS}zUyA|>wE5}(LQDrPIde-mLXZxU&s4GWd3-E_pG+)*6h4nJ@O{k@*t|cL<|H-bC~;WtImXsVOrbg6lUlJ%GA<3i zj&i&oU3eqnHgVT*3-nFjPZ09p!Ha7a;KQqOe#41AYFB@FcaIujE;Z*-dry=6$a_kH z!6`VkTp81Hm`3YEeKNiPz>i*-x2Inr4oQ|~AQ%7XW9k=Wjx&t3%3$Ion=-}kt6O37 zJ#*JdDNHJ?;$;0@3YFqXEJO`Pzhw0!`zR+tx-aT9YLTRU9NhByG z^mpet>eTnP;r-~sOz`r08K2#Mb@w!h@4tOu?Zw@zzCFKxbIn2#Hp%(R9H-4ay?k`Oj4e8S32(~xoCe}8>PRUcixEA9K9zw7WYi<>?`zbnqapr? zS`RYX4Uq1sgCqUE)oZ_NRxUTu6UxA>C3mzjk^ji zVm$L7I{juBe`K$}wJ$zEWeLw`;hYUy-p=xG;)#LL5xV}|jruxCV%bvV2>tJDU%XtbG{Pw%yrnqS}RbHHLorl`=uRCLbJ;i`LhEBMCnV%cqRJhWWy zq&afv+1$u-0$CoX>13T2KLmy$%UDtPEjxY*2SXb{S^Ye@{q7%}UwsyIyD(gb!N#4l z(?~I6&F65BafQuUaTDq>aUP5&h-_l0H}#6ePNYR0?(|ozLzogqXkpgFi~xs_sSmBo zly?+bqotpm@y*oy4h-fQew1d2BYsJh5IF*uaDuWi>7i98`S!O`)B98HlfUnR9!ga1 zU;JP%)ZV5HPc+F~0_HlD&KE@0L@uRU%0xcbLr@d6%n&*=Bt?Y!byjq`K4E(ek1=YKPbz<0jSTA;W?>}W{ zg3}^T?x*+vqDlXxD02(8=+0jbUs^IwJHNeVS9w|Vom|HGw|KW9Sv-M6HewuE+eiQXI8=yYWoW2CVoZa9h^Z-GzYb&`F&Jwg{HjYU3A zSa<7JYisFYlEp=hN}{ zuIEHzxa%*!V`VMAtEb-oSKfIwIg%v#9SI~fP`azt%9WP|4rlBRw;b07`ZBh~2DiWJZLChlhJ;;og1sySKW`fwsUtTY!!3 z-_4IkBlOq&)7xd8!{IZGi%-7&rWIZF+2(r=lX6aEAJv4b;qF%M_T{Q9E|b<4QZBl4 z`kB2V)}A<;#hO%~#aWhB8@&T8?iB~}Jh{r7)Wu)tN+tB?>tq*mK10(RM~&%IO7z1a zmLqEzh-Lw~wjRznX~+5fgVSO93|%@2)~{b2YiV%v(W-vYgKN}Ls%a%qNoy~^3UNtJ zyJ{E5xay;$9wu8kSDHjvnq1N{Gv({OJZTkr8cGR0gE9i~jbrAAAjG}@ugAYg!5pd2%Rgdt5$D?>P>cxTJz~vekG`lPB)A_w%`nGAHT}t z+Eur>6*=RmEDM=4%zAJrCe)}oe&T;tZZ%8&zaPVxD46oLubgaC&+krj4zjcCL zw=RLRO*)77^l3V%yt+_@u|+^QiOgJxRzy1yTq2Y%ncA%XcYj5Z;dnnME7zDM2*!bl~9iN_Z?J|$8 zpXU5xG)=fCB`pSs5*1y#9L4GA8E0$?ZJ}EcALv0l7uxR!#=k9^Edx>ZZiXwB*L{HE zV6_Yat9?OUOoBrT;Kf-9s_umz=a%HlX_i567Z=v4xZ17*Yn)Y~0c3lb6X@*jN9|KC zjFl^QIgtl{>qH`Kcr?6Kj-m{P<}|Q!7m-$y;W3+=dBHDpERTaYv{4%JAJ+Tp{g@l$*}T2f|j-VQhVX zbZ%dS!lG?$hC~?XjYU6J&o;<5vy<41}E#6|J=hBBf5H*QBW?!q0DD#2TeNm&#%g}Z83 zi!Ejuax?x~)e4-pwvf0kU#DlAf{KqxEAz|8@fDcDIbS6oKU`t<;p4k8w>Q535S<>* zzJE7e&n_-dw6H(l1&VupDW58h_lk56V6{u$uk4JLb#6PuHawm28=lxmV5G!ug{qPs z3(Ybl7b51B`EN$O!Ii-?4HRn(1E=n#zs!oGQc)Am{>y4P9Gr4v>tNWQH_n#b0e1wy zXrp53uy??T%6-d`9E4_mqodZFkIP|qX0^W)^5WrP#^!aTD4qCN;r8kcd}uea+fu@;;#wL~GGzEv7ddE=?MvY$Aa35!pA*4YXS~#%T(tCYl9@pz^Ey%y zNiY{mz@UXQHejqADuUDJ@33nE%8WQoe$`-0-8-iY1K4I`h@Z#KB5}2Y7C8j!Y>MAGk7i%>m(ucsFB>9(w9m4Bzh5-DpyEihp=e7*>_toHLrD=@fc+#m_`es}&in+A?ts6|xKi zGf%CRh?&xI6GXflv!}m1^cG+Cih&4a$G*0NkILPT7^#YqaXetgK3W{N=aX4?DEL(48B?mB`yxNYKWl$%!d}V;by{NKVqh#q3OQzL5pDdZ z`IVa1-H$WaWBS|ucgM$M2>mPr4tzU!R}VfB2^M_4(-aMGqU0 z-%p3nk5JmQ`{6dPwG2+qZm5U*s^iFOz{An(jVXSJH-Y|wF*GT3Ky~)JOl)}o%wzB; z{qZKPz1j8%dja-RL_nxrR=toFe~vAW)R>R2lis3v@p0W5ptAS{2bOf_}R z0jnROAXI(xc48}`Eyzs|&z{GFHJbpB>;k(L;cQj3NK7M3RtpE*amC^dO31^bBl&9m zY5uL-+eeP)!^7QOB;X-C-Zs?8`q5CDsz7ODaJoM3rcdH@ut*xG*q2$KA2*Lz{in;` zfWtj|o^WnY73}jo8fK7H&+VNP@!s?{x=dD3PXa1 z1V5GeT#b^S*)$hJQ&246hKK*I2d3m7N`*p6a8 zh>J{y!RQ{4Px21p%DMPSxOPR(#N|>o2Fbxl7$v%k)qg$y^5p?$9sN=(S>@uoz;sP% zKR-W-V%DcM&H;y%(X!fwQUj|Ia9jNuNuw`qg}qSpVU4+zm(J01f)0e0?o@IKKdk+h z^6TVS`I5x4Fn^ao@AMgJgV%|2l+fBbUgN7f0OQjDxbMe+Aj~Gqu|2$s+2&giFOzVc z#=155h{{5A5-qSQyFmBss{H{q;)_3C)xVC$9c;~FTY{6!({}d?g)`lY+F*sf%_Yia z!^3^RI@(fX{KzzrhCzt6J=Q#Ud1y4p_1+H`Cw@RSJIV6w zRF+~lpWD)%E>H@HV%Qtu3UPs4BSRa7T0?_s9wk^$-hH2*KSA#*I(fRo!vXqFF%TE6 zFJC1m7}xNugSc_R$@L#mxXle;@zwzKw;J)$;6%?*I7T(;kP}My>Tz>?rh) z|MUC^4Y2F_e@9^v_uiJRvoEgy_0_O>*`7DP9&){^^4yj__K#4+xzc_#)n!j(S`t@Q z0JS=4;zE0rB#j+kY%fLVyTHL2Hg3IRF%6wsGPl4r_I;}w6>1;N>7_5PF1KJ-5!642 z_xLwQ(>?0d;{Ct>fVePi)p%ZCV+3|qN23vz{!qTtZe63qlAHACMPf04vxqdhQiags ziZ-JVPcBd9wsctmtaH~9Lzp)}mc*qd(3<=_1^ZaWhl?8KgHU79#*E7B9e2PFu!lD7 zKTG@At@*LVwMpIGT{keHf1wS@rSsx8#@sVhv5|zojKcKD(<|Aud%yRV+;c ztskQ?5b8zme3151w5raN=?Hx=G1gEI&_mfi(B1k+Uy;wK-}|~P+tr9_Sd=%9R}HVa znLgQlbPj(tPX20f#9=ke4z)(Vj@l=eoQO}(Fw?!fc=L~g&Qlqyd4>rcuJNNH`fc<) z9$eOjt7~a)s21aWV)FE%j{yd1&)j3zyAT(^tgq|Hp2UVh|3;?nfhp4(^}aRa^9 zDC=VGg|^%|Hyot4gH~~TH9#BOYE7>ZE!MrQ&g&MoFmmKH3@2f%lI#I4_-)xz?Fwfu zU1(`19lu{6bvc`b9y=_Bq5N@pI7F}7;u-~UrZ0UD?w^adD%Ra=mx`#`A}o7x*d6VF zD1AaP3Cfk$Q>?GZG#I)TlY_6@$Bk(e(;c8mgUuAofgjW^q(%`t*66aRipy(Pz`xBK zIL~Dl*+8_3)HZ;8?0%Qlb2vK4t~FXhIIW9>(LutlD*@>=ef@{}S15d2H&6Q*y;*#B z%|Lb@t=|88@~!e(MGZSB267pFJfw3(vd( zk`wV{9&H92RLKeZUuc42feHO1_LL~i6(E> zb7`&;9!!Z~x(ai;=;ves24#*q>pwyPTbt9@DCa7o{-VFa?iswh<3nKvvRDSVJ(?{^ zd+8Fmr6rl+sRrBr91ndbB`g<1@ZJ`e7MvxtobG6VnmzWj8>{R0X&tS^%$Cs}Hts%I z9k;FIdI~qby>vUhIsO}C{dj@SE~oFdly!mt{uX??C4ywaQ)F9h9zwDKf)Y1j6~VI7 zD0yw5-61YbQ*1va0InOyM@%v~$$$CncbMs8btRc$>$uk*ax`j@ACBHY`wMau3{um- z$(?dG3b^2#No#+Ea%6p5E9f&^k4GE1ttyyWuapz&&48(_Kn^6<2qCgax0D!G~;^q9!!1pP8UTs&;rt9tFt zgon6%=-qj4h)~63jbBl_JlN}&nlx2G_YcRlimUMEze8Lm?BWpXYI*gFgZj}A7u}a< z)3@oe-TV0c=pgD|yH+v3uCe5hdoaE_u;H1eZ}9`(%FhUwHXmoz)*Mra8>u6JTT z3ABOs7wGVj;oXaoYL|q3$Hyvffjz57y!c~yCxga%93c}cYi>8N7iZ*=Gw^o6oA}a) z8J@;`@Eh45eep#vUL5?#U-#l^??0jDcZq>|?z*C)J|y6TcrEf|Jvk3|w|0E==kV_D zZ;$Ws+-(Prh_$a;JDkUJeEzQb7maxcky`&UqqG#K4kj$< z+!y0nY@4iF*Bk{$E3utWaL~KFJq>8Pc_?-lWIq;6sf(f#=z<+uyO}ZRo||#m8nt^- zQwa7R(eg4A;;6V+9%RpEXmioO!sIYkp{AHjWnmXPL6|2AtH2gxUoEMi%bk_FpZovZ zK2)g6G_gE_s${OZ>0kzHJ=DF;YEcHh;Tu*{bvAL|08S9~azk8@wLzK1j@KVvH=Z9h z{`j%;ES^oc%GtiUnDw6auU;+AkEP4~eovl)Rj%y>y|K6-*3Sn`y@8~hY8e<{k)E4v ztQG1^6oFxsa!(R=)QsCP6ylPs^{*Odk$il|h@$rU>tXjGdH??8s5Son`t-PQ@oqgl z+|s2}jlSh}aUd;m!JS)hKNk<9vcwg&BG~0YOTH9H6^nKEr8n!9?wo%E+~~U?szg_o zezK_d(3!t(cDuDX``jpD=JtQTJHg=D5JSh?F>WS2r%%oOjwav3?~C{5R39EH63gwO zh9NAwPteYf{&kE!ROU-}P3cqnu28kMxKwW(c2MKK{4$A>_X*eA-`4BT;&!uf+>4H} zY2@tn9e5}hZpVB{gPE#z4ucj7UZ-g zE!i*`qFAEQolRbSx9mpg)%x_sNiy&DQkek4z}EeqoXB6yz;Lrfu_c9-h3VD5zKA&z zMHjLed=F+kKwz@+ObLgFicFu01;=m+89~~FdDX9tv9Dg|_>T-HO|X47EF+a_kf&?(We$B~l7YPv_9nL|Q9jvA8*|;5Wm}rD(&P`|FxIHXYK}f!#wUG@ zk~QM?;Zw}5VIYuWP_v5K$T zWO=<>9Uir2AIF`G=J@0MEAC^bhrc?EPfd&b|Kw;5swJZV_9+54?||H1>BOcUA1a&l#;lFSM+C(e^9GhZLV>0 zs7hB?u`P{0Mn*&&N0t%Yt?YXI>KnG0z#OlKJG-j>)o^#K>848Wt<|^Tb38#*hNSqGNh!Ii1gBf_6S+F^|5SdpKS8@1q)KDjV#n&!4s@tK;6uRTJYC zPcXGEgVJih_T|gdyVtuAm*xQ_Y2{d!!(SyWY)w)Q8NYtOXj$Xn2~&^e`SEH%BYs!* z1YtRJj{e>s-qAiP8%k7!!a#F~xt}LrPoF-;7E=9LXZANIYs{_3gY?$#`*qm97f-e&-|h zU9>O{Ze*Nb-L&_jQzlxg?;QE7V^%kbyJ!T(_8E5iWdBfytJh6b{WDH$cIhElJY?7$ zh8mc#pJDnhN$1k2r_5FhQaP34+i7sRijW;&g}4;BGlB7ktLAAh#a3;rcl@$FxtO*w zpo`t>*UJ}Aut%81x`mY-!=3qVAJ$iMFj!zN{ULq<+8-71&8~s*#_wqm+uzEy_0(%13oMT3V zeJ*-gZH!m}NhfdL4Gyqx-6jX9ex9BXcb?_q{%z$cl3yfqM{yM$(cK2V(@Y{Up5}C(WY+7RzeW_IcxgMW`SBki6*rv7S$8be%+srP>2`-s7$M zUlbyX=w)m_mZ%>ev<@+yO4Q}$WEG9ulriilo*veRnvnl#Kd{UnN_&axp~{3`huHPj zdWD!&inE9uk)~THS4oJcDX!kVx9FDF0MP1U#e$!jsqZK z^wHRTqG>3!p|R8=-!87%=-8%ysPgeWAZ1Z0-WC2&lQdzL5v2bC+#W!jl_OR`}I&F1(@%ora zVO0Os7Z{tKJblJxp=^Fp8ux4#hk{7=cln059ZfMH52rxcKARUL_vh`yFdN_IrMF08 z=a<8UmZd1J?$3J@uhbEm9WUJs@J3APd#wwKno~@`a0_P)>C9D?4U4bItI`O_oNDv( zDq?hdh`*fn97}|yT{O$C&RK-1p-#SuNqX)i zkNdh##wGY7=A(VV(>(b{L;3(jTA6h2<FlMoaDgV1u|$NtzME>v1F zu`9-q(IP>Cz=XxkR%5>8jC^anst;6DAQUT{90F0XZlX>Z4T|8#sPao+-9Yl;*b zi-#;c{*ql{w5sV6q^ed)oGN1l{QW7tLyR5b(&+=9oQ~@su7)p~<9}HXpLRdIn+=}# z-@cBYozH%F-#AB+=;NDwhP zlUAO{di3rpnl47KTii=dt}X}ZVtTob+smtqE(TM)@aFKJ`eDU{Jm`meIW{&;y6a_Qrbww8f-JGM}C}Krn_u$8QZ;K1M)YTV-q~7J|+G72p*9@72j=fDMd>*gKqSm)w*%*pjDszVHTycH|mK4Hc*}Vr=#(|Wa&>(u-EF2PCTpPXn{qwR@`c&?rit@+vyId!%U5y?l;8u;pgLQIo(P>ev+T9bhPByyj>4o)eeveM_^)^E^pwx-4BmlXV9h_=97koA7wmcXPR1 zN@LP?fviH31y4jlv}$kwCEoGj>M}Z*uzk$koB7Fi-QIP-_g!Q7L)4ta{jW|BmI_^> z`a5ZGOY3Ysy=wHn>-FD{UY@WEmOYNz^J#B9tNsoj*6+Qo;T)nB-fZYs&WsQ_Qjd&c z@^^n2pP#qU;B|mjzjf{H3LCGD)$;oN>qc~f#n1xuk-nh8^YTd;nLcWo`M_r$HRm7R ztPkHdmr46`-^ zxIT%ncc$j@fyv$+tq_;W;jXf{=ssON8)9{qne%ddxojM^y0leM^QhK3WL)&vbcJeP zG{!g6e^aQY`nz&;Q=B3U72}H~Z8E3O=y*~Zh<>80J`lSA}b@vlc-jLj>TovMi(47LCA9R;}F16OztL5VDyW}s9x}Ex> z)=th&>RrwR6d8P^FVX!7($eYTJF#F7*_d8$Js(8f$)GlFJ!#JVa@=WRf_U6LoGjwj z)xW(uk2w_^HGd=1C#~kRwVV$BW_dV5UETuCY|Te+c0^|(E@f?3S?qR~6Aq7b7OWYj z%lWc((p{nlpjpERh-_bb>DZI&dwYlBm=1n@+EaAa55t3H(8kG8+#Yosa}GEqCquNZ zMN!;d%ZH@&Y!$Dt4Ks_lU3HHh-T8N?{1)O0!rB&CXZc~= z=RzJOUJ65-QL`o?t>f`^bj(pZPwrt%*^Z@-OJlV=k-r^1_hFcke?R1d;zx)>F(NxQ3Vu*(Nwdv04lMN~l$>SS zp*Nzuw%Vgwt1(H3U%l*~&XWckP?8vZ+^mECyiQ}%U#zKXVQ%!Ggl~!@y&7z+h!ia_ zOA}swy+Ah~w=BXlzx-h_Kofa;Ucbgt9@;1Sy(!y2^NUMV422D!athuE?GnAYB;!{uFVc>waXfZ47uzJw`zchFPq#RGx|!kE62B9&e=frT2nv#Vt&$!xVOjAr)8Y>V{|(=I5&FK>Sc-%t6>FIggn67_1 zMe=Ir^13Bu!Qs)ot?cjF_>*{V-2As3S<$qew~)a$Hj-QDI7jOc-B#3GbeUAJR8?o@ zOxw9p@qY}K+5B|+e|Pt z(T*nL=CD<}zG$3vx%TxFJ;p}*s44;b{C^@cA2(T<3f+9TDAQ=AjeMFn`ta@I8D|sz zZ~Sx^P0=JgpT7FoIX_N*c-xInbd~(aeX8_+?$kZKYO(m->F&gzSE4+$x)v}UPgaXX zGMUr|af3z88V3xMcrl;MSvOz@;V0|7#K%(K<;8{-><#}sV}A-C+u~AQbr0Ed*Bu4Uf$eGiGQD31~7@mxW0J z#)U1ZOqax%o*$nuSC5YyTwYq9JzKO#^_Q$_jv7bLTPs$4bGc@ux!W6&Po=nu$HhQ8 zOofVRn2!u?0-~u`C1H1aeBO$mKmO_aO_mP_2Fk-(n`&~?t4_{Y_28UMhQY(Dcs&6R z*C8rtMRs?H?^v>QO6j694b?chn1$zd?PB(>3rU_z?J${PF-I%%H5AFGQPS#QK`dq- zJ;RDY2{4cGr~LsRxb@ILlosSFUQ5f-w3R9Sv*qw~gMQ zaW$HwKl$Qg=cr!4xNaY#K=d;a_p?RI4jNnjSQSJ-tUo>O&Hfv5Eoqgv##KBJm}(c4 z`CTxH14v}%#QM8#Oe7(A_X?_B;ia2TLljHXY*!@ z8spxWV`sIGD+Rs?mox0MF@iCBAudY=Q86y011-An&e1wL?5v}gt=jv`NgRK_VvgMD zH4f|ZgP{#lJ{x_HirCrtseO#bCvju)aWXt=(Q`Q3N2PTqGRdS6m$ilJF*!=i5^g?* zXdLxY3?WgBF5XXBAD$-%Up(PlXDfeggaOirK zUcZ0UdcjKF3iD6l`5aeqHaUyHScGDV66P4}Y;#s5jT^~g*+LB3Icn76>kn%*GqCX; zci8vB!r0j%=DVW!-KaZYyE~Mw?KZ*1xE-=dL={f65;ZYZe~;z<{;vA(bNh6@M334v z8wV?nW{}jItRD~o=r-X%<)XW|h)&uQ_9E-cI7-&P9?j~DgOl1zY|gP;`-+25Onp{Q z`mMKbqSmz4znJ~{bjEy4oGH3?|0<<#q$&@2EO7X zBnVKrlf3z+_Usr-%k-;l%;No@ad+Bgd+nPyqvMzT`urzbgbL)|`M1g@N-0IvnY4|j z*+{S7zF)VlyXhR|`K|vok7N>bKI}^`%31T-0h5^eV)BoS6e;iPzy5Xq+kaVg=Seqd z_xjb;w(&p6rw|uCnLSMu)?fjYqjS0$!y%gKq!D!@2J=g`+7TLq(dM;YC9`DR>@B>| zJ}C8{GSY3MB=mG$e*1daxoS7kqkg;j9h(m*vRV9U(q}99ppBjy6s;|1s0G!@Yjj9Q zs3BU;(FcY360Ej=j?5LnM62BZ023HVL_t*IlC({(5iGBRbGCp<<0#c8sFnp@l@Ro=jnT+8Km}||3-C4V_`1so&zWTbqTs05>mYPNRUUg>c zC&y7^-i#M3Oi(s&Wc$8EZ}TsUD>Q~-{jrW(U^e(!#%!&|D~1-$(Reb$`YwYI#v@$# zq$g%MK7z8FA7_)7Zin9I@8SNw4XzsQ^i-?8!tGf?$8 zP*zK=T0&Mx^MQOd%{qs{m~NuJR-O7f=Ew??Vtu#XZO@{UMXy_%qKh(N-o*)obhSt^ zayF=sIhV-MmgQobv(*$H;11^up_^$2Z5;g;b7BlYaYCGKYq?C;2h$~*y6Q>PYu7r5 zozbERA&W&FgUTl-i=enKOsW+y$KQ7K<`cVxY7pa>klvZh;;{0Hdk_8wL139|J@Ob_*CyIh1rVgwiue%&(#2~r?N++RI zh?IluAy~8IC^_kM4^Wp}$1?ZoU2W1<77=9oFV;uxX19*X=g<0-*}FfXG8Br+c8t;; z!ZTQX@4&5H2?r~_47aZAnQF)!pjte9m7^*KPsgTw@Z8~CYy}=GB@Q0m4z%f;xuO_F z*4N!9?Nzdlmy_A@dP4JnA?_x{D1OnL&wd1jYh;&#n(yaq5o(8_XxE&t*+*EZ0ouj1 z74Z%pyW(ag!IHaSmYrkI>B@b=2mV@6ulSanifG$3CBH&k$Wl)pX3O#nB-l2Q9dr)V zEZb?a>MYxxG{J^VoK9zJ4*UC>SswA0j~fWw854MQFgg2o0BxRL3wi+ajCgwPvG470 zJMeFKp-uxg%@i##Jjyjycq8w%$s0e%>u*N}9wg6FQRdaRb{)_`C#~ zOkgdac&F**`z*MDrAzLhZw7b=te= zKd({Uw(7h`f3!D5-y|*1r{`9((%)A4#fWP&$i?Vv+6;A9fnF;8)$*|5qs`>J@2aNg z_}t&!j*;mt;)-$uzg`yz3fZh`^w+(pQ$J4{Dijv3Ra|6z3;K$*sZ^!5C&BKikOgXa03!t;d z-#(ppJPzl0+~4us_3iQYy_F+ogE7VSXj!>-=sgh<0@`Q50j84asIjvR8^Mt3zb2xW9 zyu1Bf#b0%MJjdt7!Tmq=O%0^jms;z4AhhxfyyvAXE}3)F=1ApWe9zVo%oyc%WE9L}*+-AKL-3~9~7&={6a5{uI z-TUGRN+MHuUN_1}g1iE<$}iDm0A#hCrG4xLi}9X}C+lnsZVxTt$ASzb#Vb{-@R#|P#1+!>R6SOZG_*C?hf_aDXw<(&hNtVrPXl@RxjXd!M8h+0 zU`pcBa8FgI@(9|zIG+_z*f=BaA^1LDX1-R*Dp7Y(}}506>7ff4ye$1Yg;IUX;b9^bYv z2^U?`B+A4{G5d^-Eg zKm3%01zA>vwEYgGrK5KZyPV;1xt8z{zvRl`wtVnVK5u)f`1i%2Hi+|i%2habJ3fEA zzgGwqd;MvLi|pp&0yh$h80c$mS;ycd$E^wHA2TLlQT5jBlW#|+%&GR+AcUaMhp1cX zD2RvE_XXGT(ks4I;#w?ZahVw%dC1ZbJE4N!e$5NSHbWA~dz#IRFZ#^`J(Zrs0qG@|n<8P{N<3kM0_1cplbFB$+_udHf6J!~+bOwAO zA5?Gg$JxLz5J;2Zw-Yojg!I+Hg@ijTss=k8Y?SD#NjimCJi6V<{t*SS(&frd;+IN&I*^3!nrj&LW<4 zmVwcG$O)T8!8%tpM?9q$Ca0FWfYJFNS0D{CggARVKZ(gy=;{o1!M2D12Yx=7l5LqL&d&xdFe0JR;EqCZeyra!$EBE|+EwLsw? zZ^WeuQ}z_%k}1Q*e72rTnxME6EFXa#91rD7hbA(~QNF?##zGMnRWeJiz-?(_ab3BU zuL>uPtktP7_YlR9Ya>>V=h;;9dYmn)9i9&hGrUFifwS;Xxs0 zh%ikRB_vRsGfbDsI9iTbB2(tTg`8~Yp5fQPUH=rO$JuBaYYFkj&>J&v4Au54b$h^! z$irh)S&)(EeTd`rbo}kb!PymxL7*kjLn6wQ{#zt)!w`yt6%!RM`3LsOKLaaJ*q7s% zLuj~$VvH4ChL&HwbGBO+0ypu_{R6BP5{PF>TZ|%Fh9~TkTXFEhV^Q^^lteErouyft zCePRDVocx9;!>6pAQVoKsjM<6p(YgSL0v4~<|EyJ9T@$|txUix`wAlCfTszaAC-Gj zP!{$0hZUv_hhYlAVw&))owm0c7jYq^#;@V9+Ga@QuMfnfejC~?BHk*?spU&)g0K82 zis5&@>X>;MfMDF!rRWL>5j?(-846yisX4t?tCYT0y^F#lOh!QXB}1wv83jdSxL9(L zl^lvVWm=^jK(Wch706a#NU+GJaM?)4Qt<&VVm4f2FJz*b$G{9XKZaNDkcx>{j+`=c z@KdB?=o!$4H~wTp%ny(C4d4^J80wErFi9Uj`P#4L0EZ#S@`GQEy8V$5BQ|PL4Q8Y3+naN$5|fp5mQKr5f^dk+h~{U!`Q7bT=rw_wgBYjarOsS z;TF6S&i+aK{1v6##bK)l0^(7M%792`CoUH;+dGf;)6wf_&$5uX*l3X# Date: Sat, 31 Oct 2026 09:00:01 +0100 Subject: [PATCH 05/12] Tiempos: limitations and README tests text match TESTING.md (owner review) Co-Authored-By: Claude Opus 5.5 --- sdk/octabam/modules/tiempos/README.md | 4 ++-- sdk/octabam/modules/tiempos/octamod.module.json | 3 +-- src/catalog/module-documents.json | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sdk/octabam/modules/tiempos/README.md b/sdk/octabam/modules/tiempos/README.md index b6aa8c1b6..3e5a094c9 100644 --- a/sdk/octabam/modules/tiempos/README.md +++ b/sdk/octabam/modules/tiempos/README.md @@ -54,7 +54,7 @@ One stock gesture changes: - **Why.** The screen has to open from any page with keys a DJ-style player reaches without looking. The MKI has no PROJ key, so CUE + PROJ is not available, and CUE + MIDI adds nothing on stock that MIDI alone does not do. - **What you see and do differently.** To switch to the MIDI tracks, press MIDI without holding CUE. While the Tiempos screen shows, LEFT, RIGHT and NO act on it; every other key reaches the unit. - **Turning it off.** Remove Tiempos from the module set. There is no setting. -- **Neighbouring flows checked** (emulator, MKI panel, with and without the module): MIDI alone switches tracks; SRC closes the screen and the page is redrawn. Not checked on a unit. +- **Neighbouring flows checked** on the author's MKI with the Modwerk base 24a0ed57: with the screen open, PLAY, STOP, tempo changes and track keys act as on stock, and a double press of a track key closes Tiempos and opens stock QUICK ASSIGN. In the emulator (MKI panel, with and without the module): MIDI alone switches tracks; SRC closes the screen and the page is redrawn. Not checked on a unit: every other key while the screen is open. ## Compatibility and limitations @@ -70,7 +70,7 @@ One stock gesture changes: ## Tests and measurements -See [TESTING.md](TESTING.md). Host tests only; no hardware, cycle or memory measurements yet. +See [TESTING.md](TESTING.md). Host tests pass 16/16. On the author's MKI with the Modwerk base 24a0ed57, over USB: totals, time left, elapsed time, the last-30-seconds flash, retriggers and tempo changes checked against a stopwatch; an install with Keep survived a power cycle and Undo removed it; the base's LOAD page showed no CPU or DSP change with the screen open or closed. Package: 2,240 bytes of code and data and 272 of state. The draw cost was measured in the emulator only (about 0.3 ms a UI tick open); no static cycle bound. Not tested: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, other modules at the same time. ## Authorship and licences diff --git a/sdk/octabam/modules/tiempos/octamod.module.json b/sdk/octabam/modules/tiempos/octamod.module.json index 8ac232960..d613d903f 100644 --- a/sdk/octabam/modules/tiempos/octamod.module.json +++ b/sdk/octabam/modules/tiempos/octamod.module.json @@ -38,8 +38,7 @@ ], "limitations": [ "Needs the Modwerk base over USB: it uses the base's draw and key events.", - "Not yet tested on a unit. The voice position (+0x44) and trim start and end (+0x28, +0x2c) were read in the emulator and must be confirmed on hardware.", - "Key codes for CUE, MIDI, LEFT and RIGHT follow Modwerk's status page and octabam's panel notes and worked in the emulator; to be confirmed on an MKI.", + "Tested on one MKI with the Modwerk base 24a0ed57. Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", "A track that loops shows the time left to the end of the sample, not to the end of the loop.", "Until a track has played for half a second, its time is shown at the sample's original speed.", diff --git a/src/catalog/module-documents.json b/src/catalog/module-documents.json index 28e737faf..0249475f0 100644 --- a/src/catalog/module-documents.json +++ b/src/catalog/module-documents.json @@ -10007,8 +10007,7 @@ ], "limitations": [ "Needs the Modwerk base over USB: it uses the base's draw and key events.", - "Not yet tested on a unit. The voice position (+0x44) and trim start and end (+0x28, +0x2c) were read in the emulator and must be confirmed on hardware.", - "Key codes for CUE, MIDI, LEFT and RIGHT follow Modwerk's status page and octabam's panel notes and worked in the emulator; to be confirmed on an MKI.", + "Tested on one MKI with the Modwerk base 24a0ed57. Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", "A track that loops shows the time left to the end of the sample, not to the end of the loop.", "Until a track has played for half a second, its time is shown at the sample's original speed.", From 6ad138c9ff5febf7e3e5af16aa3e123905f79b94 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 2 Nov 2026 14:59:02 +0100 Subject: [PATCH 06/12] Tiempos: reverse playback (RATE below 0) and RATE 0, with host tests and MKI results Co-Authored-By: Claude Opus 5.5 --- sdk/octabam/modules/tiempos/README.md | 10 +- sdk/octabam/modules/tiempos/TESTING.md | 41 ++++++- .../modules/tiempos/octamod.module.json | 38 +++---- sdk/octabam/modules/tiempos/tiempos.c | 102 +++++++++++++----- sdk/octabam/modules/tiempos/tiempos_host.c | 79 +++++++++++++- src/community/module-changelogs/tiempos.json | 6 +- 6 files changed, 218 insertions(+), 58 deletions(-) diff --git a/sdk/octabam/modules/tiempos/README.md b/sdk/octabam/modules/tiempos/README.md index 3e5a094c9..724f96dd9 100644 --- a/sdk/octabam/modules/tiempos/README.md +++ b/sdk/octabam/modules/tiempos/README.md @@ -12,11 +12,11 @@ Each track gets one 8-pixel row: | --- | --- | | Track number | Filled: playing. Outline: loaded and stopped. Dotted: empty, or a machine with no length (Thru, Neighbor, Pickup). | | Mark beside the number | The active track. | -| Bar | Solid: what is left to play. Thin line: what has played. A stop mark at the end. | -| Time left | Real time, m:ss. Flashes inverted in the last 30 seconds while the track plays. | +| Bar | Solid: what is left to play. Thin line: what has played. A stop mark at the end. A track playing backwards (RATE below 0) has its solid part on the left. | +| Time left | Real time, m:ss. Flashes inverted in the last 30 seconds while the track plays. `--:--` while a playing track stands still (RATE 0). | | Right column | Total length or time played, both at the current speed. | -The time left is real time, not sample time. Tiempos measures how fast each voice's play position moves against the unit's 132 MHz timer, every half second. That speed already includes timestretch, repitch and project tempo changes, so a 126 BPM track in a 128 BPM project shows 7:22 left where the sample length alone would say 7:29. After a tempo change the figure settles within two seconds. Tiempos does not need to know a sample's tempo or which slot a track uses. +The time left is real time, not sample time. Tiempos measures how fast each voice's play position moves against the unit's 132 MHz timer, every half second. That speed already includes timestretch, repitch and project tempo changes, so a 126 BPM track in a 128 BPM project shows 7:22 left where the sample length alone would say 7:29. After a tempo change the figure settles within two seconds. With RATE below 0 the track plays backwards: Tiempos measures the speed with its direction, counts the time left to the start of the trim and the time played from the end, and a trig, which sends a reversed track back to the end, starts the count again. Tiempos does not need to know a sample's tempo or which slot a track uses. Tiempos only reads memory and draws. It takes no effect slot, adds no knob and changes nothing in the project. @@ -66,11 +66,13 @@ One stock gesture changes: - The voice copies the trim only when it starts, so a track that has not played since the project loaded shows as empty (dotted, `--:--`) until it plays. - The time played and the total length count from the sample's trim start, so a trimmed sample shows its trimmed length. - A looping track shows the time to the end of the sample, not to the end of the loop. +- A track playing backwards shows as empty once it reaches the start: the unit clears its voice there, as when a forward track ends. +- With RATE 0 the unit does not start a track from a stopped transport (stock behaviour); Tiempos shows it as loaded and stopped. - Until a track has played for half a second, its time is shown at the sample's original speed. ## Tests and measurements -See [TESTING.md](TESTING.md). Host tests pass 16/16. On the author's MKI with the Modwerk base 24a0ed57, over USB: totals, time left, elapsed time, the last-30-seconds flash, retriggers and tempo changes checked against a stopwatch; an install with Keep survived a power cycle and Undo removed it; the base's LOAD page showed no CPU or DSP change with the screen open or closed. Package: 2,240 bytes of code and data and 272 of state. The draw cost was measured in the emulator only (about 0.3 ms a UI tick open); no static cycle bound. Not tested: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, other modules at the same time. +See [TESTING.md](TESTING.md). Host tests pass 24/24. On the author's MKI with the Modwerk base 24a0ed57, over USB: totals, time left, elapsed time, the last-30-seconds flash, retriggers and tempo changes checked against a stopwatch; reverse playback (RATE below 0) counted down to the start of the trim; an install with Keep survived a power cycle and Undo removed it; the base's LOAD page showed no CPU or DSP change with the screen open or closed. Package: 2,588 bytes of code and data and 304 of state. The draw cost was measured in the emulator only (about 0.3 ms a UI tick open); no static cycle bound. Not tested: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, other modules at the same time. ## Authorship and licences diff --git a/sdk/octabam/modules/tiempos/TESTING.md b/sdk/octabam/modules/tiempos/TESTING.md index 2014e3a63..4ea056e2d 100644 --- a/sdk/octabam/modules/tiempos/TESTING.md +++ b/sdk/octabam/modules/tiempos/TESTING.md @@ -14,13 +14,15 @@ python3 -B sdk/octabam/modules/tiempos/verify.py | Package | Source | Bytes | SHA-256 | Where it ran | | --- | --- | --- | --- | --- | | `225a0170…` | before the double press | 2,336 (2,156 code and data, 268 BSS, 33 relocations) | `225a0170382915f749315e26f4dbf97d4e0c4a047bf85bd347fb0e1bbe35d53e` | emulator 26 October; MKI 28 and 30 October | -| `0506a245…` | with the double press on a track key (current) | 2,444 (2,240 code and data, 272 BSS, 39 relocations) | `0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7` | MKI 30 October (fourth trial, USB lifecycle, load trial) | +| `0506a245…` | with the double press on a track key | 2,444 (2,240 code and data, 272 BSS, 39 relocations) | `0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7` | MKI 30 October (fourth trial, USB lifecycle, load trial) | + +| `8c886466…` | with reverse playback (RATE below 0) and RATE 0 (current) | 2,808 (2,588 code and data, 304 BSS, 43 relocations) | `8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022` | MKI 2 November (reverse trial) | Hook words of `0506a245…`: `module_tick` 0x1ca, `module_draw` 0x2d0, `module_key` 0x6e6, `module_enc` 0x81e; none after the core four. ## Host results -16 of 16 pass on `0506a245…`, no compiler warnings (`-Werror`): +24 of 24 pass on `8c886466…`, no compiler warnings (`-Werror`). The simulated voice goes backwards as on the MKI: its position falls and stays at the frame before the trim start (-1 for a trim at 0). Times are checked pixel for pixel against the font: | Check | Result | | --- | --- | @@ -40,6 +42,14 @@ Hook words of `0506a245…`: `module_tick` 0x1ca, `module_draw` 0x2d0, `module_k | Track key T3 twice, 500 ms apart: both reach the unit, the screen stays | pass | | T4, then T3 200 ms later: both reach the unit, the screen stays | pass | | T3 twice within 250 ms: both reach the unit, the screen closes and the unit redraws | pass | +| RATE turned from positive to negative while T1 plays: negative speed within 2 s | pass | +| Backwards: the time left is the time to the trim start | pass | +| Backwards: the total does not change | pass | +| Backwards: the solid part of the bar is on the left | pass | +| A reversed track retriggered (jumps to the end): still measured backwards | pass | +| A reversed track retriggered: the time left counts again from the end | pass | +| Backwards, at the trim start (position -1): 0:00, not flashing | pass | +| RATE 0 (active, not moving): `--:--` in the time left and the total | pass | ## Emulator results @@ -167,9 +177,32 @@ Not tested: a power cycle after the Undo, the site's guided sync, a set with oth Closed, Tiempos adds no load the page shows. The base's five-minute record for the first minutes after the power cycle (Tiempos installed, including the boot and the set's restore) reads CPU 45.5 % mean, 94.9 % peak and a UI tick gap of 1,901 frames; the boot is the likely cause, not separated here. Open, it stays within the stock range: 62 % read just after closing against a 64 % peak without Tiempos, with three tracks playing (LOAD cannot be shown while Tiempos holds the screen). During that trial the base's tick count grew 60 per second without gaps and Tiempos measured T1 at 0xf12c–0xf136 frames per second, as on 30 October. The base's five-minute records agree: minutes 15–20 (no Tiempos, three tracks) CPU 51.3 % mean / 64.7 % peak, tick gap 69 frames, playing 261/600; minutes 20–25 (mostly the trial, Tiempos opened and closed) 51.1 % / 62.7 %, tick gap 63 frames, playing 228/600; tracks 1-4 and 5-8 unchanged at 32.7–32.8 % and 41.9 %. The trial rolled back by itself after 420 s (generation 3, active `75b95b9e…`); no new stall record. The 28 October records near 1.5 % CPU were taken while the DSPs were stalled and are no baseline. +## Reverse playback on the MKI (2 November 2026, base `24a0ed57…`; reported by the developer, speeds read over USB) + +The owner asked in #1096 how Tiempos handles RATE below 0. On this MKI, RATE 0 is the normal speed's zero point, not the default: the developer's tracks play at the highest RATE, negative values play backwards, and 0 holds the voice still. + +**Package `0506a245…`, trial (not accepted).** Track 1 (Static, the 100 BPM tone at 120 BPM) with RATE -64 sounded from the end; row 1 read 0:00, then 99:59 left and 99:59 total at RATE -12. Tiempos took every backward step as a jump, so it kept no speed or kept a tiny forward one (34 frames a second), and counted towards the end of the sample. + +**Diagnostic package (trial only, not committed, built from this folder with `api->value` set to track 1's position).** Positions read once a second: + +| What the developer did | Track 1's position | +| --- | --- | +| RATE at its highest | +52,915 frames a second; a trig retriggers it backwards to the start | +| RATE below 0 while playing | -52,935 a second; at the start it stays at **-1** (signed) and the voice stays active | +| A trig on the reversed track | jumps forward to the end (6,764,698, or +370,425) and falls again | +| RATE -16 and -10 or so | -16,536 and -10,749 a second, steady | +| RATE 0 | the position does not move; from a stopped transport the voice does not start, sound or advance | +| Turning RATE | small steps both ways | + +**Package `8c886466…`, trial (not accepted).** Speeds Tiempos measured on track 1: -10,749 frames a second backwards (416-455 s), 0 at the start, +7,440 and +9,096 forwards after RATE changes; each change of direction settled within a second. Reported: backwards, row 1 counted down to 0:00 in step with the stopwatch; a trig on the reversed track restarted the count from the end; tracks 2 and 3 (Static forwards, Flex) as before. When the reversed track reached its start, the row turned empty (dotted number, `--:--`): the unit clears that voice's fields, as it does when a forward track ends. With RATE 0 from a stopped transport the track does not start, which is the unit's own behaviour (the diagnostic run showed the voice not advancing), and the row looked like a loaded, stopped track. The `--:--` for an active voice that does not move is covered by the host test only. + +The first attempt to load `8c886466…` was refused while the diagnostic trial still ran; a SIGINT to that trial did not confirm its rollback, so the session's `recover` request rolled it back (generation 6) before the load. Each trial ended with the bare base (generation 8 after the last). + +Not tested: a stopwatch figure for the reversed track, Flex and Static at other negative RATE values, reverse with timestretch modes other than NORMAL. + ## Hardware and audio quality -Tiempos makes no sound. On the MKI with the released base `24a0ed57…` (above): CUE + MIDI, LEFT, RIGHT, NO, track keys and the double press as described; totals, time left, the last-30-seconds flash, a hand retrigger, trimmed and Flex tracks and tempo changes against the stopwatch and the expected 64-bar times. The voice fields were not read directly (a released base answers no `mem` request): the totals are the indirect check. +Tiempos makes no sound. On the MKI with the released base `24a0ed57…` (above): CUE + MIDI, LEFT, RIGHT, NO, track keys and the double press as described; totals, time left, the last-30-seconds flash, a hand retrigger, trimmed and Flex tracks and tempo changes against the stopwatch and the expected 64-bar times; reverse playback with package `8c886466…` (above). The voice fields were not read directly (a released base answers no `mem` request): the totals are the indirect check. Not tested: an MKII; timestretch modes other than NORMAL; Part changes and project reloads with the screen open; minutes-long accuracy beyond one play of each 64-bar sample; SRC, AMP, LFO, FX1, FX2, BANK and PATTERN closing the screen on a unit (emulator only); a set with other modules beside Tiempos. @@ -179,7 +212,7 @@ On the unit, with Tiempos installed: PLAY, STOP, TEMPO and track keys behave as ## Performance and resources -Package `0506a245…`: 2,240 bytes of code and data, 272 bytes of BSS. No DSP code, no effect slot, no DSP memory; the DSP load and space on LOAD are the same with and without it (above). ColdFire load: no change the LOAD page or the base's five-minute records show, closed or open (above). Cycles per tick not measured: the released base has no `modwerk_cost` profile. +Package `8c886466…`: 2,588 bytes of code and data, 304 bytes of BSS (`0506a245…`: 2,240 and 272). The load figures above were taken with `0506a245…`; `8c886466…` adds a signed speed and a second bar shape, with the same pixel count per row. No DSP code, no effect slot, no DSP memory; the DSP load and space on LOAD are the same with and without it (above). ColdFire load: no change the LOAD page or the base's five-minute records show, closed or open (above). Cycles per tick not measured: the released base has no `modwerk_cost` profile. ## OT UI capture evidence diff --git a/sdk/octabam/modules/tiempos/octamod.module.json b/sdk/octabam/modules/tiempos/octamod.module.json index d613d903f..56453b76e 100644 --- a/sdk/octabam/modules/tiempos/octamod.module.json +++ b/sdk/octabam/modules/tiempos/octamod.module.json @@ -41,6 +41,7 @@ "Tested on one MKI with the Modwerk base 24a0ed57. Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", "A track that loops shows the time left to the end of the sample, not to the end of the loop.", + "A track playing backwards (RATE below 0) shows as empty once it reaches its start: the unit clears the voice there.", "Until a track has played for half a second, its time is shown at the sample's original speed.", "Thru, Neighbor and Pickup tracks show no time." ], @@ -50,11 +51,11 @@ "recorded": "Developer's MKI, 30 Oct 2026; emulator 30 Oct 2026", "storage": { "label": "Storage", - "display": "2,512 bytes", - "value": 2512, + "display": "2,892 bytes", + "value": 2892, "unit": "bytes", "method": "static", - "conditions": "From the USB package 0506a245: 2,240 bytes of ColdFire code and data and 272 of bss, one instance. No DSP memory, no heap, no card files.", + "conditions": "From the USB package 8c886466: 2,588 bytes of ColdFire code and data and 304 of bss, one instance. No DSP memory, no heap, no card files.", "source": "TESTING.md" }, "processing": { @@ -83,14 +84,14 @@ "memory": { "level": "minimal", "basis": "source-estimate", - "rationale": "2,512 bytes of ColdFire code, data and state in DRAM, from the package header.", + "rationale": "2,892 bytes of ColdFire code, data and state in DRAM, from the package header.", "source": "TESTING.md" } } }, "tests": { "report": "TESTING.md", - "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes and the double press that closes it; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 16/16. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", + "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes the double press that closes it, and (package 8c886466) reverse playback with RATE below 0; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 24/24. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", "hardwareStatus": "reported", "evidenceRevision": "b7d77c81daad633b1e6b283e9227dfbf783885da", "gates": [ @@ -98,8 +99,8 @@ ], "qualification": { "moduleVersion": "0.1.0-experimental", - "sourceSha256": "fa47d8783bcb42b636514d6e256fad6ce2022e8e66d7ebd18a9236ed28f03b85", - "imageSha256": "0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7", + "sourceSha256": "527a9fc09c879f1caa9887f28d4b1b5c881b935bcbd145e4eb9961567857943b", + "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", "cycles": [ { "processor": "coldfire", @@ -124,41 +125,42 @@ { "name": "ColdFire code and data (tiempos.c, deck_font.h, DRAM)", "space": "sdram", - "words": 2240, + "words": 2588, "wordBits": 8, - "bytes": 2240, + "bytes": 2588, "scope": "shared" }, { "name": "State (bss): eight track records, screen and key state", "space": "sdram", - "words": 272, + "words": 304, "wordBits": 8, - "bytes": 272, + "bytes": 304, "scope": "shared" } ], "perInstanceBytes": 0, - "sharedBytes": 2512, + "sharedBytes": 2892, "maxInstances": 1, - "totalBytes": 2512, - "conditions": "From the USB package header (2,240 bytes of code and data, 272 of bss, 39 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", + "totalBytes": 2892, + "conditions": "From the USB package 8c886466 (2,588 bytes of code and data, 304 of bss, 43 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", "report": "TESTING.md" }, "hardware": { "kind": "functional", "status": "reported", "model": "MKI", - "testedOn": "2026-10-30", + "testedOn": "2026-11-02", "tester": "imdantelo", "sourceRevision": "b7d77c81daad633b1e6b283e9227dfbf783885da", - "imageSha256": "0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7", - "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger.", + "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", + "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466.", "limitations": [ "One MKI; no MKII.", "The stopwatch figures come from the developer's photos and readings; the voice fields were not read directly (a released base answers no mem request).", "Part changes, project reloads, timestretch modes other than NORMAL and other modules beside Tiempos were not run.", - "Draw cost estimated in the emulator, not measured on the unit; no static bound and no MIDI flood." + "Draw cost estimated in the emulator, not measured on the unit; no static bound and no MIDI flood.", + "Reverse playback: one trial; no stopwatch figure written down for the reversed track; RATE 0 on an active voice covered by the host test only." ], "report": "TESTING.md" }, diff --git a/sdk/octabam/modules/tiempos/tiempos.c b/sdk/octabam/modules/tiempos/tiempos.c index 7dbbde30f..a907db4dd 100644 --- a/sdk/octabam/modules/tiempos/tiempos.c +++ b/sdk/octabam/modules/tiempos/tiempos.c @@ -14,6 +14,11 @@ * de 132 MHz). Así el tiempo restante ya incluye time-stretch, repitch y cambios de * tempo, y no hace falta saber qué slot usa cada pista (P4). * + * Con RATE negativo la voz va hacia atrás: la posición baja (hasta -1 al llegar al + * inicio) y un redisparo salta al final. La velocidad se mide con signo, solo si el + * sentido se mantiene en la ventana; hacia atrás falta lo que hay hasta el inicio del + * trim. Con RATE 0 la voz está quieta y el tiempo restante se muestra como --:--. + * * Teclas (deck_keys.h): CUE + MIDI abre y cierra · NO cierra · LEFT / RIGHT cambian * la columna derecha (duración total / tiempo transcurrido) · páginas, BANK y * PATTERN cierran y llegan al OS · dos pulsaciones de la misma tecla de pista en @@ -41,6 +46,7 @@ #define WINDOW_MS 500u /* ventana de medida de la velocidad */ #define BLINK_SECS 30u #define DOUBLE_MS 400u /* dos pulsaciones de la misma pista: cierra */ +#define STILL_RATE 64u /* frames por segundo: por debajo, la voz está quieta (RATE 0) */ /* ---------------------------------------------------------------- dibujo */ static unsigned char *fb; @@ -92,10 +98,13 @@ static void fmt_time(char *s, uint32_t secs) /* ---------------------------------------------------------------- estado */ struct track { - uint32_t pos, start, len, last_pos; /* frames; start y len: el trim de la voz */ - uint32_t win_pos, win_t; /* inicio de la ventana de medida */ - uint32_t rate; /* frames por segundo real; 0 = sin medir */ - uint8_t active, measuring; + int32_t pos, last_pos; /* frames, con signo: hacia atrás llega a -1 */ + uint32_t start, len; /* el trim de la voz, frames */ + int32_t win_pos; /* inicio de la ventana de medida */ + uint32_t win_t; + int32_t rate; /* frames por segundo real, con signo (< 0 = hacia atrás) */ + int8_t dir, win_dir; /* sentido del último avance y de la ventana: 1, -1 o 0 */ + uint8_t active, measuring, measured; }; static struct track tr[TRACKS]; @@ -106,8 +115,18 @@ static uint32_t ticks; static uint8_t cur_track; static uint32_t toast_until; -/* Velocidad para los cálculos: la medida o, si no hay, la original (44,1 kHz). */ -static uint32_t rate_of(const struct track *t) { return t->rate ? t->rate : OT_RATE; } +/* Velocidad para los cálculos, sin signo: la medida o, si no hay, la original (44,1 kHz). */ +static uint32_t rate_of(const struct track *t) +{ + if (!t->measured) return OT_RATE; + return t->rate < 0 ? (uint32_t)-t->rate : (uint32_t)t->rate; +} + +/* Hacia atrás: el sentido medido o, sin medida, el del último avance. */ +static int reverse(const struct track *t) { return t->measured && t->rate ? t->rate < 0 : t->dir < 0; } + +/* RATE 0: medida y casi quieta; el tiempo restante no tiene sentido. */ +static int still(const struct track *t) { return t->measured && rate_of(t) < STILL_RATE; } static uint32_t secs_for(uint32_t frames, uint32_t rate) { @@ -123,24 +142,36 @@ static void sample_tracks(void) struct track *t = &tr[i]; uint32_t v = OT_VOICE_BASE + i * OT_VOICE_STRIDE; t->active = RD8(v + OT_VOICE_ACTIVE) != 0; - t->pos = RD32(v + OT_VOICE_POS); + t->pos = (int32_t)RD32(v + OT_VOICE_POS); t->start = RD32(v + OT_VOICE_START); t->len = RD32(v + OT_VOICE_END); - /* Saltos (retrig, cue, nueva muestra) o parada: se empieza otra ventana, - * conservando la última velocidad medida. */ - int jumped = t->pos < t->last_pos || t->pos - t->last_pos > OT_RATE; /* > 1 s de audio en 1 tick */ - if (!t->active || jumped || !t->measuring) { + /* Redisparo, cue o muestra nueva: un salto de más de 1 s, o uno en contra del + * sentido en que suena de más de 1/8 s (hacia atrás, el redisparo vuelve al final). + * Un paso corto en contra es un cambio de RATE: cambia el sentido, no es un salto. */ + int32_t step = t->pos - t->last_pos; + uint32_t size = step < 0 ? (uint32_t)-step : (uint32_t)step; + int8_t sign = step > 0 ? 1 : step < 0 ? -1 : 0; + int jumped = size > OT_RATE || (sign && sign == -t->dir && size > OT_RATE / 8u); + if (sign && !jumped) t->dir = sign; + + /* Se empieza otra ventana, conservando la última velocidad medida, tras un salto, + * una parada o un cambio de sentido dentro de la ventana. */ + if (!t->active || jumped || !t->measuring || (sign && t->win_dir && sign != t->win_dir)) { t->win_pos = t->pos, t->win_t = now, t->measuring = t->active; + t->win_dir = jumped ? 0 : sign; } else { + if (sign) t->win_dir = sign; uint32_t dt = (now - t->win_t) / (OT_DTCN3_PER_MS / 10u); /* décimas de ms */ if (dt >= WINDOW_MS * 10u) { - uint32_t dp = t->pos - t->win_pos; /* < 2 * 44100 en 0,5 s */ - uint32_t r = dp * 10000u / dt; /* frames por segundo; dp * 1e4 < 2^32 */ - /* suaviza si es parecida a la anterior; si cambia mucho (tempo nuevo), se toma tal cual */ - uint32_t d = r > t->rate ? r - t->rate : t->rate - r; - t->rate = t->rate && d * 50u < t->rate ? (t->rate * 3u + r) / 4u : r; - t->win_pos = t->pos, t->win_t = now; + int32_t dp = t->pos - t->win_pos; /* |dp| < 2 * 44100 en 0,5 s */ + int32_t r = dp * 10000 / (int32_t)dt; /* frames por segundo; |dp| * 1e4 < 2^31 */ + /* suaviza si es parecida a la anterior; si cambia mucho (tempo o RATE nuevos), se toma tal cual */ + int32_t d = r > t->rate ? r - t->rate : t->rate - r; + int32_t m = t->rate < 0 ? -t->rate : t->rate; + t->rate = t->measured && m && d * 50 < m ? (t->rate * 3 + r) / 4 : r; + t->measured = 1; + t->win_pos = t->pos, t->win_t = now, t->win_dir = 0; } } t->last_pos = t->pos; @@ -151,8 +182,14 @@ static void sample_tracks(void) static void draw_row(unsigned i) { const struct track *t = &tr[i]; - int y = (int)i * ROW_H, loaded = t->len > t->start && t->pos <= t->len; - uint32_t played = t->pos > t->start ? t->pos - t->start : 0u, total = loaded ? t->len - t->start : 0u; + int y = (int)i * ROW_H, loaded = t->len > t->start && t->pos <= (int32_t)t->len; + /* posición dentro del trim; hacia atrás llega a -1, por debajo del inicio */ + uint32_t at_pos = t->pos > (int32_t)t->start ? (uint32_t)t->pos : t->start; + uint32_t total = loaded ? t->len - t->start : 0u; + int back = reverse(t); + /* hacia delante falta hasta el final; hacia atrás, hasta el inicio del trim */ + uint32_t left = back ? at_pos - t->start : (loaded ? t->len - at_pos : 0u); + uint32_t played = total - left; char s[8]; s[0] = (char)('1' + i), s[1] = 0; @@ -175,19 +212,32 @@ static void draw_row(unsigned i) return; } - /* barra: escala por longitud; la parte que falta, maciza */ + /* barra: escala por longitud; la parte que falta, maciza (hacia atrás, a la izquierda) */ int w = BAR_X1 - BAR_X0; - int at = BAR_X0 + (int)((played >> 8) * (uint32_t)w / ((total >> 8) + 1u)); + int at = BAR_X0 + (int)(((at_pos - t->start) >> 8) * (uint32_t)w / ((total >> 8) + 1u)); if (at > BAR_X1) at = BAR_X1; - if (at > BAR_X0) rect(BAR_X0, y + 3, at - 1, y + 3, 1); - rect(at, y + 1, BAR_X1, y + 5, 1); + if (back) { + rect(BAR_X0, y + 1, at, y + 5, 1); + if (at < BAR_X1) rect(at + 1, y + 3, BAR_X1, y + 3, 1); + } else { + if (at > BAR_X0) rect(BAR_X0, y + 3, at - 1, y + 3, 1); + rect(at, y + 1, BAR_X1, y + 5, 1); + } rect(BAR_X1 + 1, y, BAR_X1 + 1, y + 6, 1); /* tope */ + /* RATE 0: sin tiempo restante ni total que mostrar (al final queda 0:00, quieta o no) */ + if (still(t) && left) { + text(REM_END - text_w("--:--") + 1, y + 1, "--:--", 1); + text(RIGHT_END - text_w("--:--") + 1, y + 1, "--:--", 1); + return; + } + /* tiempo restante, real */ - uint32_t rate = rate_of(t), rem = secs_for(t->len - t->pos, rate); + uint32_t rate = rate_of(t), rem = secs_for(left, rate); fmt_time(s, rem); int x = REM_END - text_w(s) + 1; - if (t->active && rem < BLINK_SECS && !((ticks / 30u) & 1u)) { + /* hacia atrás la voz sigue activa en el inicio: ahí ha terminado y no parpadea */ + if (t->active && left && rem < BLINK_SECS && !((ticks / 30u) & 1u)) { rect(x - 1, y, REM_END + 1, y + 6, 1); text(x, y + 1, s, 0); } else text(x, y + 1, s, 1); @@ -202,7 +252,7 @@ void module_tick(struct modwerk_runtime_api *api) { ++ticks; sample_tracks(); /* también cerrado: así la velocidad ya está medida al abrir */ - if (api) api->value = tr[0].rate; + if (api) api->value = (uint32_t)tr[0].rate; /* con signo: hacia atrás, negativa */ } void module_draw(unsigned char *frame) diff --git a/sdk/octabam/modules/tiempos/tiempos_host.c b/sdk/octabam/modules/tiempos/tiempos_host.c index 50f5e3410..12c1f6690 100644 --- a/sdk/octabam/modules/tiempos/tiempos_host.c +++ b/sdk/octabam/modules/tiempos/tiempos_host.c @@ -11,10 +11,11 @@ #include "modwerk_module.h" #include "ot_state.h" #include "deck_keys.h" +#include "deck_font.h" static double now_s; /* tiempo real simulado */ static uint8_t active[8], cur; -static double pos[8], speed[8]; /* frames, frames por segundo */ +static double pos[8], speed[8]; /* frames, frames por segundo (negativa: hacia atrás) */ static uint32_t start[8], len[8]; /* trim de cada voz, frames */ static int redraws, fails; @@ -23,7 +24,7 @@ uint32_t host_rd32(uint32_t a) if (a == OT_DTCN3) return (uint32_t)(uint64_t)llround(now_s * 132e6); for (unsigned t = 0; t < 8; ++t) { uint32_t v = OT_VOICE_BASE + t * OT_VOICE_STRIDE; - if (a == v + OT_VOICE_POS) return (uint32_t)pos[t]; + if (a == v + OT_VOICE_POS) return (uint32_t)(int32_t)llround(pos[t]); /* hacia atrás llega a -1 */ if (a == v + OT_VOICE_START) return start[t]; if (a == v + OT_VOICE_END) return len[t]; } @@ -39,6 +40,7 @@ uint8_t host_rd8(uint32_t a) } void host_redraw(void) { ++redraws; } +#define BAR_TEST_X0 13 /* BAR_X0 de tiempos.c */ static unsigned char frame[1024]; static int pixel(int x, int y) { return (frame[x * 8 + 7 - (y >> 3)] >> (y & 7)) & 1; } static void check(int ok, const char *what) { printf("%s %s\n", ok ? "OK " : "FALLO", what); if (!ok) ++fails; } @@ -49,7 +51,12 @@ static void run(double secs) for (int i = 0; i < n; ++i) { now_s += 1.0 / 60.0; for (int t = 0; t < 8; ++t) - if (active[t]) { pos[t] += speed[t] / 60.0; if (pos[t] >= len[t]) pos[t] = len[t], active[t] = 0; } + if (active[t]) { + pos[t] += speed[t] / 60.0; + if (pos[t] >= len[t]) pos[t] = len[t], active[t] = 0; + /* hacia atrás, como en la MKI: se queda en el frame anterior al inicio, activa */ + if (speed[t] < 0 && pos[t] < start[t]) pos[t] = (double)start[t] - 1; + } module_tick(0); } } @@ -76,6 +83,23 @@ static int lit_in(int x0, int x1, int y0, int y1) return n; } +/* ¿Muestra la zona que acaba en x_end, en la fila y, exactamente el texto s? */ +static int text_at(int x_end, int y, const char *s) +{ + int n = (int)strlen(s), x0 = x_end - (n * 4 - 1) + 1; + for (int x = x0 - 2; x <= x_end; ++x) /* x0 - 2: no llega al tope de la barra */ + for (int r = 0; r < 5; ++r) { + int want = 0, k = x - x0; + if (k >= 0 && k % 4 < 3) { + int c = (unsigned char)s[k / 4]; + want = (deck_font[c - 32] >> (14 - r * 3 - k % 4)) & 1; + } + if (pixel(x, y + 1 + r) != want) return 0; + } + return 1; +} +static void mmss(char *s, unsigned secs) { snprintf(s, 8, "%u:%02u", secs / 60, secs % 60); } + int main(int argc, char **argv) { const char *out = argc > 1 ? argv[1] : "."; @@ -172,6 +196,55 @@ int main(int argc, char **argv) draw(); check(pass && frame[0] == 0xA5 && redraws == r0 + 1, "T3 dos veces en 250 ms: llega al OS, cierra y el OS redibuja"); + /* RATE negativo (MKI, 2 de noviembre): la posición baja, se queda en -1 en el inicio y un + * redisparo salta al final. T1 sigue sonando hacia delante a 132/126. */ + key(K_CUE, 1); key(K_MIDI, 1); key(K_MIDI, 0); key(K_CUE, 0); + key(K_LEFT, 1); key(K_LEFT, 0); /* la columna derecha vuelve a la duración total */ + double fwd = R * 132.0 / 126.0; + speed[0] = -fwd; + run(2.0); + { + struct modwerk_runtime_api api = {0}; + module_tick(&api); + int32_t r = (int32_t)api.value; + check(r < 0 && fabs(-r - fwd) / fwd < 0.002, "de RATE positivo a negativo sonando: velocidad negativa en < 2 s"); + } + draw(); + dump(out, "t3_hacia_atras"); + char want[8], less[8]; + unsigned rem = (unsigned)((pos[0] - start[0]) / fwd); + mmss(want, rem), mmss(less, rem ? rem - 1 : 0); + check(text_at(103, 0, want) || text_at(103, 0, less), "hacia atrás: el restante es lo que queda hasta el inicio del trim"); + mmss(want, (unsigned)((len[0] - start[0]) / fwd)); + check(text_at(127, 0, want), "hacia atrás: el total no cambia"); + check(pixel(BAR_TEST_X0 + 1, 1) && !pixel(79, 1) && pixel(79, 3), "hacia atrás: la barra maciza queda a la izquierda"); + + /* redisparo de la pista invertida: salta al final y sigue hacia atrás sin perder la medida */ + pos[0] = len[0] - 60 * R; + run(0.1); + { + struct modwerk_runtime_api api = {0}; + module_tick(&api); + check((int32_t)api.value < 0, "redisparo de una pista invertida: sigue midiendo hacia atrás"); + } + draw(); + rem = (unsigned)((pos[0] - start[0]) / fwd); + mmss(want, rem), mmss(less, rem - 1); + check(text_at(103, 0, want) || text_at(103, 0, less), "redisparo de una pista invertida: el restante vuelve a contar desde el final"); + + /* llega al inicio: 0:00 fijo, sin parpadeo */ + pos[0] = start[0] + 0.5 * R; + run(1.5); + draw(); a = text_at(103, 0, "0:00"); + run(0.5); draw(); b = text_at(103, 0, "0:00"); + check(pos[0] < 0 && a && b, "hacia atrás al llegar al inicio (-1): 0:00 sin parpadeo"); + + /* RATE 0: la voz quieta no inventa un tiempo */ + pos[0] = 300 * R, speed[0] = 0; + run(1.5); + draw(); + check(text_at(103, 0, "--:--") && text_at(127, 0, "--:--"), "RATE 0: --:-- en el restante y en el total"); + printf("\n%d fallo(s)\n", fails); return fails != 0; } diff --git a/src/community/module-changelogs/tiempos.json b/src/community/module-changelogs/tiempos.json index 385169abf..1a33b48e7 100644 --- a/src/community/module-changelogs/tiempos.json +++ b/src/community/module-changelogs/tiempos.json @@ -1,13 +1,13 @@ [ { "version": "0.1.0-experimental", - "date": "2026-10-30", + "date": "2026-11-02", "changes": [ "New: hold CUE and press MIDI to see the time left on all eight audio tracks on one screen.", - "The time left is real time: it follows timestretch, repitch and tempo changes, and flashes in the last 30 seconds.", + "The time left is real time: it follows timestretch, repitch, tempo changes and RATE, forwards or backwards, and flashes in the last 30 seconds.", "Close it with NO or CUE + MIDI; a track key pressed twice closes it and opens that track's QUICK ASSIGN, as on stock. LEFT and RIGHT switch the right column between total and time played.", "Needs the Modwerk base loaded over USB, which is in the beta. Card firmware cannot include it. While installed, CUE + MIDI no longer switches to the MIDI tracks; MIDI alone still does.", - "Known issues: a track shows as empty until it has played once since the project loaded; a looping track shows the time to the end of the sample." + "Known issues: a track shows as empty until it has played once since the project loaded, and again when it reaches its start playing backwards; a looping track shows the time to the end of the sample." ] } ] From b2a9715b628d014a0f704dd30579a0880f4c1a4e Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 2 Nov 2026 14:59:11 +0100 Subject: [PATCH 07/12] Tiempos: evidence revision for the reverse-playback package, generated catalogue Co-Authored-By: Claude Opus 5.5 --- .../modules/tiempos/octamod.module.json | 4 +- src/catalog/module-documents.json | 42 ++++++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/sdk/octabam/modules/tiempos/octamod.module.json b/sdk/octabam/modules/tiempos/octamod.module.json index 56453b76e..393378d20 100644 --- a/sdk/octabam/modules/tiempos/octamod.module.json +++ b/sdk/octabam/modules/tiempos/octamod.module.json @@ -93,7 +93,7 @@ "report": "TESTING.md", "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes the double press that closes it, and (package 8c886466) reverse playback with RATE below 0; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 24/24. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", "hardwareStatus": "reported", - "evidenceRevision": "b7d77c81daad633b1e6b283e9227dfbf783885da", + "evidenceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", "gates": [ "modules/tiempos/verify.py" ], @@ -152,7 +152,7 @@ "model": "MKI", "testedOn": "2026-11-02", "tester": "imdantelo", - "sourceRevision": "b7d77c81daad633b1e6b283e9227dfbf783885da", + "sourceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466.", "limitations": [ diff --git a/src/catalog/module-documents.json b/src/catalog/module-documents.json index 0249475f0..cb6769e93 100644 --- a/src/catalog/module-documents.json +++ b/src/catalog/module-documents.json @@ -10010,6 +10010,7 @@ "Tested on one MKI with the Modwerk base 24a0ed57. Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", "A track that loops shows the time left to the end of the sample, not to the end of the loop.", + "A track playing backwards (RATE below 0) shows as empty once it reaches its start: the unit clears the voice there.", "Until a track has played for half a second, its time is shown at the sample's original speed.", "Thru, Neighbor and Pickup tracks show no time." ] @@ -10018,11 +10019,11 @@ "recorded": "Developer's MKI, 30 Oct 2026; emulator 30 Oct 2026", "storage": { "label": "Storage", - "display": "2,512 bytes", - "value": 2512, + "display": "2,892 bytes", + "value": 2892, "unit": "bytes", "method": "static", - "conditions": "From the USB package 0506a245: 2,240 bytes of ColdFire code and data and 272 of bss, one instance. No DSP memory, no heap, no card files.", + "conditions": "From the USB package 8c886466: 2,588 bytes of ColdFire code and data and 304 of bss, one instance. No DSP memory, no heap, no card files.", "source": "TESTING.md" }, "processing": { @@ -10051,16 +10052,16 @@ "memory": { "level": "minimal", "basis": "source-estimate", - "rationale": "2,512 bytes of ColdFire code, data and state in DRAM, from the package header.", + "rationale": "2,892 bytes of ColdFire code, data and state in DRAM, from the package header.", "source": "TESTING.md" } } }, "tests": { "report": "TESTING.md", - "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes and the double press that closes it; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 16/16. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", + "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes the double press that closes it, and (package 8c886466) reverse playback with RATE below 0; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 24/24. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", "hardwareStatus": "reported", - "evidenceRevision": "b7d77c81daad633b1e6b283e9227dfbf783885da", + "evidenceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", "gates": [ "modules/tiempos/verify.py" ], @@ -10081,8 +10082,8 @@ "screenshotStyle": "black-and-white" }, "moduleVersion": "0.1.0-experimental", - "sourceSha256": "fa47d8783bcb42b636514d6e256fad6ce2022e8e66d7ebd18a9236ed28f03b85", - "imageSha256": "0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7", + "sourceSha256": "527a9fc09c879f1caa9887f28d4b1b5c881b935bcbd145e4eb9961567857943b", + "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", "cycles": [ { "processor": "coldfire", @@ -10107,41 +10108,42 @@ { "name": "ColdFire code and data (tiempos.c, deck_font.h, DRAM)", "space": "sdram", - "words": 2240, + "words": 2588, "wordBits": 8, - "bytes": 2240, + "bytes": 2588, "scope": "shared" }, { "name": "State (bss): eight track records, screen and key state", "space": "sdram", - "words": 272, + "words": 304, "wordBits": 8, - "bytes": 272, + "bytes": 304, "scope": "shared" } ], "perInstanceBytes": 0, - "sharedBytes": 2512, + "sharedBytes": 2892, "maxInstances": 1, - "totalBytes": 2512, - "conditions": "From the USB package header (2,240 bytes of code and data, 272 of bss, 39 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", + "totalBytes": 2892, + "conditions": "From the USB package 8c886466 (2,588 bytes of code and data, 304 of bss, 43 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", "report": "TESTING.md" }, "hardware": { "kind": "functional", "status": "reported", "model": "MKI", - "testedOn": "2026-10-30", + "testedOn": "2026-11-02", "tester": "imdantelo", - "sourceRevision": "b7d77c81daad633b1e6b283e9227dfbf783885da", - "imageSha256": "0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7", - "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger.", + "sourceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", + "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", + "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466.", "limitations": [ "One MKI; no MKII.", "The stopwatch figures come from the developer's photos and readings; the voice fields were not read directly (a released base answers no mem request).", "Part changes, project reloads, timestretch modes other than NORMAL and other modules beside Tiempos were not run.", - "Draw cost estimated in the emulator, not measured on the unit; no static bound and no MIDI flood." + "Draw cost estimated in the emulator, not measured on the unit; no static bound and no MIDI flood.", + "Reverse playback: one trial; no stopwatch figure written down for the reversed track; RATE 0 on an active voice covered by the host test only." ], "report": "TESTING.md" } From cde9c8981195d83a9c147b4cee7c0e49d442e2c5 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 2 Nov 2026 15:04:27 +0100 Subject: [PATCH 08/12] Tiempos: clearer RATE sentence in TESTING.md Co-Authored-By: Claude Opus 5.5 --- sdk/octabam/modules/tiempos/TESTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/octabam/modules/tiempos/TESTING.md b/sdk/octabam/modules/tiempos/TESTING.md index 4ea056e2d..f82ce8e1e 100644 --- a/sdk/octabam/modules/tiempos/TESTING.md +++ b/sdk/octabam/modules/tiempos/TESTING.md @@ -179,7 +179,7 @@ Closed, Tiempos adds no load the page shows. The base's five-minute record for t ## Reverse playback on the MKI (2 November 2026, base `24a0ed57…`; reported by the developer, speeds read over USB) -The owner asked in #1096 how Tiempos handles RATE below 0. On this MKI, RATE 0 is the normal speed's zero point, not the default: the developer's tracks play at the highest RATE, negative values play backwards, and 0 holds the voice still. +The owner asked in #1096 how Tiempos handles RATE below 0. On this MKI the highest RATE (the default) plays forward at normal speed, negative values play backwards, and 0 holds the voice still. **Package `0506a245…`, trial (not accepted).** Track 1 (Static, the 100 BPM tone at 120 BPM) with RATE -64 sounded from the end; row 1 read 0:00, then 99:59 left and 99:59 total at RATE -12. Tiempos took every backward step as a jump, so it kept no speed or kept a tiny forward one (34 frames a second), and counted towards the end of the sample. From b711e14055b6c46658a9a44ca0ff21580ead55f6 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 7 Nov 2026 13:58:10 +0100 Subject: [PATCH 09/12] Tiempos: published ABI 8 package 0b54a734, USB lifecycle on base 9b3ba417 Co-Authored-By: Claude Opus 5.5 --- sdk/octabam/modules/tiempos/README.md | 2 +- sdk/octabam/modules/tiempos/TESTING.md | 25 ++++++++++++++++--- .../modules/tiempos/octamod.module.json | 15 +++++------ 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/sdk/octabam/modules/tiempos/README.md b/sdk/octabam/modules/tiempos/README.md index 724f96dd9..e4a1f1c5a 100644 --- a/sdk/octabam/modules/tiempos/README.md +++ b/sdk/octabam/modules/tiempos/README.md @@ -72,7 +72,7 @@ One stock gesture changes: ## Tests and measurements -See [TESTING.md](TESTING.md). Host tests pass 24/24. On the author's MKI with the Modwerk base 24a0ed57, over USB: totals, time left, elapsed time, the last-30-seconds flash, retriggers and tempo changes checked against a stopwatch; reverse playback (RATE below 0) counted down to the start of the trim; an install with Keep survived a power cycle and Undo removed it; the base's LOAD page showed no CPU or DSP change with the screen open or closed. Package: 2,588 bytes of code and data and 304 of state. The draw cost was measured in the emulator only (about 0.3 ms a UI tick open); no static cycle bound. Not tested: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, other modules at the same time. +See [TESTING.md](TESTING.md). Host tests pass 24/24. On the author's MKI with the Modwerk base 24a0ed57 (and 9b3ba417 for the published package's install, Keep, power cycle and Undo), over USB: totals, time left, elapsed time, the last-30-seconds flash, retriggers and tempo changes checked against a stopwatch; reverse playback (RATE below 0) counted down to the start of the trim; an install with Keep survived a power cycle and Undo removed it; the base's LOAD page showed no CPU or DSP change with the screen open or closed. Package: 2,588 bytes of code and data and 304 of state. The draw cost was measured in the emulator only (about 0.3 ms a UI tick open); no static cycle bound. Not tested: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, other modules at the same time. ## Authorship and licences diff --git a/sdk/octabam/modules/tiempos/TESTING.md b/sdk/octabam/modules/tiempos/TESTING.md index f82ce8e1e..e28b1a2ef 100644 --- a/sdk/octabam/modules/tiempos/TESTING.md +++ b/sdk/octabam/modules/tiempos/TESTING.md @@ -2,10 +2,13 @@ ## Commands and exact revision -Source: `sdk/octabam/modules/tiempos/` on branch `tiempos`, on Modwerk `main` at `886098f5` (merged 30 October 2026). Packages built with m68k-elf-gcc 16.2.0 (Homebrew), the same compiler as the pinned `modwerk-source-tools` image, which rebuilt the 26 October package byte for byte. +Source: `sdk/octabam/modules/tiempos/` on branch `tiempos`, on Modwerk `main` at `246c3b41` (merged 7 November 2026, after #1231). Packages built with m68k-elf-gcc 16.2.0 (Homebrew), the same compiler as the pinned `modwerk-source-tools` image, which rebuilt the 26 October package byte for byte. ```sh -# ColdFire package (ABI 4: the four core hooks, no site events, no stock-code sites) +# Published USB package: ABI 8, titled "tiempos" (#1231), written to public/octatrack-modules/tiempos/ and its row +npm run octatrack:module-packages +npm run octatrack:module-packages -- --check +# Development build (ABI 4, untitled). build.py names the module after the output file: keep it tiempos.mwrm python3 -B sdk/runtime/loader/build.py sdk/octabam/modules/tiempos/tiempos.c -o tiempos.mwrm # Host tests and the package check (simulated OS memory, simulated 132 MHz timer, 60 ticks a second) python3 -B sdk/octabam/modules/tiempos/verify.py @@ -16,7 +19,8 @@ python3 -B sdk/octabam/modules/tiempos/verify.py | `225a0170…` | before the double press | 2,336 (2,156 code and data, 268 BSS, 33 relocations) | `225a0170382915f749315e26f4dbf97d4e0c4a047bf85bd347fb0e1bbe35d53e` | emulator 26 October; MKI 28 and 30 October | | `0506a245…` | with the double press on a track key | 2,444 (2,240 code and data, 272 BSS, 39 relocations) | `0506a24500c2aa175aede07bcf1cc1a4c5f215b23852b26518acad6ac9444aa7` | MKI 30 October (fourth trial, USB lifecycle, load trial) | -| `8c886466…` | with reverse playback (RATE below 0) and RATE 0 (current) | 2,808 (2,588 code and data, 304 BSS, 43 relocations) | `8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022` | MKI 2 November (reverse trial) | +| `8c886466…` | with reverse playback (RATE below 0) and RATE 0, development build (ABI 4) | 2,808 (2,588 code and data, 304 BSS, 43 relocations) | `8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022` | MKI 2 November (reverse trial) | +| `0b54a734…` | the same source, published by `octatrack:module-packages` as ABI 8 named "tiempos" (current) | 2,852 | `0b54a734258945acbf74551b8920ee4bfa760d390964bd04d2877e4382e990b9` | MKI 7 November (USB lifecycle on base `9b3ba417…`) | Hook words of `0506a245…`: `module_tick` 0x1ca, `module_draw` 0x2d0, `module_key` 0x6e6, `module_enc` 0x81e; none after the core four. @@ -200,6 +204,21 @@ The first attempt to load `8c886466…` was refused while the diagnostic trial s Not tested: a stopwatch figure for the reversed track, Flex and Static at other negative RATE values, reverse with timestretch modes other than NORMAL. +## Published package on the current base (7 November 2026, MKI, package `0b54a734…`) + +The developer's unit had been flashed with a card build for a live set, so it had no base. A new base was built on the local site (`npm run dev` on branch `tiempos` at `70f472b9`, `main` merged; Setup → Install the base, from the developer's own OS 1.40C) as `Modwerk-octatrack-base-d9d29a.bin` and installed from the card with OS UPGRADE. Its SHA-256 was not recorded. Over USB it reports base `9b3ba41715140d5f…`, the identity in `sdk/machines/octatrack/base-binding.json`; normal, generation 0, inventory empty. + +| Step | Result | +| --- | --- | +| Install with Keep (`npm run device -- try public/octatrack-modules/tiempos/0.1.0-experimental.mwrm --seconds 10 --accept`) | read: accepted; generation 1, active `0b54a734…`; inventory `[{"module":"31282ae5","name":"tiempos"}]` | +| CUE + MIDI | reported: opens TIEMPOS, the time rows show | +| Power cycle (the developer) | read: the boot's log records the saved set restored with Tiempos 5 s after the start (`set a=1 [31282ae5]`), inventory still names "tiempos"; `status` reports the bare base identity after the restore. Reported: CUE + MIDI opens TIEMPOS again | +| Undo (`npm run device -- remove … --accept`) | read: accepted; generation 1, active `75b95b9e…` (the empty set), inventory empty | + +No stall in the two boots on this base. The log's earlier stall records belong to boots 9 and 10 on the old base `24a0ed57…`, before the firmware was changed; they follow a `hot` record at 100 % CPU, the trace an OS upgrade leaves (OCTATRACK_HARDWARE_TRAPS.md). + +Not tested on this base: the timing, reverse and load checks above, which ran on `24a0ed57…` with packages of the same source (`8c886466…` is `0b54a734…` before titling) or of earlier sources. + ## Hardware and audio quality Tiempos makes no sound. On the MKI with the released base `24a0ed57…` (above): CUE + MIDI, LEFT, RIGHT, NO, track keys and the double press as described; totals, time left, the last-30-seconds flash, a hand retrigger, trimmed and Flex tracks and tempo changes against the stopwatch and the expected 64-bar times; reverse playback with package `8c886466…` (above). The voice fields were not read directly (a released base answers no `mem` request): the totals are the indirect check. diff --git a/sdk/octabam/modules/tiempos/octamod.module.json b/sdk/octabam/modules/tiempos/octamod.module.json index 8eea5d34e..6a81f1fb9 100644 --- a/sdk/octabam/modules/tiempos/octamod.module.json +++ b/sdk/octabam/modules/tiempos/octamod.module.json @@ -38,7 +38,7 @@ ], "limitations": [ "Needs the Modwerk base over USB: it uses the base's draw and key events.", - "Tested on one MKI with the Modwerk base 24a0ed57. Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", + "Tested on one MKI with the Modwerk bases 24a0ed57 and 9b3ba417 (install, Keep, power cycle and Undo of the published package). Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", "A track that loops shows the time left to the end of the sample, not to the end of the loop.", "A track playing backwards (RATE below 0) shows as empty once it reaches its start: the unit clears the voice there.", @@ -100,7 +100,7 @@ "qualification": { "moduleVersion": "0.1.0-experimental", "sourceSha256": "45e53efc39e6aba499d312e8e0b26995d2110a6657cbff8f06dc3aaaa9c1f035", - "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", + "imageSha256": "0b54a734258945acbf74551b8920ee4bfa760d390964bd04d2877e4382e990b9", "cycles": [ { "processor": "coldfire", @@ -143,24 +143,25 @@ "sharedBytes": 2892, "maxInstances": 1, "totalBytes": 2892, - "conditions": "From the USB package 8c886466 (2,588 bytes of code and data, 304 of bss, 43 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", + "conditions": "From the USB package 8c886466 (published titled as 0b54a734, 2,852 bytes) (2,588 bytes of code and data, 304 of bss, 43 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", "report": "TESTING.md" }, "hardware": { "kind": "functional", "status": "reported", "model": "MKI", - "testedOn": "2026-11-02", + "testedOn": "2026-11-07", "tester": "imdantelo", "sourceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", - "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", - "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466.", + "imageSha256": "0b54a734258945acbf74551b8920ee4bfa760d390964bd04d2877e4382e990b9", + "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466. With the published package 0b54a734 (the same source titled as ABI 8 by octatrack:module-packages), on a base rebuilt from current main (9b3ba417): install with Keep, the inventory naming it \"tiempos\", CUE + MIDI opening TIEMPOS, the set restored after a power cycle with TIEMPOS opening again, and Undo back to the empty set.", "limitations": [ "One MKI; no MKII.", "The stopwatch figures come from the developer's photos and readings; the voice fields were not read directly (a released base answers no mem request).", "Part changes, project reloads, timestretch modes other than NORMAL and other modules beside Tiempos were not run.", "Draw cost estimated in the emulator, not measured on the unit; no static bound and no MIDI flood.", - "Reverse playback: one trial; no stopwatch figure written down for the reversed track; RATE 0 on an active voice covered by the host test only." + "Reverse playback: one trial; no stopwatch figure written down for the reversed track; RATE 0 on an active voice covered by the host test only.", + "Timing, reverse and load checks ran on the earlier base 24a0ed57 with packages of the same or earlier sources; on base 9b3ba417 only the install, power cycle and Undo." ], "report": "TESTING.md" }, From 07c608ac9308f1ef42dd7877c431b761dafed16d Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 7 Nov 2026 13:58:11 +0100 Subject: [PATCH 10/12] Tiempos: evidence revision for the published package, generated catalogue Co-Authored-By: Claude Opus 5.5 --- .../modules/tiempos/octamod.module.json | 4 ++-- src/catalog/module-documents.json | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sdk/octabam/modules/tiempos/octamod.module.json b/sdk/octabam/modules/tiempos/octamod.module.json index 6a81f1fb9..1e46524d4 100644 --- a/sdk/octabam/modules/tiempos/octamod.module.json +++ b/sdk/octabam/modules/tiempos/octamod.module.json @@ -93,7 +93,7 @@ "report": "TESTING.md", "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes the double press that closes it, and (package 8c886466) reverse playback with RATE below 0; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 24/24. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", "hardwareStatus": "reported", - "evidenceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", + "evidenceRevision": "b711e14055b6c46658a9a44ca0ff21580ead55f6", "gates": [ "modules/tiempos/verify.py" ], @@ -152,7 +152,7 @@ "model": "MKI", "testedOn": "2026-11-07", "tester": "imdantelo", - "sourceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", + "sourceRevision": "b711e14055b6c46658a9a44ca0ff21580ead55f6", "imageSha256": "0b54a734258945acbf74551b8920ee4bfa760d390964bd04d2877e4382e990b9", "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466. With the published package 0b54a734 (the same source titled as ABI 8 by octatrack:module-packages), on a base rebuilt from current main (9b3ba417): install with Keep, the inventory naming it \"tiempos\", CUE + MIDI opening TIEMPOS, the set restored after a power cycle with TIEMPOS opening again, and Undo back to the empty set.", "limitations": [ diff --git a/src/catalog/module-documents.json b/src/catalog/module-documents.json index e7f0d06f8..82521a0bb 100644 --- a/src/catalog/module-documents.json +++ b/src/catalog/module-documents.json @@ -11107,7 +11107,7 @@ ], "limitations": [ "Needs the Modwerk base over USB: it uses the base's draw and key events.", - "Tested on one MKI with the Modwerk base 24a0ed57. Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", + "Tested on one MKI with the Modwerk bases 24a0ed57 and 9b3ba417 (install, Keep, power cycle and Undo of the published package). Not tested yet: an MKII, Part changes and project reloads with the screen open, timestretch modes other than NORMAL, and other modules installed at the same time.", "CUE + MIDI no longer switches to MIDI tracks while Tiempos is installed; MIDI alone still does.", "A track that loops shows the time left to the end of the sample, not to the end of the loop.", "A track playing backwards (RATE below 0) shows as empty once it reaches its start: the unit clears the voice there.", @@ -11161,7 +11161,7 @@ "report": "TESTING.md", "summary": "On the developer's MKI (OS 1.40C, released base 24a0ed57) over USB, 28-30 Oct 2026: timed trials of the exact package 0506a245 and its predecessor showed the time left, totals and elapsed time of whole, trimmed and Flex tracks against a stopwatch at 120 and 140 BPM, the last-30-seconds flash, a retrigger, tempo changes the double press that closes it, and (package 8c886466) reverse playback with RATE below 0; a Keep survived a power cycle and Undo removed it; LOAD showed no CPU or DSP change. Host tests 24/24. Not run: an MKII, Part changes and reloads with the screen open, other modules beside it, a static cycle bound.", "hardwareStatus": "reported", - "evidenceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", + "evidenceRevision": "b711e14055b6c46658a9a44ca0ff21580ead55f6", "gates": [ "modules/tiempos/verify.py" ], @@ -11183,7 +11183,7 @@ }, "moduleVersion": "0.1.0-experimental", "sourceSha256": "45e53efc39e6aba499d312e8e0b26995d2110a6657cbff8f06dc3aaaa9c1f035", - "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", + "imageSha256": "0b54a734258945acbf74551b8920ee4bfa760d390964bd04d2877e4382e990b9", "cycles": [ { "processor": "coldfire", @@ -11226,24 +11226,25 @@ "sharedBytes": 2892, "maxInstances": 1, "totalBytes": 2892, - "conditions": "From the USB package 8c886466 (2,588 bytes of code and data, 304 of bss, 43 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", + "conditions": "From the USB package 8c886466 (published titled as 0b54a734, 2,852 bytes) (2,588 bytes of code and data, 304 of bss, 43 relocations). Reads OS memory only; writes no stock code or data. No DSP memory, no heap. Stack use is the UI task's and was not measured.", "report": "TESTING.md" }, "hardware": { "kind": "functional", "status": "reported", "model": "MKI", - "testedOn": "2026-11-02", + "testedOn": "2026-11-07", "tester": "imdantelo", - "sourceRevision": "6ad138c9ff5febf7e3e5af16aa3e123905f79b94", - "imageSha256": "8c886466b8ef7133e41f64c4e8e3e1c8c7388b2d514370ed0b2f588ce8bd5022", - "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466.", + "sourceRevision": "b711e14055b6c46658a9a44ca0ff21580ead55f6", + "imageSha256": "0b54a734258945acbf74551b8920ee4bfa760d390964bd04d2877e4382e990b9", + "summary": "The developer's MKI, OS 1.40C, released Modwerk base 24a0ed57 built from a local checkout, driven over USB by Claude Code. With package 0506a245: a timed trial (single and double presses of track keys, the stock QUICK ASSIGN after a double press), an install with Keep that survived a power cycle and opened with CUE + MIDI, an Undo back to the empty set, and a seven-minute trial with three tracks playing (CPU 62 % just after a minute open against a 64 % peak without it; DSP load and space unchanged; no stall). With the previous package 225a0170 (same timing code): totals 2:08 at 120 BPM and 1:49 at 140 BPM on three 64-bar tones at 100, 120 and 140 BPM, a trimmed Static and a Flex track, 1:25 left and 0:24 elapsed at stopwatch 0:24.28, the flash under 30 s and a hand retrigger. With package 8c886466 (reverse playback): a trial with track 1 at RATE below 0 counted down to 0:00 with the stopwatch, restarted from the end on a trig, measured -10,749 and +7,440 frames a second as RATE changed; tracks 2 and 3 as before. The install with Keep, power cycle and Undo were run with 0506a245, not repeated with 8c886466. With the published package 0b54a734 (the same source titled as ABI 8 by octatrack:module-packages), on a base rebuilt from current main (9b3ba417): install with Keep, the inventory naming it \"tiempos\", CUE + MIDI opening TIEMPOS, the set restored after a power cycle with TIEMPOS opening again, and Undo back to the empty set.", "limitations": [ "One MKI; no MKII.", "The stopwatch figures come from the developer's photos and readings; the voice fields were not read directly (a released base answers no mem request).", "Part changes, project reloads, timestretch modes other than NORMAL and other modules beside Tiempos were not run.", "Draw cost estimated in the emulator, not measured on the unit; no static bound and no MIDI flood.", - "Reverse playback: one trial; no stopwatch figure written down for the reversed track; RATE 0 on an active voice covered by the host test only." + "Reverse playback: one trial; no stopwatch figure written down for the reversed track; RATE 0 on an active voice covered by the host test only.", + "Timing, reverse and load checks ran on the earlier base 24a0ed57 with packages of the same or earlier sources; on base 9b3ba417 only the install, power cycle and Undo." ], "report": "TESTING.md" } From e32383ea3c7a9ac1546b66ce589ae892a8219243 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 7 Nov 2026 14:08:49 +0100 Subject: [PATCH 11/12] Tiempos: listed among the site's published runtime packages Co-Authored-By: Claude Opus 5.5 --- src/engine/elekloader/module-set.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/elekloader/module-set.test.ts b/src/engine/elekloader/module-set.test.ts index 3843166d4..bb0998cd2 100644 --- a/src/engine/elekloader/module-set.test.ts +++ b/src/engine/elekloader/module-set.test.ts @@ -13,7 +13,7 @@ const empty = { moduleIds: [], removedStockFx: [] } describe('the site’s runtime packages', () => { it('publishes each listed module with its checked runtime identity, ABI and record counts', () => { - expect(USB_MODULE_IDS).toEqual(['everb', 'miniverb', 'tapehead', 'airwindows-chorus', 'lofi2', 'ring-sc', 'previewvol', 'apply-scene', 'repitch', 'poly8', 'vector', 'synth', 'quantizer', 'tapeecho', 'euclid', 'bbd', 'playmodes', 'mute-modes', 'sidechain-compressor', 'output-matrix', 'cc-map', 'quantize-live-rec-toggle', 'direct-jump-kyoti', 'dejavu', 'arp-key-locks', 'recorder-loop-fix', 'analog-bassdrum', 'beat-slicer', 'temp-save', 'slow-lfo', 'usb-audio-out-tracks-main-cue']) + expect(USB_MODULE_IDS).toEqual(['everb', 'miniverb', 'tapehead', 'airwindows-chorus', 'lofi2', 'ring-sc', 'previewvol', 'apply-scene', 'repitch', 'poly8', 'vector', 'synth', 'quantizer', 'tapeecho', 'euclid', 'bbd', 'playmodes', 'mute-modes', 'sidechain-compressor', 'output-matrix', 'cc-map', 'quantize-live-rec-toggle', 'direct-jump-kyoti', 'dejavu', 'arp-key-locks', 'recorder-loop-fix', 'analog-bassdrum', 'beat-slicer', 'temp-save', 'slow-lfo', 'tiempos', 'usb-audio-out-tracks-main-cue']) for (const entry of manifest.packages) { const data = file(entry.path), view = new DataView(data.buffer), abi = view.getUint16(4) expect(entry.path).toBe(`octatrack-modules/${entry.id}/${entry.version}.mwrm`) From 26046b642ffe155fcf36fe748b4e449b8d918f86 Mon Sep 17 00:00:00 2001 From: repeat98 Date: Sat, 7 Nov 2026 20:15:48 +0100 Subject: [PATCH 12/12] Tiempos 0.1.0-experimental: the owner's performance waiver of 31 Oct as an approval record --- sdk/tiempos-build-approval.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sdk/tiempos-build-approval.json diff --git a/sdk/tiempos-build-approval.json b/sdk/tiempos-build-approval.json new file mode 100644 index 000000000..219c38041 --- /dev/null +++ b/sdk/tiempos-build-approval.json @@ -0,0 +1,11 @@ +{ + "kind": "owner-approved-update", + "id": "tiempos", + "version": "0.1.0-experimental", + "approvedBy": "repeat98", + "approvedOn": "2026-11-07", + "ownerStatement": "I accept the three performance waivers for this experimental release (31 Oct 2026, #1096).", + "reason": "Tiempos runs only on the UI task (tick, draw, key and encoder hooks) and has no MIDI path or frame-interrupt work. Its draw cost is an emulator estimate scaled by pixel count, and the MKI LOAD readings are in TESTING.md. No static bound, no cfmeter capture and no MIDI flood. Every other qualification stays required.", + "waived": ["chip-worst-case-cycles", "current-build-hardware"], + "sourceSha256": "45e53efc39e6aba499d312e8e0b26995d2110a6657cbff8f06dc3aaaa9c1f035" +}