diff --git a/README.md b/README.md index a8dc17c..fe73b05 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ From the emulator checkout `../CDJ900NXSVirtual` (`--repo` for another place): |---|---| | `extended_bpm` | arnoldasr: BPM with two decimals (tenths as a small digit above) | | `phasemeter` | arnoldasr: two-line phase meter, chosen in UTILITY > PHASE METER (was SLIP FLASHING) | -| `rgb_waveform` | arnoldasr: big waveform in RGB colours, overview as a red-to-white gradient | +| `advanced_waveforms` | arnoldasr: big waveform in RGB colours, overview as a red-to-white gradient | | `beatjump` | TRACK SEARCH jumps 1/2/4/8 beats, UTILITY > BEAT JUMP (needs `hotcuekeys`), see below | | `cuecolours` | memory cues in their rekordbox colours, hot cues shown | | `hotcuekeys` | hot cues A-C on the BEAT DIVIDE keys (needs `cuecolours`), see below | diff --git a/cdj900nxs_patcher.py b/cdj900nxs_patcher.py index 5d12fb3..fdb1e0f 100644 --- a/cdj900nxs_patcher.py +++ b/cdj900nxs_patcher.py @@ -26,7 +26,7 @@ choose, as a new C900NXS.UPD for the player's own USB update. The mods come from the CDJ900NXSVirtual checkout next to this folder (--repo): mods/patch_cdj900nxs.py, which also needs arnoldasr's checkout in -mods/cdj900nxs/upstream for his mods (extended_bpm, phasemeter, rgb_waveform). +mods/cdj900nxs/upstream for his mods (extended_bpm, phasemeter, advanced_waveforms). """ import argparse import os @@ -38,7 +38,7 @@ sys.path.insert(0, HERE) import upd # noqa: E402 DEFAULT_REPO = os.path.join(os.path.dirname(HERE), 'CDJ900NXSVirtual') -UPSTREAM_MODS = ('extended_bpm', 'phasemeter', 'rgb_waveform') +UPSTREAM_MODS = ('extended_bpm', 'phasemeter', 'advanced_waveforms') NEEDS = {'hotcuekeys': 'cuecolours', # the hot cues the keys play are read by cuecolours 'beatjump': 'hotcuekeys'} # hotcuekeys' engine makes the jumps LABEL = '1.32' diff --git a/test_patcher.py b/test_patcher.py index ed6ea44..6ac2ec1 100644 --- a/test_patcher.py +++ b/test_patcher.py @@ -95,7 +95,7 @@ def test_boot_area_tampering_caught(): upd.verify(bad, stock, stock.application) -MODS = [('extended_bpm', '', True, ''), ('phasemeter', '', True, ''), ('rgb_waveform', '', True, ''), +MODS = [('extended_bpm', '', True, ''), ('phasemeter', '', True, ''), ('advanced_waveforms', '', True, ''), ('beatjump', '', True, ''), ('cuecolours', '', True, ''), ('hotcuekeys', '', True, '')] @@ -107,8 +107,8 @@ def test_every_mod_can_be_unticked(): assert 'cuecolours' not in chosen and 'hotcuekeys' not in chosen cli._toggle(chosen, 'hotcuekeys', MODS) assert {'hotcuekeys', 'cuecolours'} <= chosen # and ticking brings what it needs - cli._toggle(chosen, 'rgb_waveform', MODS) - assert 'rgb_waveform' not in chosen + cli._toggle(chosen, 'advanced_waveforms', MODS) + assert 'advanced_waveforms' not in chosen cli._toggle(chosen, 'cuecolours', MODS) assert not {'cuecolours', 'hotcuekeys', 'beatjump'} & chosen # and what needs that cli._toggle(chosen, 'beatjump', MODS)