site 1.10.0: flash bar in the builder, Browse info and Divide hold, phase meter V2
- builder: a bar under the mods shows the player's flash: Pioneer's firmware, the ticked mods and what stays free; every mod shows its packed share (measured by tools/make_builder_data.py, cached in tools/flash_sizes.json) - new mods: browseinfo 0.1.0, divhold 0.1.0 (cards, docs, builder) - phasemeter V2, quicksearch 0.6.0, usbautoload 0.2.0, cuenames 0.1.2, beatjump 1.0.2; boot screen 1.10.0 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
9eedbe5e5f
commit
04f123fbfe
19 files changed
+319
-50
No files matched your search
@@ -1,6 +1,20 @@
|
||||
{
|
||||
"_about": "The site's changelog, newest first. Versions follow Semantic Versioning (MAJOR.MINOR.PATCH), dates ISO 8601 (DIN EN 28601). make_builder_data.py adds every mod's current version from its module and writes assets/versions.js.",
|
||||
"site": [
|
||||
{
|
||||
"version": "1.10.0",
|
||||
"date": "2026-11-15",
|
||||
"changes": [
|
||||
"Builder: a flash bar under the mods shows how much of the player's flash the firmware and the ticked mods take and how much stays free; every mod shows its own share.",
|
||||
"New mod: Browse info 0.1.0, BPM and key on the right of every track row in BROWSE.",
|
||||
"New mod: Divide hold 0.1.0, a BEAT DIVIDE key held down keeps its divide only while held.",
|
||||
"Phase meter: V2 (beat rulers past a centre line, as on the newer players) next to STOCK, V1 and V1 REVERSE.",
|
||||
"Quick search 0.6.0: the screen stands still while the player finds the track's list; fixed the row before being picked after a quick turn and push, lists over 255 tracks, a press during the way freezing the screen.",
|
||||
"USB auto load 0.2.0: the MY SETTINGS menu no longer flashes up.",
|
||||
"Cue names 0.1.2: no cue name next to Not Loaded. once the stick is out.",
|
||||
"Beat jump 1.0.2: a press at the track's end no longer starts the next track."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "1.9.4",
|
||||
"date": "2026-10-26",
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"1150cc0099d890fb4b9e09cf19f03464106ffd5fd04b1fa940d5af0b41008c4a": 6906428,
|
||||
"1aac029e66251bf499d2b1c96fb8ae259e2057e48d79d1a9bc8830f6ec6d7dc0": 6904542,
|
||||
"1ac3e30cde292865413950fe159663b3958e85939ed0a5d0122f796809a5f8ef": 6893712,
|
||||
"1d5dcba083d9a1884f608193be51a8ab8a5fd911e84cafbfd601ae582fd70290": 6906715,
|
||||
"222d2e4dcf4cfb884f099cca5cb4b4b7ad4188a352ac0f6ad12f489926f8a121": 6943999,
|
||||
"2b8a119748cc5f43581b68b4dd4222c0954ddcd9b7ddc5dcabf6cb6de334d91e": 6913740,
|
||||
"35234613e230e1ff2a9e4ce551268600cfbb802e61a8dd01b52880fb9ed86578": 6912279,
|
||||
"3e789a5068dbc1bb08c24ebaaeea52172c37816e922a24c74f6b390e693ad4fb": 6944002,
|
||||
"3eafe85e6e5513e365cacbcaad8890c4e8474e509f60a52a9c723970dfce990e": 6909090,
|
||||
"45cf24d9da3a12c59873b37c351e4762c113e6a6de47c4c8104f8d676e39b7c8": 6943058,
|
||||
"57504e1b8cdeeeabe45704e5b71a718e742a0c6d0accf03b43d39ffa86ea0511": 6918113,
|
||||
"58d52d735432081e0aeaa0b1117daa88b89e89a76b4474f23f915bbbdcbd713c": 6936034,
|
||||
"5be6f7e5ede6f797662ed719c31c9d48ab0b9ee5c2ab7ec284ce7087ecdaebe4": 6943040,
|
||||
"5fb46ad2ffa844ef6c08de85eea485b499b1b4a51bfa41a1935b3ff50f404398": 6906691,
|
||||
"62beedcb83c0d71dbe5917447c3c7f898415165f18e0f7cde3a22cfe5e0c6c54": 6943400,
|
||||
"6f1210bbed4dc6d41e204346e6ab088776512d0f616eb81ec4a04ab0769aa394": 6917154,
|
||||
"710931198b8311b8a206062d47cb4b8959e6f989b01ec0e8c9acb86f25095375": 6941497,
|
||||
"7a66f9d2af6b42fb2ce321196aa6f9fe69f2dc93541dd168ddaf7dbd1b6d1f36": 6917667,
|
||||
"7e6be04125481ff494eef2d1724acfcb3797409dcd0318b1dfbb2144691b0cf8": 6940119,
|
||||
"80ab23e0c84cc2c88ad723462f0864663d20777c944a04023d127fdfb799e954": 6942617,
|
||||
"84bc7dd728f54c0fbacdbd339b1899e1e41feeb890cf00696448894e69b08126": 6922252,
|
||||
"937f171fccba507f6e78bf00deb927435683f3e1bdb9397a6e4466e0a553df62": 6943484,
|
||||
"96efff44b0b633ef5942ac7236a5d6782cae3ed6fabab8fb8b6ea7ffcc6b9fb9": 6900808,
|
||||
"9fcdf2112425ce7ed2a240bd08fc20b6007fb4c2b144c3171be3225be088cdef": 6910191,
|
||||
"a27ba40182d4a810f56a4dfbe54ec1bce12c094c7387f4eba23455f81a73fc20": 6942534,
|
||||
"c6fd19838db82379960438e73c2390def1bbba2178c583f6207970eff10c736f": 6943259,
|
||||
"cb981ff2e89f4df6053bd54b243ce085ca8e0a27df40612bc349111c40f6ad5f": 6911303,
|
||||
"cf10bc19a2d7649c7af4f2f3f16a29674c298e42b12ea1db4d915efcddc576a9": 6943019,
|
||||
"d4864dc1f6779383b3cb7b8ac96db1ed1814b2ec16e5d74a2b1e17010088db8f": 6943884,
|
||||
"e30f8c12eb5fe7bcfc98435f9266ee8829e995419a085075ddb914f9e5cdcf74": 6943330,
|
||||
"e3a53138000ecbba9ac9b5a64c713b931c8f685d6c9e65ecfa1114ad5b7538a0": 6913007,
|
||||
"eb1c470a5b3e1822fc55ff349c19d9ff8493a20485d357b42c753530cbc6cf2f": 6943349,
|
||||
"ef134b4f137593953caf3aae9192c159b5fa3af58ad0a20aed127f65c73939ae": 6943966,
|
||||
"f154abfd82151a3854bf6bdf00a927bdf16610351512c9b51f32f09ec2f6c221": 6913567,
|
||||
"f6268fc3a7b3e9bbc4e85499c53b06d2e4d786a65a940d47ac420fca5217e409": 6905699,
|
||||
"fb6a5a4e37d2e219b84deda184512c620edbcd2b5c4a2323a4558c27041d40e9": 6937932
|
||||
}
|
||||
@@ -140,7 +140,95 @@ def apply_ops(app, stock, ops, hk, size):
|
||||
|
||||
|
||||
MODS_ALL = ('extended_bpm', 'phasemeter', 'advanced_waveforms', 'beatjump', 'cuecolours', 'hotcuekeys',
|
||||
'ledsaver', 'keynotation', 'usbautoload', 'quicksearch', 'cuenames', 'played', 'endwarn', 'wide_waveform', 'credit')
|
||||
'ledsaver', 'keynotation', 'usbautoload', 'quicksearch', 'cuenames', 'played', 'endwarn', 'wide_waveform',
|
||||
'browseinfo', 'divhold', 'credit')
|
||||
FLASH_NEEDS = {'beatjump': ('cuecolours', 'hotcuekeys'), 'hotcuekeys': ('cuecolours',), 'cuenames': ('cuecolours',)}
|
||||
FLASH_CACHE = os.path.join(HERE, 'flash_sizes.json')
|
||||
|
||||
|
||||
def _packed_len(job):
|
||||
"""(repo, names) -> the LZSS stream's length of the application with those mods (one process each)."""
|
||||
repo, names = job
|
||||
sys.path[:0] = [os.path.join(repo, 'mods'), os.path.join(repo, 'mods', 'cdj900nxs'),
|
||||
os.path.join(repo, 'scripts', 'firmware')]
|
||||
import patch_cdj900nxs as p
|
||||
import lzss_encode
|
||||
with open(os.path.join(repo, 'extract', 'cdj900nxs', 'main_unpacked.bin'), 'rb') as f:
|
||||
stock = f.read()[:p.APP_SIZE]
|
||||
app = p.patch(stock, list(names)) if names else stock
|
||||
return names, sha(app), len(lzss_encode.pack(app))
|
||||
|
||||
|
||||
def flash_sizes(repo, p):
|
||||
"""What each mod takes of the player's flash: the application is stored LZSS-packed in
|
||||
0x40000-0x7E0000 (upd.APP_END - APP_START bytes). A mod's share is the packed size with it
|
||||
(and what it needs) minus without it; the sum over a choice is an estimate (the packer finds
|
||||
a little more or less to share), the exact number the build tells. Packing takes a minute a
|
||||
run, so results are cached by the application's SHA-256 (tools/flash_sizes.json)."""
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(WEB), 'CDJ900NXSPatcher'))
|
||||
import upd
|
||||
from multiprocessing import Pool
|
||||
try:
|
||||
with open(FLASH_CACHE, encoding='utf-8') as f:
|
||||
cache = json.load(f)
|
||||
except (OSError, ValueError):
|
||||
cache = {}
|
||||
with open(os.path.join(repo, 'extract', 'cdj900nxs', 'main_unpacked.bin'), 'rb') as f:
|
||||
stock = f.read()[:p.APP_SIZE]
|
||||
def removed(m): # m and every mod that needs it, directly or not
|
||||
out, grow = {m}, True
|
||||
while grow:
|
||||
grow = False
|
||||
for n, d in FLASH_NEEDS.items():
|
||||
if n not in out and out & set(d):
|
||||
out.add(n)
|
||||
grow = True
|
||||
return out
|
||||
jobs = {(): None, MODS_ALL: None}
|
||||
for m in MODS_ALL:
|
||||
jobs[tuple(n for n in MODS_ALL if n not in removed(m))] = None
|
||||
d = tuple(n for n in MODS_ALL if n in FLASH_NEEDS.get(m, ()))
|
||||
jobs[d] = None
|
||||
jobs[tuple(n for n in MODS_ALL if n in d + (m,))] = None
|
||||
todo, known = [], {}
|
||||
for names in jobs:
|
||||
app_sha = sha(p.patch(stock, list(names)) if names else stock)
|
||||
if app_sha in cache:
|
||||
known[names] = cache[app_sha]
|
||||
else:
|
||||
todo.append((repo, names))
|
||||
if todo:
|
||||
print('packing %d applications for the flash sizes (about a minute each, in parallel)' % len(todo))
|
||||
with Pool(min(len(todo), max(1, (os.cpu_count() or 2) - 1))) as pool:
|
||||
for names, app_sha, n in pool.imap_unordered(_packed_len, todo):
|
||||
cache[app_sha] = n
|
||||
known[names] = n
|
||||
print(' %-60s %d' % (','.join(names) or 'stock', n))
|
||||
with open(FLASH_CACHE, 'w', encoding='utf-8', newline=chr(10)) as f:
|
||||
json.dump(cache, f, indent=1, sort_keys=True)
|
||||
region = lambda n: len(upd.pack_region(bytes(n)))
|
||||
# The packer shares a lot between the mods (alone each costs 7-30 KB, all together 50 KB), so a
|
||||
# sum of single sizes is far off. What every mod brings anyway (the frame: the smallest mod alone,
|
||||
# the boot text, costs it) is counted once; the rest is split by each mod's marginal size in the
|
||||
# full build (all mods packed minus all but it, and what needs it). Exact with none and with all.
|
||||
alone = {}
|
||||
for m in MODS_ALL:
|
||||
d = tuple(n for n in MODS_ALL if n in FLASH_NEEDS.get(m, ()))
|
||||
alone[m] = known[tuple(n for n in MODS_ALL if n in d + (m,))] - known[d]
|
||||
frame = min(v for m, v in alone.items() if m not in FLASH_NEEDS) # (one that needs others adds to them)
|
||||
marg = {}
|
||||
for m in sorted(MODS_ALL, key=lambda m: len(removed(m))):
|
||||
rest = tuple(n for n in MODS_ALL if n not in removed(m))
|
||||
marg[m] = max(0, known[MODS_ALL] - known[rest] - sum(marg[n] for n in removed(m) - {m}))
|
||||
total = region(known[MODS_ALL]) - region(known[()]) - frame
|
||||
k = total / float(sum(marg.values()) or 1)
|
||||
mods = {m: max(1, int(round(marg[m] * k))) for m in MODS_ALL}
|
||||
out = {'size': upd.APP_END - upd.APP_START, 'stock': region(known[()]),
|
||||
'all': region(known[MODS_ALL]), 'common': frame, 'mods': mods}
|
||||
print('flash: %d of %d with no mods, %d with all; shares %d + frame %d'
|
||||
% (out['stock'], out['size'], out['all'], sum(mods.values()), out['common']))
|
||||
print(' ' + ', '.join('%s %d' % kv for kv in sorted(mods.items(), key=lambda kv: -kv[1])))
|
||||
return out
|
||||
|
||||
|
||||
def python_bundle(repo):
|
||||
@@ -264,6 +352,7 @@ def main():
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(WEB), 'CDJ900NXSPatcher'))
|
||||
import upd
|
||||
data['stockUpdSha256'] = upd.STOCK_UPD_SHA256
|
||||
data['flash'] = flash_sizes(args.repo, p)
|
||||
for key, b64 in chunks.items(): # no firmware in what we ship
|
||||
blob = base64.b64decode(b64)
|
||||
for i in range(0, max(0, len(blob) - 47), 8):
|
||||
|
||||
Reference in new issue
Block a user