fix: remaining tbdsamples / dbup / data references missed in two prior path commits

After the user-asked thorough audit, six more user-visible stale refs:

User-facing docs:
- docs/get_started/20_storage.rst — substantial rewrite: the whole page
  was documenting the OLD pre-overlay SD card layout (/data/, /dbup/,
  /tbdsamples/). Rewritten to describe the current /factory/ + /user/ +
  /system/ overlay model, the /samples/factory/ + /samples/user/ split,
  and the recommended 'user-overlay-first' editing pattern.
- docs/plugins/step-by-step.rst:219 — '/sdcard/tbdsamples/' →
  '/sdcard/samples/' with note about factory/user overlay.

Active runtime code:
- components/drivers/fs.cpp — removed two ESP_LOGI lines that lied about
  a '/dbup' backup being part of the SD card content archive. The current
  zip-archive build pipeline doesn't create /dbup at all; the messages
  surfaced in firmware logs as misleading noise. (The 'delete_dir_recursive
  /data' line earlier in the function is kept — that's legitimate cleanup
  of cruft from pre-restructure SD cards.)
- sdcard_image/www/tools/dev-server.js:55 — SAMPLE_ROOT pointed at
  non-existent 'sample_rom/tbdsamples/'. Updated to the actual path
  'sdcard_image/samples/factory/'. Used at lines 610 and 1023 to serve
  WAV previews and log the directory location — so this was a real broken
  feature, not just a comment.

Developer tool labels:
- tools/sample-tools/sample_bank_manager.html — three button/error-message
  labels said 'tbdsamples folder'. Renamed to 'samples folder' for
  consistency. (The tool itself still has a broken dependency on
  wav_info_short.json which doesn't exist anywhere in the repo — separate
  follow-up.)

After this commit, 'git grep' for any of {sdcard_image/data, /data/sp/,
tbdsamples, /dbup, /data/synthdef, /data/macro} returns zero hits across
the whole tree.

Pushed as a forward commit — no force-push, no re-squash.

Author: Johannes Lohbihler

components/drivers/fs.cpp

