site 2.0.2: phase meter 1.3.0 (V2 tick spacing follows each player's tempo)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Thiemo TizianiandClaude Opus 5.5 committed 2026-11-15 22:59:42 +01:00
1 parent b35f512f9b
commit 4139e2f77e
8 files changed
+48 -6

No files matched your search

+2 -1
View File
@@ -12,6 +12,7 @@ window.CDJ_VERSIONS = {
"Known issues: the key colour on the player, hot cues after USB STOP and WAVEFORM with a track loaded are fixed and off the list.", "Known issues: the key colour on the player, hot cues after USB STOP and WAVEFORM with a track loaded are fixed and off the list.",
"New screenshots: the comparison at the top and the Phase meter tile show the V2 phase meter, in phase with a second player as tempo master.", "New screenshots: the comparison at the top and the Phase meter tile show the V2 phase meter, in phase with a second player as tempo master.",
"Phase meter 1.2.0: V2 REVERSE; in V2 the bar ticks of both rulers meet in one line, green while the bars are in phase; no more torn ticks on the player.", "Phase meter 1.2.0: V2 REVERSE; in V2 the bar ticks of both rulers meet in one line, green while the bars are in phase; no more torn ticks on the player.",
"Phase meter 1.3.0: in V2 the tick spacing follows each player's tempo, the master's and this deck's (a 70 BPM track's ticks twice as wide as a 140 BPM one's), so the ticks only line up once the tempos match.",
"Quick search 0.7.0: BROWSE opens as fast as without the mod; held, SEARCH comes sooner and only the list stands still while it is on its way, the deck below (time, BPM, overview) goes on.", "Quick search 0.7.0: BROWSE opens as fast as without the mod; held, SEARCH comes sooner and only the list stands still while it is on its way, the deck below (time, BPM, overview) goes on.",
"Quick search 0.7.0: BROWSE twice goes to the playing track's list only with the browse screen open (half a second or more); from the normal screen two presses open and close it as on a stock player.", "Quick search 0.7.0: BROWSE twice goes to the playing track's list only with the browse screen open (half a second or more); from the normal screen two presses open and close it as on a stock player.",
"Browse info 0.2.0: reads BPM and key only while the player is not loading a list, so lists and SEARCH no longer wait for it.", "Browse info 0.2.0: reads BPM and key only while the player is not loading a list, so lists and SEARCH no longer wait for it.",
@@ -265,7 +266,7 @@ window.CDJ_VERSIONS = {
], ],
"mods": { "mods": {
"extended_bpm": "1.0.0", "extended_bpm": "1.0.0",
"phasemeter": "1.2.0", "phasemeter": "1.3.0",
"advanced_waveforms": "1.4.0", "advanced_waveforms": "1.4.0",
"beatjump": "1.0.2", "beatjump": "1.0.2",
"cuecolours": "1.0.1", "cuecolours": "1.0.1",
+1 -1
View File
@@ -1,2 +1,2 @@
// Generated by tools/make_builder_data.py -- do not edit. // Generated by tools/make_builder_data.py -- do not edit.
window.BUILDER_DATA = {"stockUpdSha256":"e96bca7d1ac983985992a8e5fa7813e1ebf04bef514e0c6cfd0a8375f667f7f9","stockAppSha256":"1ac3e30cde292865413950fe159663b3958e85939ed0a5d0122f796809a5f8ef","appSize":16519056,"dataBase":150744320,"upstream":{"extended_bpm":{"size":16576352,"ops":[["data",145914824,"45b88bcd5afea839"],["data",146586208,"c465a030b70c781e"],["data",146586876,"c465a030b70c781e"],["data",146618952,"c3967666e153796f"],["data",146619984,"7f0079b1f754ae7e"],["data",146620120,"a91a9b3491491b64"],["data",146829820,"f9e6d34295c320f0"],["data",150736896,"6d11cfe939a0630a"],["data",150737408,"a4d77ab57ab896dd"],["data",150737920,"906ea135b6ba2cef"],["data",150738432,"d6db78bde1edbcae"],["data",150739456,"786195378d06baff"],["data",150739521,"503c09b6b0baefb3"],["data",150739968,"160adecaa849e284"],["data",150740480,"d82da843aae59533"],["data",150740992,"7010683be462baa0"],["data",150741248,"ebd1070ec574dec1"],["data",150741504,"172e933902cb3738"],["data",150742016,"2853d86b697a9dfa"],["data",150742272,"7c188559c27b7ceb"],["data",150742528,"e3f375bd0e18a505"],["data",150742784,"4617c585a7472b06"],["data",150743424,"163da0f1e1acc40a"],["data",150744064,"5e4e42864642a517"],["assets",150744320,49760]]},"phasemeter":{"size":16576352,"ops":[["data",135069542,"845677fae2e67916"],["data",145914824,"45b88bcd5afea839"],["data",145941230,"6922e93e3827642c"],["data",145986008,"84014a74358fe2ac"],["data",145987228,"84014a74358fe2ac"],["data",145988312,"84014a74358fe2ac"],["data",146168552,"84014a74358fe2ac"],["data",146172320,"84014a74358fe2ac"],["data",146173504,"84014a74358fe2ac"],["data",146829820,"f9e6d34295c320f0"],["data",147236557,"371b074706e32cac"],["data",147246288,"060f2c4b6cd4c5e4"],["data",150411792,"845677fae2e67916"],["data",150427952,"845677fae2e67916"],["data",150446592,"845677fae2e67916"],["data",150464904,"845677fae2e67916"],["data",150483144,"845677fae2e67916"],["data",150501528,"845677fae2e67916"],["data",150519852,"845677fae2e67916"],["data",150538228,"845677fae2e67916"],["data",150556534,"845677fae2e67916"],["data",150572646,"845677fae2e67916"],["data",150587026,"845677fae2e67916"],["data",150601380,"845677fae2e67916"],["data",150619274,"845677fae2e67916"],["data",150637628,"845677fae2e67916"],["data",150655862,"845677fae2e67916"],["data",150673666,"845677fae2e67916"],["data",150692276,"845677fae2e67916"],["data",150709976,"845677fae2e67916"],["data",150736896,"6d11cfe939a0630a"],["data",150737408,"a4d77ab57ab896dd"],["data",150737920,"906ea135b6ba2cef"],["data",150738432,"d6db78bde1edbcae"],["data",150739456,"786195378d06baff"],["data",150739521,"503c09b6b0baefb3"],["data",150739968,"160adecaa849e284"],["data",150740480,"d82da843aae59533"],["data",150740992,"7010683be462baa0"],["data",150741248,"ebd1070ec574dec1"],["data",150741504,"172e933902cb3738"],["data",150742016,"acf759afff056d54"],["data",150742272,"7c188559c27b7ceb"],["data",150742528,"e3f375bd0e18a505"],["data",150742784,"4617c585a7472b06"],["data",150743424,"163da0f1e1acc40a"],["data",150744064,"5e4e42864642a517"],["assets",150744320,49760]]},"advanced_waveforms":{"size":16636928,"ops":[["data",144311836,"ca71ec9290d6ed48"],["data",146565168,"52b8fe18a1fed3bf"],["data",146565756,"a2721044eff0d2f6"],["data",146603378,"620bfdaa346b088f"],["data",146603856,"582d807f9ed58432"],["data",147243844,"d77596e8499df246"],["data",150736896,"6d11cfe939a0630a"],["data",150737408,"a4d77ab57ab896dd"],["data",150737920,"906ea135b6ba2cef"],["data",150738432,"d6db78bde1edbcae"],["data",150738944,"91aaac306bd43135"],["data",150739456,"786195378d06baff"],["data",150739521,"d5326732238d3e24"],["data",150739968,"160adecaa849e284"],["data",150740480,"d82da843aae59533"],["data",150740992,"eede35a6260db6bf"],["data",150741248,"ebd1070ec574dec1"],["data",150741504,"bb010f4579136412"],["data",150742016,"9bed08a38f1020b6"],["data",150742272,"7c188559c27b7ceb"],["data",150742528,"e3f375bd0e18a505"],["data",150742784,"4617c585a7472b06"],["data",150743424,"163da0f1e1acc40a"],["data",150744064,"5e4e42864642a517"],["data",150853648,"87741faeb81ce6a9"],["assets",150744320,50528]]},"extended_bpm,phasemeter":{"size":16576352,"ops":[["data",135069542,"845677fae2e67916"],["data",145914824,"45b88bcd5afea839"],["data",145941230,"6922e93e3827642c"],["data",145986008,"84014a74358fe2ac"],["data",145987228,"84014a74358fe2ac"],["data",145988312,"84014a74358fe2ac"],["data",146168552,"84014a74358fe2ac"],["data",146172320,"84014a74358fe2ac"],["data",146173504,"84014a74358fe2ac"],["data",146586208,"c465a030b70c781e"],["data",146586876,"c465a030b70c781e"],["data",146618952,"c3967666e153796f"],["data",146619984,"7f0079b1f754ae7e"],["data",146620120,"a91a9b3491491b64"],["data",146829820,"f9e6d34295c320f0"],["data",147236557,"371b074706e32cac"],["data",147246288,"060f2c4b6cd4c5e4"],["data",150411792,"845677fae2e67916"],["data",150427952,"845677fae2e67916"],["data",150446592,"845677fae2e67916"],["data",150464904,"845677fae2e67916"],["data",150483144,"845677fae2e67916"],["data",150501Line truncated window.BUILDER_DATA = {"stockUpdSha256":"e96bca7d1ac983985992a8e5fa7813e1ebf04bef514e0c6cfd0a8375f667f7f9","stockAppSha256":"1ac3e30cde292865413950fe159663b3958e85939ed0a5d0122f796809a5f8ef","appSize":16519056,"dataBase":150744320,"upstream":{"extended_bpm":{"size":16576352,"ops":[["data",145914824,"45b88bcd5afea839"],["data",146586208,"c465a030b70c781e"],["data",146586876,"c465a030b70c781e"],["data",146618952,"c3967666e153796f"],["data",146619984,"7f0079b1f754ae7e"],["data",146620120,"a91a9b3491491b64"],["data",146829820,"f9e6d34295c320f0"],["data",150736896,"6d11cfe939a0630a"],["data",150737408,"a4d77ab57ab896dd"],["data",150737920,"906ea135b6ba2cef"],["data",150738432,"d6db78bde1edbcae"],["data",150739456,"786195378d06baff"],["data",150739521,"503c09b6b0baefb3"],["data",150739968,"160adecaa849e284"],["data",150740480,"d82da843aae59533"],["data",150740992,"7010683be462baa0"],["data",150741248,"ebd1070ec574dec1"],["data",150741504,"172e933902cb3738"],["data",150742016,"2853d86b697a9dfa"],["data",150742272,"7c188559c27b7ceb"],["data",150742528,"e3f375bd0e18a505"],["data",150742784,"4617c585a7472b06"],["data",150743424,"163da0f1e1acc40a"],["data",150744064,"5e4e42864642a517"],["assets",150744320,49760]]},"phasemeter":{"size":16576352,"ops":[["data",135069542,"845677fae2e67916"],["data",145914824,"45b88bcd5afea839"],["data",145941230,"6922e93e3827642c"],["data",145986008,"84014a74358fe2ac"],["data",145987228,"84014a74358fe2ac"],["data",145988312,"84014a74358fe2ac"],["data",146168552,"84014a74358fe2ac"],["data",146172320,"84014a74358fe2ac"],["data",146173504,"84014a74358fe2ac"],["data",146829820,"f9e6d34295c320f0"],["data",147236557,"371b074706e32cac"],["data",147246288,"060f2c4b6cd4c5e4"],["data",150411792,"845677fae2e67916"],["data",150427952,"845677fae2e67916"],["data",150446592,"845677fae2e67916"],["data",150464904,"845677fae2e67916"],["data",150483144,"845677fae2e67916"],["data",150501528,"845677fae2e67916"],["data",150519852,"845677fae2e67916"],["data",150538228,"845677fae2e67916"],["data",150556534,"845677fae2e67916"],["data",150572646,"845677fae2e67916"],["data",150587026,"845677fae2e67916"],["data",150601380,"845677fae2e67916"],["data",150619274,"845677fae2e67916"],["data",150637628,"845677fae2e67916"],["data",150655862,"845677fae2e67916"],["data",150673666,"845677fae2e67916"],["data",150692276,"845677fae2e67916"],["data",150709976,"845677fae2e67916"],["data",150736896,"6d11cfe939a0630a"],["data",150737408,"a4d77ab57ab896dd"],["data",150737920,"906ea135b6ba2cef"],["data",150738432,"d6db78bde1edbcae"],["data",150739456,"786195378d06baff"],["data",150739521,"503c09b6b0baefb3"],["data",150739968,"160adecaa849e284"],["data",150740480,"d82da843aae59533"],["data",150740992,"7010683be462baa0"],["data",150741248,"ebd1070ec574dec1"],["data",150741504,"172e933902cb3738"],["data",150742016,"acf759afff056d54"],["data",150742272,"7c188559c27b7ceb"],["data",150742528,"e3f375bd0e18a505"],["data",150742784,"4617c585a7472b06"],["data",150743424,"163da0f1e1acc40a"],["data",150744064,"5e4e42864642a517"],["assets",150744320,49760]]},"advanced_waveforms":{"size":16636928,"ops":[["data",144311836,"ca71ec9290d6ed48"],["data",146565168,"52b8fe18a1fed3bf"],["data",146565756,"a2721044eff0d2f6"],["data",146603378,"620bfdaa346b088f"],["data",146603856,"582d807f9ed58432"],["data",147243844,"d77596e8499df246"],["data",150736896,"6d11cfe939a0630a"],["data",150737408,"a4d77ab57ab896dd"],["data",150737920,"906ea135b6ba2cef"],["data",150738432,"d6db78bde1edbcae"],["data",150738944,"91aaac306bd43135"],["data",150739456,"786195378d06baff"],["data",150739521,"d5326732238d3e24"],["data",150739968,"160adecaa849e284"],["data",150740480,"d82da843aae59533"],["data",150740992,"eede35a6260db6bf"],["data",150741248,"ebd1070ec574dec1"],["data",150741504,"bb010f4579136412"],["data",150742016,"9bed08a38f1020b6"],["data",150742272,"7c188559c27b7ceb"],["data",150742528,"e3f375bd0e18a505"],["data",150742784,"4617c585a7472b06"],["data",150743424,"163da0f1e1acc40a"],["data",150744064,"5e4e42864642a517"],["data",150853648,"87741faeb81ce6a9"],["assets",150744320,50528]]},"extended_bpm,phasemeter":{"size":16576352,"ops":[["data",135069542,"845677fae2e67916"],["data",145914824,"45b88bcd5afea839"],["data",145941230,"6922e93e3827642c"],["data",145986008,"84014a74358fe2ac"],["data",145987228,"84014a74358fe2ac"],["data",145988312,"84014a74358fe2ac"],["data",146168552,"84014a74358fe2ac"],["data",146172320,"84014a74358fe2ac"],["data",146173504,"84014a74358fe2ac"],["data",146586208,"c465a030b70c781e"],["data",146586876,"c465a030b70c781e"],["data",146618952,"c3967666e153796f"],["data",146619984,"7f0079b1f754ae7e"],["data",146620120,"a91a9b3491491b64"],["data",146829820,"f9e6d34295c320f0"],["data",147236557,"371b074706e32cac"],["data",147246288,"060f2c4b6cd4c5e4"],["data",150411792,"845677fae2e67916"],["data",150427952,"845677fae2e67916"],["data",150446592,"845677fae2e67916"],["data",150464904,"845677fae2e67916"],["data",150483144,"845677fae2e67916"],["data",150501Line truncated
+1 -1
View File
@@ -1 +1 @@
{"mods/patch_cdj900nxs.py":"#!/usr/bin/env python3\n# SPDX-License-Identifier: GPL-2.0-or-later\n\"\"\"Apply arnoldasr's CDJ-900NXS 1.31 mods to the unpacked MAIN image.\n\n usage: patch_cdj900nxs.py <main_unpacked.bin> <patched.bin> <mod>[,<mod>...]\n patch_cdj900nxs.py --list\n\nThe mods come from https://github.com/arnoldasr/cdj900nxs, read as data from a\ncheckout of it (CDJ900NXS_MODS_SRC, default mods/cdj900nxs/upstream, which is\nnot committed: that repository carries no licence). Nothing of its Python is\nimported; what its build_firmware.py does is redone here:\n\n extended_bpm the BPM with hundredths: the stock tenths moved into a new\n small digit above, the lower one showing hundredths.\n phasemeter the two-line phase meter (orange master, blue this deck, a\n marker each) in place of the four boxes, chosen in UTILITY >\n PHASE METER (SLIP FLASHING relabelled; mods/phase-meter-\n utility.cdjmod.json).\n advanced_waveforms (was rgb_waveform; based on arnoldasr's, updated and\n maintained by us) the big waveform in rekordbox's RGB colours\n (1.0.1: also when its colour detail is a little short,\n cdj900nxs/wavefix.py), and the overview's colour table as a red-to-white\n gradient (mods/waveform-colour.cdjmod.json); with our\n UTILITY > WAVEFORM: BLUE / RGB / 3BAND (cdj900nxs/wavemodes.py,\n left out with public=True).\n\n The three are arnoldasr's code mod (patches/mods.json): hooks\n in the application redirected to SH-4 code appended after it\n (0x08FC1000), plus an asset blob at 0x08FC2D00 generated from\n the stock image (the resource table extended by four phase-meter\n images, then the RGB waveform palette and LUT). Upstream tested\n it as one build, and as one without the RGB waveform\n (patches/bpm-phase-meter.json); one of those two is built and\n checked against its hash first, then the hooks of a feature not\n chosen get their original bytes back. Their shared startup hook\n (0x08C071FC) installs the BPM digits and the phase markers: the\n call of the one not chosen is taken out there.\n beatjump ours, not arnoldasr's (cdj900nxs/beatjump.py): TRACK SEARCH\n jumps 1/2/4/8 beats along the grid, chosen in UTILITY > BEAT JUMP,\n made at once in the DSP's decoded audio (cdj900nxs/dspjump.py, a\n patch of the audio DSP's code),\n which replaces SCREEN SAVER. hotcuekeys' engine makes the jumps,\n so it needs hotcuekeys and cuecolours. Needs no upstream checkout.\n cuecolours ours (cdj900nxs/cuecolours.py): memory cues drawn in their\n rekordbox colour on the overview and the detail waveform, the\n rekordbox hot cues shown as lettered boxes.\n Needs no upstream checkout.\n hotcuekeys ours (cdj900nxs/hotcuekeys.py): UTILITY > HOT CUE KEYS (a new,\n 18th item); with it ON, QUANTIZE briefly pressed switches a hot\n cue key mode shown in a HOT KEYS box, held it is QUANTIZE. In\n the mode the top three BEAT DIVIDE keys play hot cues A-C (held: a\n gate), set one (empty key held while paused) or delete one\n (DELETE held). The hot cues come from cuecolours.\n ledsaver ours (cdj900nxs/ledsaver.py): UTILITY > LED ANIMATION (one more\n item, after the others); with it ON, while the screen saver dims\n the display the button LEDs and the jog's rings play a loop.\n keynotation ours (cdj900nxs/keynotation.py): UTILITY > KEY NOTATION (one\n more item): every track's key in Camelot, Open Key or classic\n notation, whatever rekordbox exported.\n usbautoload ours (cdj900nxs/usbautoload.py): UTILITY > USB AUTO LOAD (one\n more item): a stick's MY SETTINGS are loaded when the player finds\n them, without waiting for MENU.\n quicksearch ours (cdj900nxs/quicksearch.py): BROWSE held opens SEARCH,\n BROWSE twice the list the playing track came from; the screen\n holds its frame while the player walks there, so no step shows.\n browseinfo ours (cdj900nxs/browseinfo.py): every track row in BROWSE shows\n its BPM and key on the right, read from the stick's rekordbox\n export (the key in KEY NOTATION's notation and colour).\n (phasemeter also gets ours from cdj900nxs/phasereverse.py:\n UTILITY > PHASE METER STOCK / V1 / V1 REVERSE / V2, and the beat countdown\n moved clear of the line meter; `phasereverse` is an old name for it.)\n wide_waveform ours (cdj900nxs/widewave.py): the big waveform runs on to the\n right edge (624 columns, the extra ones ahead of the position); the\n ZOOM/GRID wheel gives way to a small grey ZOOM / GRID box.\n divhold ours (cdj900nxs/divhold.pLine truncated {"mods/patch_cdj900nxs.py":"#!/usr/bin/env python3\n# SPDX-License-Identifier: GPL-2.0-or-later\n\"\"\"Apply arnoldasr's CDJ-900NXS 1.31 mods to the unpacked MAIN image.\n\n usage: patch_cdj900nxs.py <main_unpacked.bin> <patched.bin> <mod>[,<mod>...]\n patch_cdj900nxs.py --list\n\nThe mods come from https://github.com/arnoldasr/cdj900nxs, read as data from a\ncheckout of it (CDJ900NXS_MODS_SRC, default mods/cdj900nxs/upstream, which is\nnot committed: that repository carries no licence). Nothing of its Python is\nimported; what its build_firmware.py does is redone here:\n\n extended_bpm the BPM with hundredths: the stock tenths moved into a new\n small digit above, the lower one showing hundredths.\n phasemeter the two-line phase meter (orange master, blue this deck, a\n marker each) in place of the four boxes, chosen in UTILITY >\n PHASE METER (SLIP FLASHING relabelled; mods/phase-meter-\n utility.cdjmod.json).\n advanced_waveforms (was rgb_waveform; based on arnoldasr's, updated and\n maintained by us) the big waveform in rekordbox's RGB colours\n (1.0.1: also when its colour detail is a little short,\n cdj900nxs/wavefix.py), and the overview's colour table as a red-to-white\n gradient (mods/waveform-colour.cdjmod.json); with our\n UTILITY > WAVEFORM: BLUE / RGB / 3BAND (cdj900nxs/wavemodes.py,\n left out with public=True).\n\n The three are arnoldasr's code mod (patches/mods.json): hooks\n in the application redirected to SH-4 code appended after it\n (0x08FC1000), plus an asset blob at 0x08FC2D00 generated from\n the stock image (the resource table extended by four phase-meter\n images, then the RGB waveform palette and LUT). Upstream tested\n it as one build, and as one without the RGB waveform\n (patches/bpm-phase-meter.json); one of those two is built and\n checked against its hash first, then the hooks of a feature not\n chosen get their original bytes back. Their shared startup hook\n (0x08C071FC) installs the BPM digits and the phase markers: the\n call of the one not chosen is taken out there.\n beatjump ours, not arnoldasr's (cdj900nxs/beatjump.py): TRACK SEARCH\n jumps 1/2/4/8 beats along the grid, chosen in UTILITY > BEAT JUMP,\n made at once in the DSP's decoded audio (cdj900nxs/dspjump.py, a\n patch of the audio DSP's code),\n which replaces SCREEN SAVER. hotcuekeys' engine makes the jumps,\n so it needs hotcuekeys and cuecolours. Needs no upstream checkout.\n cuecolours ours (cdj900nxs/cuecolours.py): memory cues drawn in their\n rekordbox colour on the overview and the detail waveform, the\n rekordbox hot cues shown as lettered boxes.\n Needs no upstream checkout.\n hotcuekeys ours (cdj900nxs/hotcuekeys.py): UTILITY > HOT CUE KEYS (a new,\n 18th item); with it ON, QUANTIZE briefly pressed switches a hot\n cue key mode shown in a HOT KEYS box, held it is QUANTIZE. In\n the mode the top three BEAT DIVIDE keys play hot cues A-C (held: a\n gate), set one (empty key held while paused) or delete one\n (DELETE held). The hot cues come from cuecolours.\n ledsaver ours (cdj900nxs/ledsaver.py): UTILITY > LED ANIMATION (one more\n item, after the others); with it ON, while the screen saver dims\n the display the button LEDs and the jog's rings play a loop.\n keynotation ours (cdj900nxs/keynotation.py): UTILITY > KEY NOTATION (one\n more item): every track's key in Camelot, Open Key or classic\n notation, whatever rekordbox exported.\n usbautoload ours (cdj900nxs/usbautoload.py): UTILITY > USB AUTO LOAD (one\n more item): a stick's MY SETTINGS are loaded when the player finds\n them, without waiting for MENU.\n quicksearch ours (cdj900nxs/quicksearch.py): BROWSE held opens SEARCH,\n BROWSE twice the list the playing track came from; the screen\n holds its frame while the player walks there, so no step shows.\n browseinfo ours (cdj900nxs/browseinfo.py): every track row in BROWSE shows\n its BPM and key on the right, read from the stick's rekordbox\n export (the key in KEY NOTATION's notation and colour).\n (phasemeter also gets ours from cdj900nxs/phasereverse.py:\n UTILITY > PHASE METER STOCK / V1 / V1 REVERSE / V2, and the beat countdown\n moved clear of the line meter; `phasereverse` is an old name for it.)\n wide_waveform ours (cdj900nxs/widewave.py): the big waveform runs on to the\n right edge (624 columns, the extra ones ahead of the position); the\n ZOOM/GRID wheel gives way to a small grey ZOOM / GRID box.\n divhold ours (cdj900nxs/divhold.pLine truncated
+1 -1
View File
@@ -6,7 +6,7 @@
{ id: 'extended_bpm', name: 'Extended BPM', by: 'arnoldasr', state: 'stable', { id: 'extended_bpm', name: 'Extended BPM', by: 'arnoldasr', state: 'stable',
what: 'BPM with two decimals: the tenths as a small digit above, the hundredths below.' }, what: 'BPM with two decimals: the tenths as a small digit above, the hundredths below.' },
{ id: 'phasemeter', release: '2.0', name: 'Phase meter', by: 'arnoldasr', state: 'experimental', { id: 'phasemeter', release: '2.0', name: 'Phase meter', by: 'arnoldasr', state: 'experimental',
what: 'UTILITY › PHASE METER (was SLIP FLASHING): STOCK (the four boxes), V1 (two lines), V1 REVERSE, V2 (beat rulers running past a centre line, as on the newer players; in phase the bar ticks meet in a green line) or V2 REVERSE. The bar countdown moved clear of the lines.' }, what: 'UTILITY › PHASE METER (was SLIP FLASHING): STOCK (the four boxes), V1 (two lines), V1 REVERSE, V2 (beat rulers running past a centre line, as on the newer players, tick spacing set by each player’s tempo; in phase the bar ticks meet in a green line) or V2 REVERSE. The bar countdown moved clear of the lines.' },
{ id: 'advanced_waveforms', name: 'Advanced waveforms', by: 'ours', state: 'experimental', { id: 'advanced_waveforms', name: 'Advanced waveforms', by: 'ours', state: 'experimental',
what: 'The big waveform in rekordbox’s RGB colours, the overview as a red-to-white gradient; UTILITY › WAVEFORM: BLUE, RGB or 3BAND (lows, mids, highs).' }, what: 'The big waveform in rekordbox’s RGB colours, the overview as a red-to-white gradient; UTILITY › WAVEFORM: BLUE, RGB or 3BAND (lows, mids, highs).' },
{ id: 'beatjump', name: 'Beat jump', by: 'ours', state: 'experimental', needs: 'hotcuekeys', { id: 'beatjump', name: 'Beat jump', by: 'ours', state: 'experimental', needs: 'hotcuekeys',
+1 -1
View File
@@ -102,7 +102,7 @@
<p>The BPM to two decimals: the tenths as a small digit above, the hundredths in the place of the stock decimal.</p> <p>The BPM to two decimals: the tenths as a small digit above, the hundredths in the place of the stock decimal.</p>
<h2 id="phasemeter">phasemeter <span class="badge author">arnoldasr</span> <span class="rel20" title="New in Pionaarr Mods 2.0.0">Pionaarr 2.0</span> <span class="state experimental">experimental</span></h2> <h2 id="phasemeter">phasemeter <span class="badge author">arnoldasr</span> <span class="rel20" title="New in Pionaarr Mods 2.0.0">Pionaarr 2.0</span> <span class="state experimental">experimental</span></h2>
<p>A two-line phase meter instead of the four boxes: orange for the master, blue for this deck, each with a marker. UTILITY › SLIP FLASHING becomes <strong>PHASE METER</strong>: ON shows the lines, OFF the stock boxes. The orange marker needs another player as tempo master. PHASE METER has five values: <strong>STOCK</strong> (the four boxes), <strong>V1</strong> (the two lines), <strong>V1 REVERSE</strong> (the markers run right to left), <strong>V2</strong> and <strong>V2 REVERSE</strong>. V2: the master's row and this deck's become rulers that run past a fixed white centre line, a tick every beat, the first beat of each bar red and longer, as on the newer players. The master's bar ticks reach down and this deck's up, so one above the other they meet in one line; while the bars are in phase (within a sixteenth of a beat) that line turns green. V2 REVERSE runs the rulers the other way, from left to right. Since 0.5 the rulers are drawn into the next of three buffers before the screen takes them, so the ticks no longer tear on the player. The bar countdown right of the meter sits a few pixels further right, clear of the lines. The choice is kept over a restart.</p> <p>A two-line phase meter instead of the four boxes: orange for the master, blue for this deck, each with a marker. UTILITY › SLIP FLASHING becomes <strong>PHASE METER</strong>: ON shows the lines, OFF the stock boxes. The orange marker needs another player as tempo master. PHASE METER has five values: <strong>STOCK</strong> (the four boxes), <strong>V1</strong> (the two lines), <strong>V1 REVERSE</strong> (the markers run right to left), <strong>V2</strong> and <strong>V2 REVERSE</strong>. V2: the master's row and this deck's become rulers that run past a fixed white centre line, a tick every beat, the first beat of each bar red and longer, as on the newer players. The master's bar ticks reach down and this deck's up, so one above the other they meet in one line; while the bars are in phase (within a sixteenth of a beat) that line turns green. V2 REVERSE runs the rulers the other way, from left to right. Since 0.6 both rulers share one time scale and their ticks follow each player's tempo: a beat is as wide as it is long (about 19 px at 145 BPM, 40 px at 70 BPM). This deck takes its tempo from the BPM display, pitch included; the master's comes from its beat packets. A slower track has wider ticks and a faster one narrower ticks, and both rulers move at the same speed. Match the tempo and the ticks end up the same distance apart; then bring the bars into phase. Since 0.5 the rulers are drawn into the next of three buffers before the screen takes them, so the ticks no longer tear on the player. The bar countdown right of the meter sits a few pixels further right, clear of the lines. The choice is kept over a restart.</p>
<figure class="shot"><img src="assets/utility-phase.png" alt="UTILITY with PHASE METER"><figcaption>UTILITY › PHASE METER.</figcaption></figure> <figure class="shot"><img src="assets/utility-phase.png" alt="UTILITY with PHASE METER"><figcaption>UTILITY › PHASE METER.</figcaption></figure>
<figure class="shot"><img src="assets/phase-v2.png" alt="Phase meter V2: in phase one green line through both rulers; an eighth of a beat off red ticks that do not quite meet; V2 REVERSE in phase"><figcaption>V2 in phase, V2 an eighth of a beat off, V2 REVERSE in phase (player 2 is the tempo master).</figcaption></figure> <figure class="shot"><img src="assets/phase-v2.png" alt="Phase meter V2: in phase one green line through both rulers; an eighth of a beat off red ticks that do not quite meet; V2 REVERSE in phase"><figcaption>V2 in phase, V2 an eighth of a beat off, V2 REVERSE in phase (player 2 is the tempo master).</figcaption></figure>
+1 -1
View File
@@ -315,7 +315,7 @@
</div> </div>
<div class="by">by arnoldasr · additions by us · <code>phasemeter</code></div> <div class="by">by arnoldasr · additions by us · <code>phasemeter</code></div>
<figure class="tshot"><img src="assets/card-phase.png" alt="Phase meter V2 in phase: the bar ticks of master player 2's ruler and this deck's meet in one green line" loading="lazy"><figcaption>V2</figcaption></figure> <figure class="tshot"><img src="assets/card-phase.png" alt="Phase meter V2 in phase: the bar ticks of master player 2's ruler and this deck's meet in one green line" loading="lazy"><figcaption>V2</figcaption></figure>
<p>UTILITY › PHASE METER: STOCK boxes, V1 lines or V2 beat rulers running past a centre line as on the newer players (each also REVERSE). In phase, the bar ticks of both rulers meet in one line and turn green.</p> <p>UTILITY › PHASE METER: STOCK boxes, V1 lines or V2 beat rulers running past a centre line as on the newer players (each also REVERSE). V2's ticks follow both players' tempo; in phase, the bar ticks of both rulers meet in one line and turn green.</p>
<a class="more" href="docs.html#phasemeter">More →</a> <a class="more" href="docs.html#phasemeter">More →</a>
</article> </article>
+1
View File
@@ -10,6 +10,7 @@
"Known issues: the key colour on the player, hot cues after USB STOP and WAVEFORM with a track loaded are fixed and off the list.", "Known issues: the key colour on the player, hot cues after USB STOP and WAVEFORM with a track loaded are fixed and off the list.",
"New screenshots: the comparison at the top and the Phase meter tile show the V2 phase meter, in phase with a second player as tempo master.", "New screenshots: the comparison at the top and the Phase meter tile show the V2 phase meter, in phase with a second player as tempo master.",
"Phase meter 1.2.0: V2 REVERSE; in V2 the bar ticks of both rulers meet in one line, green while the bars are in phase; no more torn ticks on the player.", "Phase meter 1.2.0: V2 REVERSE; in V2 the bar ticks of both rulers meet in one line, green while the bars are in phase; no more torn ticks on the player.",
"Phase meter 1.3.0: in V2 the tick spacing follows each player's tempo, the master's and this deck's (a 70 BPM track's ticks twice as wide as a 140 BPM one's), so the ticks only line up once the tempos match.",
"Quick search 0.7.0: BROWSE opens as fast as without the mod; held, SEARCH comes sooner and only the list stands still while it is on its way, the deck below (time, BPM, overview) goes on.", "Quick search 0.7.0: BROWSE opens as fast as without the mod; held, SEARCH comes sooner and only the list stands still while it is on its way, the deck below (time, BPM, overview) goes on.",
"Quick search 0.7.0: BROWSE twice goes to the playing track's list only with the browse screen open (half a second or more); from the normal screen two presses open and close it as on a stock player.", "Quick search 0.7.0: BROWSE twice goes to the playing track's list only with the browse screen open (half a second or more); from the normal screen two presses open and close it as on a stock player.",
"Browse info 0.2.0: reads BPM and key only while the player is not loading a list, so lists and SEARCH no longer wait for it.", "Browse info 0.2.0: reads BPM and key only while the player is not loading a list, so lists and SEARCH no longer wait for it.",
+40
View File
@@ -1,16 +1,22 @@
{ {
"03ee45529762e4921a2c1aa583bf88c2194628f71010d8c54dcd8dd2ddb548f3": 6976491, "03ee45529762e4921a2c1aa583bf88c2194628f71010d8c54dcd8dd2ddb548f3": 6976491,
"053bfec5636b68a81a5a65778b6de9d90baa03edb5d76d4c5438536b0881db4a": 6976571,
"0dac39cbcbc8555aa26995cb00e41bd2eb1f18583ab77ccefbf1afccea16a45c": 6976854, "0dac39cbcbc8555aa26995cb00e41bd2eb1f18583ab77ccefbf1afccea16a45c": 6976854,
"0f09e784e2c58c6c95da482eb99eec166ebfd4660aa5596da4154791e6ef502f": 6975517, "0f09e784e2c58c6c95da482eb99eec166ebfd4660aa5596da4154791e6ef502f": 6975517,
"0f505f99f97d378f924b287e49efb5ec7fc3d34d6961387b19763e3213d53dc4": 6953413, "0f505f99f97d378f924b287e49efb5ec7fc3d34d6961387b19763e3213d53dc4": 6953413,
"1150cc0099d890fb4b9e09cf19f03464106ffd5fd04b1fa940d5af0b41008c4a": 6906428, "1150cc0099d890fb4b9e09cf19f03464106ffd5fd04b1fa940d5af0b41008c4a": 6906428,
"1189890dc1a2bbacddde71d5625357d88382c63ec4b38d7dbfb707ca8368b54e": 6970818, "1189890dc1a2bbacddde71d5625357d88382c63ec4b38d7dbfb707ca8368b54e": 6970818,
"1334021e992bbe533ada125c8c8031fe2b64eed0271d33727a37b19ee60130f2": 6977044, "1334021e992bbe533ada125c8c8031fe2b64eed0271d33727a37b19ee60130f2": 6977044,
"13f4bceade8950979dadb18467043b53558c4506f4927d6fc42d9e9797719bcb": 6977180,
"15279315029cab6bedb9c6a7a97fffe50210b3a1620318ecd67d6d925f11f993": 6975503, "15279315029cab6bedb9c6a7a97fffe50210b3a1620318ecd67d6d925f11f993": 6975503,
"15b599d8d463aae02b707324ae69a869675f85210a66974fd1c4fca6f5bf54ab": 6976367,
"15feb70b0d7f39733cbf5bb75577bd8b37bd071e94c280be2c583facd453db2a": 6976885, "15feb70b0d7f39733cbf5bb75577bd8b37bd071e94c280be2c583facd453db2a": 6976885,
"188ec8979a6a10af885fb02aa763361f62df12cdbafc2827c64dd123ac5b860e": 6968760, "188ec8979a6a10af885fb02aa763361f62df12cdbafc2827c64dd123ac5b860e": 6968760,
"190c056def612387a836efc919f129a68aca96fe0e77d0e6cafc5684744428ef": 6976347,
"19cd20e0a36fbe3f79bd323c8cb1194a57dba9489fee1ec2143c6dd0996b86ac": 6922573,
"1aac029e66251bf499d2b1c96fb8ae259e2057e48d79d1a9bc8830f6ec6d7dc0": 6904542, "1aac029e66251bf499d2b1c96fb8ae259e2057e48d79d1a9bc8830f6ec6d7dc0": 6904542,
"1ac3e30cde292865413950fe159663b3958e85939ed0a5d0122f796809a5f8ef": 6893712, "1ac3e30cde292865413950fe159663b3958e85939ed0a5d0122f796809a5f8ef": 6893712,
"1b8fc95bb94247063b8fb6d3a8f1e3e1cf0e504469a84728246ad95cde46d4b0": 6969181,
"1d5dcba083d9a1884f608193be51a8ab8a5fd911e84cafbfd601ae582fd70290": 6906715, "1d5dcba083d9a1884f608193be51a8ab8a5fd911e84cafbfd601ae582fd70290": 6906715,
"1dcec465af0950323dd435ea558d50d5e80ee27da25f1e339f0b62a3ab70f691": 6969092, "1dcec465af0950323dd435ea558d50d5e80ee27da25f1e339f0b62a3ab70f691": 6969092,
"1e8cffe6fb619ef14e6d59867d3e57318e9d7846d0c46531f6ba4f84a24fbf02": 6975927, "1e8cffe6fb619ef14e6d59867d3e57318e9d7846d0c46531f6ba4f84a24fbf02": 6975927,
@@ -18,9 +24,12 @@
"22261ea2d6531d13c2d35d567ad586e1cc6fa274035601aac8c843f75331f306": 6969031, "22261ea2d6531d13c2d35d567ad586e1cc6fa274035601aac8c843f75331f306": 6969031,
"222d2e4dcf4cfb884f099cca5cb4b4b7ad4188a352ac0f6ad12f489926f8a121": 6943999, "222d2e4dcf4cfb884f099cca5cb4b4b7ad4188a352ac0f6ad12f489926f8a121": 6943999,
"274c6092c06ccbe664e5728751478736d740cca7ef6adab5c23200407e9f89b1": 6975517, "274c6092c06ccbe664e5728751478736d740cca7ef6adab5c23200407e9f89b1": 6975517,
"286c7f8981e3bdf2a0c70d2934dbc374a214c645ea0db3615620b87b3f5b2aeb": 6977194,
"28cd23bc86a904eb0f9c431307914fb9a15f823e0ad08e2e14ae3c045ed1b3ab": 6976328,
"29c91969f90e2c6326432e9e15c9bee20effd6d9d378b24df9047a529ad6f990": 6977057, "29c91969f90e2c6326432e9e15c9bee20effd6d9d378b24df9047a529ad6f990": 6977057,
"2a92752a19d46c878407e99b2c5df1e6ac28cba3ab4e99eb87d721f68e038744": 6976888, "2a92752a19d46c878407e99b2c5df1e6ac28cba3ab4e99eb87d721f68e038744": 6976888,
"2b8a119748cc5f43581b68b4dd4222c0954ddcd9b7ddc5dcabf6cb6de334d91e": 6913740, "2b8a119748cc5f43581b68b4dd4222c0954ddcd9b7ddc5dcabf6cb6de334d91e": 6913740,
"2c857690f6b35d46f72fc16491a7e67bd7cd40eb8d89d36cfd1cc5d6168e85a6": 6973430,
"2f1f0b799e5f749aa8012598ba066c75901270165faa54728481ddbf54303f7d": 6976145, "2f1f0b799e5f749aa8012598ba066c75901270165faa54728481ddbf54303f7d": 6976145,
"2fe0216f99ea8f26a03e403ceb3dbdc0d37ab0df63588f3ed3c5648c45dc3a9b": 6917217, "2fe0216f99ea8f26a03e403ceb3dbdc0d37ab0df63588f3ed3c5648c45dc3a9b": 6917217,
"30808cf42fedd1408e30d506705405815b467ddb78ccaaa03b52096ffe963a6c": 6976236, "30808cf42fedd1408e30d506705405815b467ddb78ccaaa03b52096ffe963a6c": 6976236,
@@ -28,41 +37,57 @@
"35234613e230e1ff2a9e4ce551268600cfbb802e61a8dd01b52880fb9ed86578": 6912279, "35234613e230e1ff2a9e4ce551268600cfbb802e61a8dd01b52880fb9ed86578": 6912279,
"353ba79a639c09220065747285e47f3d909314349b4f3fd64ffa3582231ae22c": 6900807, "353ba79a639c09220065747285e47f3d909314349b4f3fd64ffa3582231ae22c": 6900807,
"35bb20812200026785990ce5631b6a52a2c03128e0cfce0d5f61bf152ee5be93": 6976214, "35bb20812200026785990ce5631b6a52a2c03128e0cfce0d5f61bf152ee5be93": 6976214,
"3ad8e4a318bc41af659237739e289fe74bac7b2c3713b86d114f80169b301158": 6971244,
"3b1550598386ecabce471bdf72609cc7ce5a3af47c45645c94088ce966c6a011": 6975686, "3b1550598386ecabce471bdf72609cc7ce5a3af47c45645c94088ce966c6a011": 6975686,
"3e789a5068dbc1bb08c24ebaaeea52172c37816e922a24c74f6b390e693ad4fb": 6944002, "3e789a5068dbc1bb08c24ebaaeea52172c37816e922a24c74f6b390e693ad4fb": 6944002,
"3eafe85e6e5513e365cacbcaad8890c4e8474e509f60a52a9c723970dfce990e": 6909090, "3eafe85e6e5513e365cacbcaad8890c4e8474e509f60a52a9c723970dfce990e": 6909090,
"442515964673fd577c92b23915a21a7a97777a25e013b832701340b8fdb9b22f": 6975927, "442515964673fd577c92b23915a21a7a97777a25e013b832701340b8fdb9b22f": 6975927,
"44409714cdcfa748d1b76031095d0337b62d61a4aa61cad75d8f2b36c8db903f": 6953413, "44409714cdcfa748d1b76031095d0337b62d61a4aa61cad75d8f2b36c8db903f": 6953413,
"445a62910a8d694b067d8e47a481df543938f6c1d58b71824ecf790793ca6351": 6977263,
"44aae00ec6a051b8a6a5fac187f6b9172e99048b8682dc1e3f6f4e2169e28c19": 6977297,
"45cf24d9da3a12c59873b37c351e4762c113e6a6de47c4c8104f8d676e39b7c8": 6943058, "45cf24d9da3a12c59873b37c351e4762c113e6a6de47c4c8104f8d676e39b7c8": 6943058,
"4887ac414c98dfa43d767b4bcb1f9f830088b7b07fc133f48c9b8538d8360b44": 6977309,
"49c3972bcbd533db4c3d7c10f13e7a141d9948a39594659948835aad3ebae49f": 6976358,
"4bc01c24af9c990b2825a46f9da88a870d3679020f0a3a1fe6d493064d5e2ea5": 6975673, "4bc01c24af9c990b2825a46f9da88a870d3679020f0a3a1fe6d493064d5e2ea5": 6975673,
"4bf15babbaa8ce866724114d0c17a4b62ef6358cfb440cd524df748ef7a01649": 6968921, "4bf15babbaa8ce866724114d0c17a4b62ef6358cfb440cd524df748ef7a01649": 6968921,
"4e80ebca4978b996092f6aab7a3428e3974e54e6c39c023944edf3138b3d5a4d": 6976888, "4e80ebca4978b996092f6aab7a3428e3974e54e6c39c023944edf3138b3d5a4d": 6976888,
"50a54efa9c285db4f5a48e3cf73a2324d0d767082d22a2d3501e90e15350f98a": 6975869,
"57504e1b8cdeeeabe45704e5b71a718e742a0c6d0accf03b43d39ffa86ea0511": 6918113, "57504e1b8cdeeeabe45704e5b71a718e742a0c6d0accf03b43d39ffa86ea0511": 6918113,
"57a5ef42afd6e0eee492a3dcfb7962aa27c5a5ba22e6bf95eeb8113774c8dae9": 6975840,
"58d52d735432081e0aeaa0b1117daa88b89e89a76b4474f23f915bbbdcbd713c": 6936034, "58d52d735432081e0aeaa0b1117daa88b89e89a76b4474f23f915bbbdcbd713c": 6936034,
"59d4a02629816bbd2a2d8bf01557c1e3808be030cf06c62777e88c71bac1267f": 6977311,
"5b1322ea0f133035b99462ee09175cdd5c42dc1a23b2da38164dad292f87ac07": 6975719, "5b1322ea0f133035b99462ee09175cdd5c42dc1a23b2da38164dad292f87ac07": 6975719,
"5be6f7e5ede6f797662ed719c31c9d48ab0b9ee5c2ab7ec284ce7087ecdaebe4": 6943040, "5be6f7e5ede6f797662ed719c31c9d48ab0b9ee5c2ab7ec284ce7087ecdaebe4": 6943040,
"5dacfd477540f9c0cc90f42cb251c256f8baa83b1629c0beb1368d238e759fdd": 6977159, "5dacfd477540f9c0cc90f42cb251c256f8baa83b1629c0beb1368d238e759fdd": 6977159,
"5eeae86c39c45400ed117bc3af30670760e25d7300be0e6cbb1a83ed3b56c620": 6968760, "5eeae86c39c45400ed117bc3af30670760e25d7300be0e6cbb1a83ed3b56c620": 6968760,
"5fb46ad2ffa844ef6c08de85eea485b499b1b4a51bfa41a1935b3ff50f404398": 6906691, "5fb46ad2ffa844ef6c08de85eea485b499b1b4a51bfa41a1935b3ff50f404398": 6906691,
"60f0fb8ce420d8459a2452537c9ae05b7677757141f3d39920b41790ad855177": 6969197, "60f0fb8ce420d8459a2452537c9ae05b7677757141f3d39920b41790ad855177": 6969197,
"61b2fa31d2a78e838c0ee6b97565820c444eb3bbc0739000cb47518b72a5d4dc": 6975855,
"62259a2d21e5dac772aff41e349e59983d94468e604b6d962df5ff1c29b4c2eb": 6975944, "62259a2d21e5dac772aff41e349e59983d94468e604b6d962df5ff1c29b4c2eb": 6975944,
"623ea34b0a59c12ebe97e589c56ee5a30fcd24fd84808def26cd4e80fad121a1": 6976286, "623ea34b0a59c12ebe97e589c56ee5a30fcd24fd84808def26cd4e80fad121a1": 6976286,
"62a3d961c87bd40c4a116378f29dc1a1ef3e29040bd2350f38fb9bf53e660838": 6976314,
"62beedcb83c0d71dbe5917447c3c7f898415165f18e0f7cde3a22cfe5e0c6c54": 6943400, "62beedcb83c0d71dbe5917447c3c7f898415165f18e0f7cde3a22cfe5e0c6c54": 6943400,
"63169b097956fa1c68c2639f142e9c00831ddc11cfcf69d710b8d7d68972be30": 6969167,
"6909692d3380c5d371c17859b763b69cd6116428fa788c5327a0aea63684bf91": 6976286, "6909692d3380c5d371c17859b763b69cd6116428fa788c5327a0aea63684bf91": 6976286,
"697b60cc29ce562bc0f030b9629bd09785dd76237a0a1f81e4c7b4c9293dc91c": 6975586, "697b60cc29ce562bc0f030b9629bd09785dd76237a0a1f81e4c7b4c9293dc91c": 6975586,
"6a709158ff52761457d24a6ac00a81e1ee16159a322463c4fd362b7e9842faca": 6976145, "6a709158ff52761457d24a6ac00a81e1ee16159a322463c4fd362b7e9842faca": 6976145,
"6b0846f64bb3c0628c329b66333380be7bc5e9373c63b7b68ff9264e8ba55495": 6975944, "6b0846f64bb3c0628c329b66333380be7bc5e9373c63b7b68ff9264e8ba55495": 6975944,
"6b74a48d5e65de6176df3a209ebebac0c0b1ad7d646cd06c8439bce38eaa5b6b": 6975905, "6b74a48d5e65de6176df3a209ebebac0c0b1ad7d646cd06c8439bce38eaa5b6b": 6975905,
"6c30bc94b4977de3da76bdb826945d3f27648c12d4377eb95365b827b1dbd5d3": 6977277,
"6c9b9b3169db8d827f9c6462b78b492c7863e82c859dd96b80d72182a3d66583": 6976771, "6c9b9b3169db8d827f9c6462b78b492c7863e82c859dd96b80d72182a3d66583": 6976771,
"6cd0b2e2ca1264159fdc4ca79de13f2780601d9970046c2f5ab1a973eab3b5a7": 6973172, "6cd0b2e2ca1264159fdc4ca79de13f2780601d9970046c2f5ab1a973eab3b5a7": 6973172,
"6d87f5c1f402d7f197623e3ca7785701c68db53cda7d6a0dfc83bb6300f75ffa": 6976641,
"6e2ba92037731cc975d4e09dde22d82647e21db2d6b5cbb0d9fc8aa4da59ea83": 6976771, "6e2ba92037731cc975d4e09dde22d82647e21db2d6b5cbb0d9fc8aa4da59ea83": 6976771,
"6f1210bbed4dc6d41e204346e6ab088776512d0f616eb81ec4a04ab0769aa394": 6917154, "6f1210bbed4dc6d41e204346e6ab088776512d0f616eb81ec4a04ab0769aa394": 6917154,
"6fc75d77646b765d9e479e8b87acdb8a61448f9d02a4db9376fb764dbe134efc": 6900807, "6fc75d77646b765d9e479e8b87acdb8a61448f9d02a4db9376fb764dbe134efc": 6900807,
"707f6d0e18ebfe34ce19dd334cf8388e25b931914d0abe3aa87419d1c80a2e2c": 6969347,
"710931198b8311b8a206062d47cb4b8959e6f989b01ec0e8c9acb86f25095375": 6941497, "710931198b8311b8a206062d47cb4b8959e6f989b01ec0e8c9acb86f25095375": 6941497,
"71aa92cb85050e42b9bb46208eae357d504c0acbd2b11e4fe2d29c8f7a5197be": 6976109, "71aa92cb85050e42b9bb46208eae357d504c0acbd2b11e4fe2d29c8f7a5197be": 6976109,
"72936b4bd9cc16336b3c70f1c9af36bac541e8dbbf6021190f744a5ec50e993f": 6975420, "72936b4bd9cc16336b3c70f1c9af36bac541e8dbbf6021190f744a5ec50e993f": 6975420,
"738ce1f0bf634f1d113e0eac3fac49899494de05adb0bd3133cf335fc9900d0d": 6976371, "738ce1f0bf634f1d113e0eac3fac49899494de05adb0bd3133cf335fc9900d0d": 6976371,
"73fe9619e08439a496efa088e8d6c7a21a2404e80465e5af81e0084bcbbb66eb": 6926157, "73fe9619e08439a496efa088e8d6c7a21a2404e80465e5af81e0084bcbbb66eb": 6926157,
"74c5c6ec4413aa1d13b82858902dcdf1edf96c03d7e8187837d55fdd5c42a59a": 6953822,
"76482124321ace8418062b07d15661224d1fd1269312a6aba410c60bbcbbceaa": 6977295,
"788233920fefb31f6004b456a9eab0611f9677c86638db2a5169d0d39f193ec1": 6976771, "788233920fefb31f6004b456a9eab0611f9677c86638db2a5169d0d39f193ec1": 6976771,
"79baf9fdab20da6c2ffe3dd4f8e8a1f9c45eb049c42c05b69395814046c0999b": 6970818, "79baf9fdab20da6c2ffe3dd4f8e8a1f9c45eb049c42c05b69395814046c0999b": 6970818,
"7a66f9d2af6b42fb2ce321196aa6f9fe69f2dc93541dd168ddaf7dbd1b6d1f36": 6917667, "7a66f9d2af6b42fb2ce321196aa6f9fe69f2dc93541dd168ddaf7dbd1b6d1f36": 6917667,
@@ -74,6 +99,7 @@
"814ae5f2196493dcf271e9c46c2956850267c09f92278a92c4b963a3ef38750e": 6977023, "814ae5f2196493dcf271e9c46c2956850267c09f92278a92c4b963a3ef38750e": 6977023,
"8167991cc839d5471a0ba78032b1c7a72894f89b80a6f0ed3c23678060eb5d7b": 6971094, "8167991cc839d5471a0ba78032b1c7a72894f89b80a6f0ed3c23678060eb5d7b": 6971094,
"8169de4a0a1a3db954d7e174682d832e71a827505a4db95277b7e24888e4fd6d": 6976885, "8169de4a0a1a3db954d7e174682d832e71a827505a4db95277b7e24888e4fd6d": 6976885,
"83e4d8879ea1315886d81ec46837ca7d3797635cce13674eca1034a9dfc74c22": 6969332,
"84328a6fd16b9f041c9e12346107ddec08f46d4d13bde33f36bd3298f3e55007": 6976559, "84328a6fd16b9f041c9e12346107ddec08f46d4d13bde33f36bd3298f3e55007": 6976559,
"84b02bc1c9b3861b78436c667b11694503982c0568455135537e1ec497387a25": 6941456, "84b02bc1c9b3861b78436c667b11694503982c0568455135537e1ec497387a25": 6941456,
"84bc7dd728f54c0fbacdbd339b1899e1e41feeb890cf00696448894e69b08126": 6922252, "84bc7dd728f54c0fbacdbd339b1899e1e41feeb890cf00696448894e69b08126": 6922252,
@@ -85,6 +111,8 @@
"8d8c0e0c1c69f35a398a1a6775771c75d41376d82063a6621fb1bd603fa054e5": 6976217, "8d8c0e0c1c69f35a398a1a6775771c75d41376d82063a6621fb1bd603fa054e5": 6976217,
"8f2ae7c8a55a88281b3577bd78209690eb236195fb3c4a0aeef67f6d679c4189": 6976480, "8f2ae7c8a55a88281b3577bd78209690eb236195fb3c4a0aeef67f6d679c4189": 6976480,
"8fef23ae1f7a85ad9fff08f6ac177668ef70c0c8d399922d3c2c704f9812eedb": 6973005, "8fef23ae1f7a85ad9fff08f6ac177668ef70c0c8d399922d3c2c704f9812eedb": 6973005,
"901275f0b718ed34495a8f0c6d244f34573f1e7f2e6938d8a0ed8f0844d6f1f7": 6971230,
"93799ef98d0cceb530c0f8f7f3bd9c3ddbd801e9f2171997aac7f51caa957cff": 6973416,
"937f171fccba507f6e78bf00deb927435683f3e1bdb9397a6e4466e0a553df62": 6943484, "937f171fccba507f6e78bf00deb927435683f3e1bdb9397a6e4466e0a553df62": 6943484,
"9501d75b872cbc219dde72b793a89bc34d951ca4fa7162466ab10722b0a03177": 6968921, "9501d75b872cbc219dde72b793a89bc34d951ca4fa7162466ab10722b0a03177": 6968921,
"9546427b233e9401bf3a85884224b9514ea4a2ee657dff585ad14470fefb3ead": 6976286, "9546427b233e9401bf3a85884224b9514ea4a2ee657dff585ad14470fefb3ead": 6976286,
@@ -93,14 +121,19 @@
"9be4802ba7e22d5b77c441ed17aa0f6503748858156fe10d93ba8213f9917352": 6976421, "9be4802ba7e22d5b77c441ed17aa0f6503748858156fe10d93ba8213f9917352": 6976421,
"9d1472a668f2bad67be1d1302c3d9b32d1198b993d4027b46f8fc08d2b6ae72a": 6968929, "9d1472a668f2bad67be1d1302c3d9b32d1198b993d4027b46f8fc08d2b6ae72a": 6968929,
"9d2424e445f9735bf399788fa6683245e19fdadc887132110e953082ac30179f": 6975503, "9d2424e445f9735bf399788fa6683245e19fdadc887132110e953082ac30179f": 6975503,
"9e42905d9e6300d603a257295f3054efc626ad9e233c80e9b4b8828357c7d315": 6975895,
"9fcdf2112425ce7ed2a240bd08fc20b6007fb4c2b144c3171be3225be088cdef": 6910191, "9fcdf2112425ce7ed2a240bd08fc20b6007fb4c2b144c3171be3225be088cdef": 6910191,
"a23384829af89c6b5d578e09ed399825da296800407d8cb25bc4505f4b02b86d": 6976405, "a23384829af89c6b5d578e09ed399825da296800407d8cb25bc4505f4b02b86d": 6976405,
"a27ba40182d4a810f56a4dfbe54ec1bce12c094c7387f4eba23455f81a73fc20": 6942534, "a27ba40182d4a810f56a4dfbe54ec1bce12c094c7387f4eba23455f81a73fc20": 6942534,
"a483db0cec123497e5889fbe0c738265a7729649c54e5a6161dffc422033a5ef": 6922584,
"a6ad96469139d7c431edc7917f5746cb3f309c35ab424ab9f2b4b33ca58aebf7": 6973005, "a6ad96469139d7c431edc7917f5746cb3f309c35ab424ab9f2b4b33ca58aebf7": 6973005,
"a717b442966ef65e340a99540d2f8835ffecc948474b6b5d93e3ae827332f2fb": 6976317, "a717b442966ef65e340a99540d2f8835ffecc948474b6b5d93e3ae827332f2fb": 6976317,
"a7ca7979b1660c747724b8df6abb8ca2ba76e9d559fc05a9a197993b4a2849ef": 6975745, "a7ca7979b1660c747724b8df6abb8ca2ba76e9d559fc05a9a197993b4a2849ef": 6975745,
"a840e346c8153b565202d82cacc434d513ecc3c413b71c4ecdd7d222b89a621a": 6976557,
"a919e82296caac91ee179d4fad913edf2ae4c62436705e44371ee41b325ec410": 6975881,
"aa34bc67f31ed6afa4fbaef955280ff300c8eff4d2ce92830745925c0d440c54": 6968760, "aa34bc67f31ed6afa4fbaef955280ff300c8eff4d2ce92830745925c0d440c54": 6968760,
"af30626b656950ba9547b8b30688cdf6296ec6b474b3912d3587582797a043bc": 6976145, "af30626b656950ba9547b8b30688cdf6296ec6b474b3912d3587582797a043bc": 6976145,
"b1084ae8100c972be290acd3299f88f9a7f9f4c1b7c3c14290398fb62df4ae3c": 6976695,
"b3579da89b26cdafa248f23f6fabdf36f1a73de6e482b1f38c4f198db3a0b35d": 6976509, "b3579da89b26cdafa248f23f6fabdf36f1a73de6e482b1f38c4f198db3a0b35d": 6976509,
"b470c9f5544d276643fab43bcd1f8cbb064c35ee4451169efc59a9b9a3eb3da0": 6976455, "b470c9f5544d276643fab43bcd1f8cbb064c35ee4451169efc59a9b9a3eb3da0": 6976455,
"b4c15d52ef1bb2385a2c2da722b72a74d4b54aa81209971e8eab2208cc0498b4": 6970818, "b4c15d52ef1bb2385a2c2da722b72a74d4b54aa81209971e8eab2208cc0498b4": 6970818,
@@ -112,11 +145,14 @@
"c5d60ff609017470d26bef5581d306d0a95f4ba0a24e207b7d1babb2c03b8d44": 6976384, "c5d60ff609017470d26bef5581d306d0a95f4ba0a24e207b7d1babb2c03b8d44": 6976384,
"c6fd19838db82379960438e73c2390def1bbba2178c583f6207970eff10c736f": 6943259, "c6fd19838db82379960438e73c2390def1bbba2178c583f6207970eff10c736f": 6943259,
"c8a46d236849b5c35b278f9606fa954f5f4f3215ee90fa54070d54d6ea96a749": 6976178, "c8a46d236849b5c35b278f9606fa954f5f4f3215ee90fa54070d54d6ea96a749": 6976178,
"c9ffeb21439e1f1ff1d5e4b5ad04dbc83e3177d2eca90ea41f0bbd95313e37ea": 6976645,
"cb981ff2e89f4df6053bd54b243ce085ca8e0a27df40612bc349111c40f6ad5f": 6911303, "cb981ff2e89f4df6053bd54b243ce085ca8e0a27df40612bc349111c40f6ad5f": 6911303,
"ceee3ec2a74c4dde2a736e1de2dd830a9c2a325d56c491bb08eb6b428e0a2363": 6975905, "ceee3ec2a74c4dde2a736e1de2dd830a9c2a325d56c491bb08eb6b428e0a2363": 6975905,
"cf10bc19a2d7649c7af4f2f3f16a29674c298e42b12ea1db4d915efcddc576a9": 6943019, "cf10bc19a2d7649c7af4f2f3f16a29674c298e42b12ea1db4d915efcddc576a9": 6943019,
"cfcd5c174de5ea0530e2d9214d2e0007a47434804762d4f0b5c6882015951419": 6953836,
"d26b210edd884ba9182a58b7b5a6b5c052ecae2af6f4f96769359341d7343239": 6977127, "d26b210edd884ba9182a58b7b5a6b5c052ecae2af6f4f96769359341d7343239": 6977127,
"d4864dc1f6779383b3cb7b8ac96db1ed1814b2ec16e5d74a2b1e17010088db8f": 6943884, "d4864dc1f6779383b3cb7b8ac96db1ed1814b2ec16e5d74a2b1e17010088db8f": 6943884,
"d549530453fa863b17eeeafbe6d51fa279e40f8d73acaf884d5bcb7d0d054a6b": 6976627,
"d5b6f02392cd8182ee54ab3bb01cbbfee1647cd824d0cc3ce26c31d77e611ee0": 6975420, "d5b6f02392cd8182ee54ab3bb01cbbfee1647cd824d0cc3ce26c31d77e611ee0": 6975420,
"d934e48379d981be93093dd9f3f4b598d23b0004cc5d7d030f0ed76ad67bf747": 6976888, "d934e48379d981be93093dd9f3f4b598d23b0004cc5d7d030f0ed76ad67bf747": 6976888,
"dcb3530ef1f49c41857012679da2f5a15e4ad6b64900812f3031a19a7897fbb8": 6918159, "dcb3530ef1f49c41857012679da2f5a15e4ad6b64900812f3031a19a7897fbb8": 6918159,
@@ -130,6 +166,7 @@
"e737a7aa1a2af29901676e9031daa8d03337dd7dd4bdf0094ed07957b5831900": 6975503, "e737a7aa1a2af29901676e9031daa8d03337dd7dd4bdf0094ed07957b5831900": 6975503,
"e8a9c2d63a22dca62eaa8430a0c81c01797d6e28dddb650431ce748b27e74914": 6953582, "e8a9c2d63a22dca62eaa8430a0c81c01797d6e28dddb650431ce748b27e74914": 6953582,
"e8d522a144cbe51d350d167b604f568fdd05e9420aaa2c914b22e34d063ff61d": 6977054, "e8d522a144cbe51d350d167b604f568fdd05e9420aaa2c914b22e34d063ff61d": 6977054,
"e970398e0463f6446dbebadca4c9f07fc15e8d13214f5a4970e10479f4a6bc3e": 6976659,
"ea9ee9518fc2b9a8ccbad93d8e712907760567911ab38a364cf45f23266c2212": 6976371, "ea9ee9518fc2b9a8ccbad93d8e712907760567911ab38a364cf45f23266c2212": 6976371,
"eb1c470a5b3e1822fc55ff349c19d9ff8493a20485d357b42c753530cbc6cf2f": 6943349, "eb1c470a5b3e1822fc55ff349c19d9ff8493a20485d357b42c753530cbc6cf2f": 6943349,
"ef134b4f137593953caf3aae9192c159b5fa3af58ad0a20aed127f65c73939ae": 6943966, "ef134b4f137593953caf3aae9192c159b5fa3af58ad0a20aed127f65c73939ae": 6943966,
@@ -137,7 +174,10 @@
"f4cb95f0d12a9f56efe53f14418cc892fac705a9019deddc38cf94d196189d9f": 6976236, "f4cb95f0d12a9f56efe53f14418cc892fac705a9019deddc38cf94d196189d9f": 6976236,
"f6268fc3a7b3e9bbc4e85499c53b06d2e4d786a65a940d47ac420fca5217e409": 6905699, "f6268fc3a7b3e9bbc4e85499c53b06d2e4d786a65a940d47ac420fca5217e409": 6905699,
"f9aeb54710cb46b64973be9f4de2a85ddb0c7c225823d6bcd5741e2c0c224683": 6976217, "f9aeb54710cb46b64973be9f4de2a85ddb0c7c225823d6bcd5741e2c0c224683": 6976217,
"fa099521f05dc405bb99a6e8605bc8248b961bf91430838cd77607aea851bed9": 6976353,
"faa21a18adfd79d229f4c2ed69366e924e9ec878afe37cf00399cac722272f00": 6976709,
"fb140589eb036f21bdacde111d5299927b569194014891187a1d8011ad180613": 6975690, "fb140589eb036f21bdacde111d5299927b569194014891187a1d8011ad180613": 6975690,
"fb6a5a4e37d2e219b84deda184512c620edbcd2b5c4a2323a4558c27041d40e9": 6937932, "fb6a5a4e37d2e219b84deda184512c620edbcd2b5c4a2323a4558c27041d40e9": 6937932,
"fcd4b30f0646145c04ae8442b716c31a133fcd93a99c1e452affe8b07fb8d7dd": 6975826,
"ffb7c1a0a0e3644e904046023caa92e6ae16925e7fb2a424da7ff66d3c87b82a": 6900807 "ffb7c1a0a0e3644e904046023caa92e6ae16925e7fb2a424da7ff66d3c87b82a": 6900807
} }