From 284ba96c879964c26c5d6202782971002d53f862 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 3 May 2025 13:49:00 +0200 Subject: [PATCH 1/4] Accept PR number, #NNN, or PR URL [ci skip] --- updater.py | 211 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 170 insertions(+), 41 deletions(-) diff --git a/updater.py b/updater.py index bc33058..69d53c6 100644 --- a/updater.py +++ b/updater.py @@ -87,11 +87,61 @@ def extract_zip(zip_path): zip_ref.extractall(extract_path) return extract_path +# Function to download the latest release asset using GitHub API +def download_latest_release_github_api(release_type): + """ + release_type: 'latest' or 'continuous' + Returns: path to downloaded zip or None + """ + import json + headers = {'Accept': 'application/vnd.github.v3+json'} + repo = 'probonopd/MiniDexed' + if release_type == 'latest': + api_url = f'https://api.github.com/repos/{repo}/releases/latest' + resp = requests.get(api_url, headers=headers) + if resp.status_code != 200: + print(f"GitHub API error: {resp.status_code}") + return None + release = resp.json() + assets = release.get('assets', []) + elif release_type == 'continuous': + api_url = f'https://api.github.com/repos/{repo}/releases' + resp = requests.get(api_url, headers=headers) + if resp.status_code != 200: + print(f"GitHub API error: {resp.status_code}") + return None + releases = resp.json() + release = next((r for r in releases if 'continuous' in (r.get('tag_name','')+r.get('name','')).lower()), None) + if not release: + print("No continuous release found.") + return None + assets = release.get('assets', []) + else: + print(f"Unknown release type: {release_type}") + return None + asset = next((a for a in assets if a['name'].startswith('MiniDexed') and a['name'].endswith('.zip')), None) + if not asset: + print("No MiniDexed*.zip asset found in release.") + return None + url = asset['browser_download_url'] + print(f"Downloading asset: {asset['name']} from {url}") + resp = requests.get(url, stream=True) + if resp.status_code == 200: + zip_path = os.path.join(TEMP_DIR, asset['name']) + with open(zip_path, 'wb') as f: + for chunk in resp.iter_content(chunk_size=8192): + f.write(chunk) + return zip_path + print(f"Failed to download asset: {resp.status_code}") + return None + if __name__ == "__main__": parser = argparse.ArgumentParser(description="MiniDexed Updater") parser.add_argument("-v", action="store_true", help="Enable verbose FTP debug output") parser.add_argument("--ip", type=str, help="IP address of the device to upload to (skip mDNS discovery)") parser.add_argument("--version", type=int, choices=[1,2,3], help="Version to upload: 1=Latest official, 2=Continuous, 3=Local build (skip prompt)") + parser.add_argument("--pr", type=str, help="Pull request number or URL to fetch build artifacts from PR comment") + parser.add_argument("--github-token", type=str, help="GitHub personal access token for downloading PR artifacts (optional, can also use GITHUB_TOKEN env var)") args = parser.parse_args() import time @@ -100,6 +150,9 @@ if __name__ == "__main__": local_kernel_imgs = [f for f in os.listdir(local_kernel_dir) if f.startswith('kernel') and f.endswith('.img')] has_local_build = len(local_kernel_imgs) > 0 + # Get GitHub token from argument or environment + github_token = args.github_token or os.environ.get("GITHUB_TOKEN") + # Ask user which release to download (numbered choices) release_options = [ ("Latest official release", "https://github.com/probonopd/MiniDexed/releases/expanded_assets/latest"), @@ -118,61 +171,137 @@ if __name__ == "__main__": print("Which release do you want to update?") for idx, (desc, _) in enumerate(release_options): print(f" [{idx+1}] {desc}") + print(" [PR] Pull request build (enter PR number or URL)") while True: - choice = input(f"Enter the number of your choice (1-{len(release_options)}): ").strip() + choice = input(f"Enter the number of your choice (1-{len(release_options)}) or PR number: ").strip() if choice.isdigit() and 1 <= int(choice) <= len(release_options): selected_idx = int(choice)-1 github_url = release_options[selected_idx][1] + args.pr = None + break + # Accept PR number, #NNN, or PR URL + pr_match = re.match(r'^(#?\d+|https?://github.com/[^/]+/[^/]+/pull/\d+)$', choice) + if pr_match: + args.pr = choice + selected_idx = None + github_url = None break - print("Invalid selection. Please enter a valid number.") + print("Invalid selection. Please enter a valid number or PR number/URL.") # If local build is selected, skip all GitHub/zip logic and do not register cleanup use_local_build = has_local_build and selected_idx == len(release_options)-1 - if use_local_build: + if args.pr: + # Extract PR number from input (accepts URL, #899, or 899) + import re + pr_input = args.pr.strip() + m = re.search(r'(\d+)$', pr_input) + if not m: + print(f"Could not parse PR number from: {pr_input}") + sys.exit(1) + pr_number = m.group(1) + # Fetch PR page HTML + pr_url = f"https://github.com/probonopd/MiniDexed/pull/{pr_number}" + print(f"Fetching PR page: {pr_url}") + resp = requests.get(pr_url) + if resp.status_code != 200: + print(f"Failed to fetch PR page: {resp.status_code}") + sys.exit(1) + html = resp.text + # Find all 'Build for testing' artifact blocks (look for

