You've already forked torvalds-GuitarPedal
mirror of
https://github.com/torvalds/GuitarPedal.git
synced 2026-08-19 13:34:01 +00:00
'Software' was the directory everything that was not KiCad ended up in, which stopped describing anything a while ago - Validation and the web app are software too. Worse, it put the shared parts inside the firmware, where they read as the firmware's own. They are not. Effects/ has three consumers built from it: the firmware, Validation's bench, and the web app's controls, all generated from the same POT: comments by gen_effects.py. Audio/ has two - the bench compiles the same biquads, the same envelope followers and the same single_sample(), which is the whole reason a measurement on a workstation says anything about the pedal. Neither belongs under Firmware/, so neither is under it any more: Effects/ one file per effect Audio/ the DSP they are built from, and the audio loop Firmware/ the rest of what runs on the pedal, and the submodules WebMIDI/ the web app scripts/ what the build runs Validation/ unchanged Hardware/, Documentation/, Images/ CMakeLists.txt and the wrapper Makefile move to the top with them, because the build now consumes four of those directories and generates into a fifth. board.local and build/ come along; MIDI_CC_MAP.md is generated into Documentation/ rather than into the old Software/ root. scripts/ goes with the build rather than staying under the firmware, because six of the ten had nothing to do with the firmware: gen_effects.py reads Effects/ and writes to three different places, pow2/log2/quarter_sine generate Audio/'s tables, check-readme.py compares Effects/ against the README, and server.py serves the web app. Four of them are invoked from Validation, which was reaching into Firmware/ for tooling - the same burying this commit is undoing. The four that really are about the firmware are ELF checks the top-level build drives anyway, and a second scripts directory would only be a second place to look. C includes say "Audio/foo.h" and the generated map says "Effects/bar.h", with the repository root on the include path for both the firmware and the bench. Spelling the directory out rather than relying on a bare name is what keeps Audio/cycles.h shimmable: a quoted include searches the including file's own directory first. The submodules are renamed as well as moved. git mv updates their paths but leaves the section names, and 'Software/pico-sdk' surviving in .gitmodules would be the word this commit removes, still load-bearing. That meant the nested modules under pico-sdk too - six .git files pointing into .git/modules/Software - which is why 'git submodule update --init --recursive' is worth running once after pulling this. Verified rather than assumed: a clean configure and build, make check (failing only on the missing-eeprom case it already failed on), check-effects, all four analysis pages reproducing every series and drawing every chart, and a flash to the board that still measures a routed reverb where it did before. One latent bug fell out of it. bench/coeff declared only quarter_sine.h of the three generated math tables, and Audio/util.h includes pow2.h and log2.h as well - so building that target with an empty gen/ could never have worked. 'make bench' builds bench/bench first, which generates all three, so it stayed hidden until this rebuilt everything from nothing. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
127 lines
4.6 KiB
Python
Executable File
127 lines
4.6 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
#
|
|
# Does the README still know which effects exist?
|
|
#
|
|
# The README's effect list is hand-written on purpose - it is an overview
|
|
# and wants prose, not a generated table - and hand-written is exactly
|
|
# why it drifted from eight entries to eight-of-seventeen without anyone
|
|
# noticing. Nothing else in the tree has that problem, because
|
|
# gen_effects.py generates it. This is the cheapest thing that would
|
|
# have caught it: the effect headers say which effects there are, the
|
|
# README bolds the name of each one it talks about, and those two sets
|
|
# should match.
|
|
#
|
|
# WHAT IT DOES NOT DO, deliberately. It does not check that the prose is
|
|
# right, or current, or that a pot mentioned in it still exists. An
|
|
# effect whose controls change completely still passes as long as its
|
|
# name is there. Catching that would mean either generating the section,
|
|
# which is the thing we decided not to do, or an acknowledgement stamp
|
|
# somebody has to update, which is a second thing to forget. Adding and
|
|
# removing effects is the case that actually went wrong, and it is the
|
|
# case this catches.
|
|
#
|
|
# It warns rather than fails. The README is an overview and is allowed
|
|
# to lag slightly - a half-finished effect on a branch should not stop
|
|
# the firmware building. If these warnings turn out to get ignored, the
|
|
# fix is to make the exit status 1 below and find out how annoying that
|
|
# is.
|
|
#
|
|
# Called as: check-readme.py <effects-dir> <readme>
|
|
#
|
|
import re
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
|
|
def effects_in(effects_dir):
|
|
"""Every effect the firmware has, by display name.
|
|
|
|
The name here is the one before the generator makes copies of it -
|
|
tone.h is 'Tone', and the pedal ends up with 'Tone 1' and 'Tone 2' -
|
|
because the README describes the effect and not each instance.
|
|
"""
|
|
names = set()
|
|
for path in sorted(Path(effects_dir).glob("*.h")):
|
|
m = re.search(r"^// NAME:\s*(.+?)\s*\[(\w+)\]\s*$",
|
|
path.read_text(), re.M)
|
|
if m:
|
|
names.add(m.group(1))
|
|
return names
|
|
|
|
|
|
def named_in(readme):
|
|
"""Every **bolded name** under the effects heading.
|
|
|
|
Scoped to that section so that a mention of the tuner or the boost
|
|
somewhere further up does not count as having described it.
|
|
"""
|
|
text = Path(readme).read_text()
|
|
m = re.search(r"^## Audio effects$(.*)", text, re.M | re.S)
|
|
if not m:
|
|
return None
|
|
return set(re.findall(r"\*\*([^*]+)\*\*", m.group(1)))
|
|
|
|
|
|
def dead_links(readme):
|
|
"""Relative links in the effect list that point at nothing.
|
|
|
|
An effect gets a link once it has a measured page under
|
|
Documentation/effects, and a link on the front page of the
|
|
repository that 404s is worse than no link at all. Only relative
|
|
ones: an http link is somebody else's to keep alive.
|
|
"""
|
|
text = Path(readme).read_text()
|
|
m = re.search(r"^## Audio effects$(.*)", text, re.M | re.S)
|
|
if not m:
|
|
return []
|
|
root = Path(readme).resolve().parent
|
|
return [t for t in re.findall(r"\]\(([^)#:]+)\)", m.group(1))
|
|
if not (root / t).exists()]
|
|
|
|
|
|
def main():
|
|
if len(sys.argv) != 3:
|
|
sys.exit("usage: check-readme.py <effects-dir> <readme>")
|
|
|
|
have = effects_in(sys.argv[1])
|
|
if not have:
|
|
sys.exit("check-readme: no effects found - wrong directory?")
|
|
|
|
described = named_in(sys.argv[2])
|
|
if described is None:
|
|
print("check-readme: WARNING - no '## Audio effects' section in the "
|
|
"README, so nothing was checked")
|
|
return 0
|
|
|
|
missing = sorted(have - described)
|
|
extra = sorted(described - have)
|
|
dead = dead_links(sys.argv[2])
|
|
|
|
for target in dead:
|
|
print(f"check-readme: WARNING - the README links to {target}, "
|
|
f"which does not exist")
|
|
|
|
if not missing and not extra:
|
|
#
|
|
# "headers" rather than "effects" because the two counts differ
|
|
# and both are right: tone.h is one header and two effects. The
|
|
# README says seventeen, meaning routable ones. Saying "effects"
|
|
# here would look like one of them was wrong.
|
|
#
|
|
print(f"check-readme: {len(have)} effect headers, "
|
|
f"all named in the README")
|
|
return 0
|
|
|
|
print("check-readme: WARNING - the README's effect list has drifted")
|
|
for name in missing:
|
|
print(f" {name}: in the firmware, not in the README")
|
|
for name in extra:
|
|
print(f" {name}: in the README, not in the firmware")
|
|
print(" Software/effects/*.h is the source of truth; the README "
|
|
"wants a line about each")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|