@@ -523,9 +523,6 @@ static void check_and_update_sd_content(const std::string& base_path) {
 
     ESP_LOGI("FS", "Content updated successfully");
 
-    // Backup is pre-created in the zip archive at /dbup
-    ESP_LOGI("FS", "Note: Backup of /data is included in archive as /dbup");
-
     // Create .version file to mark successful extraction
     std::ofstream version_out(version_file);
     if (version_out) {

docs/get_started/20_storage.rst

@@ -21,8 +21,9 @@ The TBD-16 has two micro-SD card slots, one for each processor:
      - Contents
    * - Middle slot
      - ESP32-P4
-     - System config, web interface, audio samples (``/tbdsamples/``),
-       backup (``/dbup/``), version file
+     - Factory + user overlay (``/factory/``, ``/user/``), audio samples
+       (``/samples/``), runtime caches (``/system/``), web interface
+       (``/www/``)
    * - Edge slot
      - RP2350
      - Frontend firmware (``.uf2`` apps), RP2350 config
@@ -31,10 +32,11 @@ The TBD-16 has two micro-SD card slots, one for each processor:
 Factory Samples
 ===============
 
-The P4 SD card ships with a ``/tbdsamples/`` folder organized by category:
+The P4 SD card ships with a ``/samples/factory/`` folder organized by category:
 
-- **drums/** --- Kicks, snares, hi-hats, claps, percussion, loops
+- **drums/** --- Kicks, snares, hi-hats, claps, percussion
 - **wavetables/** --- Wavetable banks for the wavetable oscillator plugins
+- **loops/** --- Long sample loops and beat material
 - **other/** --- Miscellaneous samples and textures
 
 Samples are stored as **44.1 kHz, 16-bit mono WAV** files. At boot, the
@@ -49,7 +51,8 @@ Samples are organized into **banks** --- named collections of WAV files.
 The TBD-16 ships with a default sample bank (factory drums) and a default
 wavetable bank.
 
-Banks are defined by JSON files inside ``/tbdsamples/``:
+Banks are defined by JSON files inside ``/samples/`` (factory and user
+overlays):
 
 - ``sample_rom.json`` --- Master index listing all available banks and the
   currently active bank
@@ -72,18 +75,22 @@ Here's how to get your own samples onto the TBD-16:
 2. **Access the SD card** --- Either remove the P4 SD card and insert it in your
    computer, or boot into USB-MSC mode to access it over USB.
 
-3. **Copy files** --- Place your ``.wav`` files into a subfolder of ``/tbdsamples/``
-   (e.g. ``/tbdsamples/my_samples/``).
+3. **Copy files** --- Place your ``.wav`` files into a subfolder of
+   ``/samples/user/`` (e.g. ``/samples/user/my_samples/``). User-side
+   files override the factory defaults of the same name; factory files
+   stay read-only.
 
-4. **Create a bank file** --- Create a ``.json`` file in ``/tbdsamples/`` listing
-   your samples (see the existing ``def_smp.json`` as a template). Each entry needs:
+4. **Create a bank file** --- Create a ``.json`` file in ``/samples/user/``
+   listing your samples (see the existing ``def_smp.json`` in
+   ``/samples/factory/`` as a template). Each entry needs:
 
    - ``filename`` --- Stem name without extension (max 32 chars)
-   - ``path`` --- Subfolder path relative to ``/tbdsamples/``
+   - ``path`` --- Subfolder path relative to ``/samples/``
    - ``nsamples`` --- Number of sample frames in the file
 
 5. **Register the bank** --- Add your bank file to the ``smp_banks`` array in
-   ``sample_rom.json``.
+   ``sample_rom.json`` (the user copy under ``/samples/user/sample_rom.json``
+   if you want it overlayed on top of the factory list).
 
 6. **Reboot** --- The TBD-16 will load the new bank data on the next start.
 
@@ -92,20 +99,27 @@ data is loaded into PSRAM at boot, so total bank size is limited by available
 memory.
 
 
-System Configuration
-====================
+System Configuration & Overlay
+==============================
 
-The P4 SD card also contains a ``/data/`` folder with system configuration
-files. These are managed automatically by the firmware:
+The P4 SD card uses an **overlay model** that separates immutable factory
+defaults from user-side overrides:
 
-- ``spm-config.json`` --- Sound Processor Manager state (loaded plugins, patches)
-- ``/data/sp/`` --- Plugin parameter presets and UI definitions
+- ``/factory/`` --- read-only factory defaults written from the SD card
+  image: ``synthdefinitions.json``, ``plugins/`` (the ``mui-*.json`` /
+  ``mp-*.json`` parameter and preset files for every sound processor),
+  ``presets/``, ``macros/``, ``kits/``, ``trackdefaults/``, ``config/``.
+- ``/user/`` --- user-side overrides created at runtime. Same subdirectory
+  layout as ``/factory/``; the firmware reads ``/user/<path>`` first and
+  falls back to ``/factory/<path>``. Writes always go to ``/user/``, so the
+  factory tree stays clean and is the recovery baseline.
+- ``/system/`` --- runtime caches (firmware version, WebUI version, cached
+  state). Rebuilt at boot when missing.
 
-A backup of the ``/data/`` folder is stored in ``/dbup/`` and can be used
-for recovery.
-
-Editing configuration files manually is not recommended unless you know what
-you're doing --- for normal use, the system manages these automatically.
+Editing configuration files manually is not recommended unless you know
+what you're doing --- for normal use the WebUI and the hardware UI manage
+these automatically. If you do hand-edit, prefer the ``/user/`` overlay so
+that wiping ``/user/`` always restores you to a known-good factory state.
 
 
 Recovery

docs/plugins/step-by-step.rst

@@ -216,7 +216,9 @@ real-world usage examples.
 SD Card Sample Layout
 ~~~~~~~~~~~~~~~~~~~~~
 
-Samples live in ``/sdcard/tbdsamples/`` on the P4 SD card. The structure is
+Samples live in ``/sdcard/samples/`` on the P4 SD card --- ``factory/``
+for the read-only factory content and ``user/`` for user-added banks
+(overlay model: ``user/`` overrides ``factory/``). The structure is
 defined by JSON descriptor files:
 
 - ``sample_rom.json`` --- Master index with bank lists and active bank indices

sdcard_image/www/tools/dev-server.js

@@ -52,7 +52,7 @@ const PORT = parseInt(process.argv[2], 10) || 3001;
 const REPO_ROOT = path.resolve(__dirname, '..', '..', '..');
 const WEBROOT = path.resolve(__dirname, '..');
 const FACTORY_DIR = path.resolve(REPO_ROOT, 'sdcard_image', 'factory');
-const SAMPLE_ROOT = path.resolve(REPO_ROOT, 'sample_rom', 'tbdsamples');
+const SAMPLE_ROOT = path.resolve(REPO_ROOT, 'sdcard_image', 'samples', 'factory');
 const SDCARD_ROOT = path.resolve(REPO_ROOT, 'sdcard_image');
 const DATA_DIR = SDCARD_ROOT; // Resolves to the sdcard_image/ root (factory/ + user/ overlays)
 

tools/sample-tools/sample_bank_manager.html

@@ -49,7 +49,7 @@
     <h1>Sample Bank Builder (128)</h1>
     <div class="row">
       <input id="dirInput" type="file" webkitdirectory multiple hidden />
-      <button id="pickBtn">Pick tbdsamples folder…</button>
+      <button id="pickBtn">Pick samples folder…</button>
       <span id="summary" class="muted">No folder loaded</span>
       <span id="counter" class="pill">0/128 selected</span>
       <button id="enableAudioBtn" title="Click once if your browser blocks autoplay">Enable audio</button>
@@ -198,7 +198,7 @@ <h1>Sample Bank Builder (128)</h1>
       }
       if (!shortJsonFile) {
         summary.textContent = 'Could not find wav_info_short.json';
-        showWarning('Select the tbdsamples folder that contains wav_info_short.json.');
+        showWarning('Select the samples folder that contains wav_info_short.json.');
         return;
       }
       try {
@@ -588,7 +588,7 @@ <h1>Sample Bank Builder (128)</h1>
 
     async function loadBankFromJson(arr) {
       if (!Array.isArray(arr)) throw new Error('Bank JSON must be an array');
-      if (!entries.length) throw new Error('Load a tbdsamples folder first');
+      if (!entries.length) throw new Error('Load a samples folder first');
       // Replace current bank
       selection = [];
       const usedIdx = new Set();