Build for testing: ...

) + import html as ihtml + import re + pattern = re.compile(r'

Build for testing:(.*?)Use at your own risk\.', re.DOTALL) + matches = pattern.findall(html) + if not matches: + print("No build artifact links found in PR comment.") + sys.exit(1) + last_block = matches[-1] + # Find all artifact links in the last block + link_pattern = re.compile(r'([^<]+)') + links = link_pattern.findall(last_block) + if not links: + print("No artifact links found in PR comment block.") + sys.exit(1) + # Download both 32bit and 64bit artifacts if present + artifact_paths = [] + for url, name in links: + print(f"Downloading artifact: {name} from {url}") + # Try to extract the artifact ID from the URL + m = re.search(r'/artifacts/(\d+)', url) + if m and github_token: + artifact_id = m.group(1) + api_url = f"https://api.github.com/repos/probonopd/MiniDexed/actions/artifacts/{artifact_id}/zip" + headers = { + "Authorization": f"Bearer {github_token}", + "Accept": "application/vnd.github.v3+json", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" + } + resp = requests.get(api_url, stream=True, headers=headers) + if resp.status_code == 200: + local_path = os.path.join(TEMP_DIR, name + ".zip") + with open(local_path, 'wb') as f: + for chunk in resp.iter_content(chunk_size=8192): + f.write(chunk) + artifact_paths.append(local_path) + else: + print(f"Failed to download artifact {name} via GitHub API: {resp.status_code}") + print(f"Request headers: {resp.request.headers}") + print(f"Response headers: {resp.headers}") + print(f"Response URL: {resp.url}") + print(f"Response text (first 500 chars): {resp.text[:500]}") + else: + # Fallback to direct link if no artifact ID or no token + headers = {} + if github_token: + headers["Authorization"] = f"Bearer {github_token}" + headers["Accept"] = "application/octet-stream" + headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" + resp = requests.get(url, stream=True, headers=headers) + if resp.status_code == 200: + local_path = os.path.join(TEMP_DIR, name + ".zip") + with open(local_path, 'wb') as f: + for chunk in resp.iter_content(chunk_size=8192): + f.write(chunk) + artifact_paths.append(local_path) + else: + print(f"Failed to download artifact {name}: {resp.status_code}") + print(f"Request headers: {resp.request.headers}") + print(f"Response headers: {resp.headers}") + print(f"Response URL: {resp.url}") + print(f"Response text (first 500 chars): {resp.text[:500]}") + if not github_token: + print("You may need to provide a GitHub personal access token using --github-token or the GITHUB_TOKEN environment variable.") + if not artifact_paths: + print("No artifacts downloaded.") + sys.exit(1) + # Extract all downloaded zips + extract_paths = [] + for path in artifact_paths: + ep = extract_zip(path) + print(f"Extracted {path} to {ep}") + extract_paths.append(ep) + # Use the first extracted path for further logic (or merge as needed) + extract_path = extract_paths[0] if extract_paths else None + use_local_build = False + elif use_local_build: # Remove cleanup function if registered atexit.unregister(cleanup_temp_files) print("Using local build: src/kernel*.img will be uploaded.") extract_path = None else: - # Use the selected GitHub URL for release - def get_release_url(github_url): - print(f"Fetching release page: {github_url}") - response = requests.get(github_url) - print(f"HTTP status code: {response.status_code}") - if response.status_code == 200: - print("Successfully fetched release page. Scanning for MiniDexed*.zip links...") - # Find all tags with a MiniDexed*.zip - pattern = re.compile(r']+href=["\']([^"\']+\.zip)["\'][^>]*>\s*]*class=["\']Truncate-text text-bold["\'][^>]*>(MiniDexed[^<]*?\.zip)', re.IGNORECASE) - matches = pattern.findall(response.text) - print(f"Found {len(matches)} candidate .zip links.") - for href, filename in matches: - print(f"Examining link: href={href}, filename={filename}") - if filename.startswith("MiniDexed") and filename.endswith(".zip"): - if href.startswith('http'): - print(f"Selected direct link: {href}") - return href - else: - full_url = f"https://github.com{href}" - print(f"Selected relative link, full URL: {full_url}") - return full_url - print("No valid MiniDexed*.zip link found.") - else: - print(f"Failed to fetch release page. Status code: {response.status_code}") - return None - - latest_release_url = get_release_url(github_url) - if latest_release_url: - print(f"Release URL: {latest_release_url}") - zip_path = download_latest_release(latest_release_url) - if zip_path: - print(f"Downloaded to: {zip_path}") - extract_path = extract_zip(zip_path) - print(f"Extracted to: {extract_path}") - else: - print("Failed to download the release.") - sys.exit(1) + # Use GitHub API instead of HTML parsing + if selected_idx == 0: + zip_path = download_latest_release_github_api('latest') + elif selected_idx == 1: + zip_path = download_latest_release_github_api('continuous') + else: + zip_path = None + if zip_path: + print(f"Downloaded to: {zip_path}") + extract_path = extract_zip(zip_path) + print(f"Extracted to: {extract_path}") else: - print("Failed to get the release URL.") + print("Failed to download the release.") sys.exit(1) # Ask user if they want to update Performances (default no) From 1371c559ee3f24a63d3bebbd8b769122a9afc8b5 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 4 May 2025 17:10:16 +0200 Subject: [PATCH 2/4] Create LICENSE [ci skip] --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/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 +. From d70232dcd82e404de91d91fefbc16608e18b7a5e Mon Sep 17 00:00:00 2001 From: soyer Date: Mon, 5 May 2025 23:31:23 +0200 Subject: [PATCH 3/4] Remove startup sound artefact Limit the number of processed frames to chunksize / 2 (#912) The tg_mixer cannot process more franes, So if it has to process more, uninitialized frames will be played, which causes strange sounds, e.g. at startup. Closes #908 --- src/minidexed.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/minidexed.cpp b/src/minidexed.cpp index 4a4ce46..40c69b7 100644 --- a/src/minidexed.cpp +++ b/src/minidexed.cpp @@ -1305,6 +1305,10 @@ void CMiniDexed::ProcessSound (void) unsigned nFrames = m_nQueueSizeFrames - m_pSoundDevice->GetQueueFramesAvail (); if (nFrames >= m_nQueueSizeFrames/2) { + // only process the minimum number of frames (== chunksize / 2) + // as the tg_mixer cannot process more + nFrames = m_nQueueSizeFrames / 2; + if (m_bProfileEnabled) { m_GetChunkTimer.Start (); From e6b7ef58b60cd54d237a597f42ff5a299c6a73e3 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 10 May 2025 14:31:01 +0200 Subject: [PATCH 4/4] Handle TX216/TX816 style performance sysex messages (#884) Handle TX216/TX816 style performance sysex messages Thanks @Skerjanc for having compared behavior with an actual TX816 --- src/mididevice.cpp | 189 ++++++++++++++++++++++++++++++--------------- src/uimenu.cpp | 35 ++++++--- 2 files changed, 151 insertions(+), 73 deletions(-) diff --git a/src/mididevice.cpp b/src/mididevice.cpp index 576821f..f387dbc 100644 --- a/src/mididevice.cpp +++ b/src/mididevice.cpp @@ -329,7 +329,127 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign if (m_ChannelMap[nTG] == ucSysExChannel || m_ChannelMap[nTG] == OmniMode) { LOGNOTE("MIDI-SYSEX: channel: %u, len: %u, TG: %u",m_ChannelMap[nTG],nLength,nTG); - HandleSystemExclusive(pMessage, nLength, nCable, nTG); + + // Check for TX216/TX816 style performance sysex messages + + if (pMessage[3] == 0x04) + { + // TX816/TX216 Performance SysEx message + uint8_t mTG = pMessage[2] & 0x0F; // mTG = module/tone generator number (0-7) + uint8_t par = pMessage[4]; + uint8_t val = pMessage[5]; + + // For parameter 1 (Set MIDI Channel), only process for the TG with the number in pMessage[2] + if (par == 1) { + if (nTG != mTG) continue; + } else { + // For all other parameters, process for all TGs listening on the MIDI channel mTG or OmniMode + if (!(m_ChannelMap[nTG] == mTG || m_ChannelMap[nTG] == OmniMode)) continue; + } + LOGNOTE("MIDI-SYSEX: Assuming TX216/TX816 style performance sysex message because 4th byte is 0x04"); + + switch (par) + { + case 1: // MIDI Channel + LOGNOTE("MIDI-SYSEX: Set TG%d to MIDI Channel %d", mTG, val & 0x0F); + m_pSynthesizer->SetMIDIChannel(val & 0x0F, mTG); + break; + case 2: // Poly/Mono + LOGNOTE("MIDI-SYSEX: Set Poly/Mono %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setMonoMode(val ? true : false, nTG); + break; + case 3: // Pitch Bend Range + LOGNOTE("MIDI-SYSEX: Set Pitch Bend Range %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setPitchbendRange(val, nTG); + break; + case 4: // Pitch Bend Step + LOGNOTE("MIDI-SYSEX: Set Pitch Bend Step %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setPitchbendStep(val, nTG); + break; + case 5: // Portamento Time + LOGNOTE("MIDI-SYSEX: Set Portamento Time %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setPortamentoTime(val, nTG); + break; + case 6: // Portamento/Glissando + LOGNOTE("MIDI-SYSEX: Set Portamento/Glissando %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setPortamentoGlissando(val, nTG); + break; + case 7: // Portamento Mode + LOGNOTE("MIDI-SYSEX: Set Portamento Mode %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setPortamentoMode(val, nTG); + break; + case 9: // Mod Wheel Sensitivity + { + int scaled = (val * 99) / 15; + LOGNOTE("MIDI-SYSEX: Set Mod Wheel Sensitivity %d to %d (scaled %d)", nTG, val & 0x0F, scaled); + m_pSynthesizer->setModWheelRange(scaled, nTG); + } + break; + case 10: // Mod Wheel Assign + LOGNOTE("MIDI-SYSEX: Set Mod Wheel Assign %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setModWheelTarget(val, nTG); + break; + case 11: // Foot Controller Sensitivity + { + int scaled = (val * 99) / 15; + LOGNOTE("MIDI-SYSEX: Set Foot Controller Sensitivity %d to %d (scaled %d)", nTG, val & 0x0F, scaled); + m_pSynthesizer->setFootControllerRange(scaled, nTG); + } + break; + case 12: // Foot Controller Assign + LOGNOTE("MIDI-SYSEX: Set Foot Controller Assign %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setFootControllerTarget(val, nTG); + break; + case 13: // Aftertouch Sensitivity + { + int scaled = (val * 99) / 15; + LOGNOTE("MIDI-SYSEX: Set Aftertouch Sensitivity %d to %d (scaled %d)", nTG, val & 0x0F, scaled); + m_pSynthesizer->setAftertouchRange(scaled, nTG); + } + break; + case 14: // Aftertouch Assign + LOGNOTE("MIDI-SYSEX: Set Aftertouch Assign %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setAftertouchTarget(val, nTG); + break; + case 15: // Breath Controller Sensitivity + { + int scaled = (val * 99) / 15; + LOGNOTE("MIDI-SYSEX: Set Breath Controller Sensitivity %d to %d (scaled %d)", nTG, val & 0x0F, scaled); + m_pSynthesizer->setBreathControllerRange(scaled, nTG); + } + break; + case 16: // Breath Controller Assign + LOGNOTE("MIDI-SYSEX: Set Breath Controller Assign %d to %d", nTG, val & 0x0F); + m_pSynthesizer->setBreathControllerTarget(val, nTG); + break; + case 26: // Audio Output Level Attenuator + { + LOGNOTE("MIDI-SYSEX: Set Audio Output Level Attenuator %d to %d", nTG, val & 0x0F); + // Example: F0 43 10 04 1A 00 F7 to F0 43 10 04 1A 07 F7 + unsigned attenVal = val & 0x07; + // unsigned newVolume = (unsigned)(127.0 * pow(attenVal / 7.0, 2.0) + 0.5); // Logarithmic mapping + // But on the T816, there is an exponential (not logarithmic!) mapping, and 0 results in the same volume as 1: + // 7=127, 6=63, 5=31, 4=15, 3=7, 2=3, 1=1, 0=1 + unsigned newVolume = (attenVal == 0) ? 0 : (127 >> (7 - attenVal)); + if (newVolume == 0) newVolume = 1; // 0 is like 1 to avoid silence + m_pSynthesizer->SetVolume(newVolume, nTG); + } + break; + case 64: // Master Tuning + LOGNOTE("MIDI-SYSEX: Set Master Tuning"); + // TX812 scales from -75 to +75 cents. + m_pSynthesizer->SetMasterTune(maplong(val, 1, 127, -37, 37), nTG); // Would need 37.5 here, due to wrong constrain on dexed_synth module? + break; + default: + // Unknown or unsupported parameter + LOGNOTE("MIDI-SYSEX: Unknown parameter %d for TG %d", par, nTG); + break; + } + } + else + { + HandleSystemExclusive(pMessage, nLength, nCable, nTG); + } } } else @@ -431,7 +551,7 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign case MIDI_CC_SOSTENUTO: m_pSynthesizer->setSostenuto (pMessage[2] >= 64, nTG); break; - + case MIDI_CC_PORTAMENTO: m_pSynthesizer->setPortamentoMode (pMessage[2] >= 64, nTG); break; @@ -439,7 +559,7 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign case MIDI_CC_HOLD2: m_pSynthesizer->setHoldMode (pMessage[2] >= 64, nTG); break; - + case MIDI_CC_RESONANCE: m_pSynthesizer->SetResonance (maplong (pMessage[2], 0, 127, 0, 99), nTG); break; @@ -455,11 +575,12 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign case MIDI_CC_DETUNE_LEVEL: if (pMessage[2] == 0) { - // "0 to 127, with 0 being no celeste (detune) effect applied at all." + // 0 to 127, with 0 being no detune effect applied at all m_pSynthesizer->SetMasterTune (0, nTG); } else { + // Scale to -99 to +99 cents m_pSynthesizer->SetMasterTune (maplong (pMessage[2], 1, 127, -99, 99), nTG); } break; @@ -594,10 +715,12 @@ bool CMIDIDevice::HandleMIDISystemCC(const u8 ucCC, const u8 ucCCval) if (ucCC == MIDISystemCCMap[m_nMIDISystemCCDetune][tg]) { if (ucCCval == 0) { + // 0 to 127, with 0 being no detune effect applied at all m_pSynthesizer->SetMasterTune (0, tg); } else { + // Scale to -99 to +99 cents m_pSynthesizer->SetMasterTune (maplong (ucCCval, 1, 127, -99, 99), tg); } return true; @@ -649,62 +772,6 @@ void CMIDIDevice::HandleSystemExclusive(const uint8_t* pMessage, const size_t nL case -11: LOGERR("Unknown SysEx message."); break; - case 64: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setMonoMode(pMessage[5],nTG); - break; - case 65: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setPitchbendRange(pMessage[5],nTG); - break; - case 66: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setPitchbendStep(pMessage[5],nTG); - break; - case 67: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setPortamentoMode(pMessage[5],nTG); - break; - case 68: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setPortamentoGlissando(pMessage[5],nTG); - break; - case 69: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setPortamentoTime(pMessage[5],nTG); - break; - case 70: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setModWheelRange(pMessage[5],nTG); - break; - case 71: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setModWheelTarget(pMessage[5],nTG); - break; - case 72: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setFootControllerRange(pMessage[5],nTG); - break; - case 73: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setFootControllerTarget(pMessage[5],nTG); - break; - case 74: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setBreathControllerRange(pMessage[5],nTG); - break; - case 75: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setBreathControllerTarget(pMessage[5],nTG); - break; - case 76: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setAftertouchRange(pMessage[5],nTG); - break; - case 77: - LOGDBG("SysEx Function parameter change: %d Value %d",pMessage[4],pMessage[5]); - m_pSynthesizer->setAftertouchTarget(pMessage[5],nTG); - break; case 100: // load sysex-data into voice memory LOGDBG("One Voice bulk upload"); @@ -756,4 +823,4 @@ void CMIDIDevice::SendSystemExclusiveVoice(uint8_t nVoice, const unsigned nCable Iterator->second->Send (voicedump, sizeof(voicedump)*sizeof(uint8_t)); // LOGDBG("Send SYSEX voice dump %u to \"%s\"",nVoice,Iterator->first.c_str()); } -} +} diff --git a/src/uimenu.cpp b/src/uimenu.cpp index 1475342..730f320 100644 --- a/src/uimenu.cpp +++ b/src/uimenu.cpp @@ -1098,12 +1098,14 @@ string CUIMenu::GetOPValueString (unsigned nOPParameter, int nValue) string CUIMenu::ToVolume (int nValue) { - static const size_t MaxChars = CConfig::LCDColumns-2; - char VolumeBar[MaxChars+1]; - memset (VolumeBar, 0xFF, sizeof VolumeBar); // 0xFF is the block character - VolumeBar[nValue * MaxChars / 127] = '\0'; - - return VolumeBar; + constexpr size_t NumSquares = 14; + char VolumeBar[NumSquares + 1]; + size_t filled = (nValue * NumSquares + 63) / 127; + for (size_t i = 0; i < NumSquares; ++i) { + VolumeBar[i] = (i < filled) ? (char)0xFF : '.'; + } + VolumeBar[NumSquares] = '\0'; + return VolumeBar; } string CUIMenu::ToPan (int nValue) @@ -1394,11 +1396,11 @@ void CUIMenu::PgmUpDownHandler (TMenuEvent Event) || voiceName == "----------" || voiceName == "~~~~~~~~~~" ) { - if (Event == MenuEventPgmUp) { - PgmUpDownHandler (MenuEventPgmUp); + if (Event == MenuEventStepUp) { + PgmUpDownHandler (MenuEventStepUp); } - if (Event == MenuEventPgmDown) { - PgmUpDownHandler (MenuEventPgmDown); + if (Event == MenuEventStepDown) { + PgmUpDownHandler (MenuEventStepDown); } } } @@ -2043,6 +2045,15 @@ void CUIMenu::EditMasterVolume(CUIMenu *pUIMenu, TMenuEvent Event) default: return; } - std::string valueStr = ToVolume(pUIMenu->m_pMiniDexed->GetMasterVolume127()); - pUIMenu->m_pUI->DisplayWrite("Master Volume", "", valueStr.c_str(), nValue > rParam.Minimum, nValue < rParam.Maximum); + unsigned lcdCols = pUIMenu->m_pConfig->GetLCDColumns(); + unsigned barLen = (lcdCols > 2) ? lcdCols - 2 : 0; + std::string valueStr(barLen, '.'); + if (barLen > 0) { + size_t filled = (nValue * barLen + 63) / 127; + for (unsigned i = 0; i < barLen; ++i) { + if (i < filled) valueStr[i] = (char)0xFF; + } + } + // Do NOT add < or > here; let DisplayWrite handle it + pUIMenu->m_pUI->DisplayWrite("Master Volume", "", valueStr.c_str(), true, true); }