From 704951074ba91c4d9c2fef4be582506b5cfe4206 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Sun, 21 Dec 2025 17:31:03 +0100
Subject: [PATCH 01/20] feat: Long press VOL_DOWN button to shutdown/reset
 device

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/utils/__init__.py |  2 +-
 software/src/utils/buttons.py  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/software/src/utils/__init__.py b/software/src/utils/__init__.py
index cdb1ec8..2649cfe 100644
--- a/software/src/utils/__init__.py
+++ b/software/src/utils/__init__.py
@@ -2,6 +2,7 @@
 # Copyright (c) 2025 Matthias Blankertz <matthias@blankertz.org>
 
 from utils.helpers import safe_callback
+from utils.timer import TimerManager
 from utils.buttons import Buttons
 from utils.config import Configuration
 from utils.leds import LedManager
@@ -9,7 +10,6 @@ from utils.mbrpartition import MBRPartition
 from utils.pinindex import get_pin_index
 from utils.playlistdb import BTreeDB, BTreeFileManager
 from utils.sdcontext import SDContext
-from utils.timer import TimerManager
 
 __all__ = ["BTreeDB", "BTreeFileManager", "Buttons", "Configuration", "get_pin_index", "LedManager", "MBRPartition",
            "safe_callback", "SDContext", "TimerManager"]
diff --git a/software/src/utils/buttons.py b/software/src/utils/buttons.py
index b6b5a24..aa6c669 100644
--- a/software/src/utils/buttons.py
+++ b/software/src/utils/buttons.py
@@ -5,7 +5,7 @@ import asyncio
 import machine
 import micropython
 import time
-from utils import safe_callback
+from utils import safe_callback, TimerManager
 try:
     from typing import TYPE_CHECKING  # type: ignore
 except ImportError:
@@ -32,6 +32,7 @@ class Buttons:
     def __init__(self, cb: "ButtonCallback", config, hwconfig):
         self.button_map = config.get_button_map()
         self.hw_buttons = hwconfig.BUTTONS
+        self.hwconfig = hwconfig
         self.cb = cb
         self.buttons = dict()
         for key_id, key_name in self.KEYMAP.items():
@@ -42,6 +43,7 @@ class Buttons:
         self.int_flag = asyncio.ThreadSafeFlag()
         self.pressed: list[int] = []
         self.last: dict[int, int] = {}
+        self.timer_manager = TimerManager()
         for button in self.buttons.keys():
             button.irq(handler=self._interrupt, trigger=machine.Pin.IRQ_FALLING | machine.Pin.IRQ_RISING)
         asyncio.create_task(self.task())
@@ -69,6 +71,10 @@ class Buttons:
             # print(f'B{keycode} {now}')
             self.pressed.append(keycode)
             self.int_flag.set()
+            if keycode == self.VOLDOWN:
+                self.timer_manager.schedule(time.ticks_ms() + 5000, self.long_press_shutdown)
+        if button.value() == 1 and keycode == self.VOLDOWN:
+            self.timer_manager.cancel(self.long_press_shutdown)
 
     async def task(self):
         while True:
@@ -76,3 +82,9 @@ class Buttons:
             while len(self.pressed) > 0:
                 what = self.pressed.pop()
                 safe_callback(lambda: self.cb.onButtonPressed(what), "button callback")
+
+    def long_press_shutdown(self):
+        if self.hwconfig.get_on_battery():
+            self.hwconfig.power_off()
+        else:
+            machine.reset()

From 43fd68779c6f6b6d6ee3945cafef4952bffb57a2 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Sun, 21 Dec 2025 20:59:16 +0100
Subject: [PATCH 02/20] feat: store git version in fw and show in web ui

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/boards/RPI_PICO_W/board.c            | 29 +++++++++++++++++++
 .../boards/RPI_PICO_W/mpconfigboard.cmake     | 19 ++++++++++++
 software/frontend/index.html                  | 25 +++++++++++++++-
 software/src/webserver.py                     | 10 +++++++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 software/boards/RPI_PICO_W/board.c

diff --git a/software/boards/RPI_PICO_W/board.c b/software/boards/RPI_PICO_W/board.c
new file mode 100644
index 0000000..bc4ec6a
--- /dev/null
+++ b/software/boards/RPI_PICO_W/board.c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2025 Matthias Blankertz <matthias@blankertz.org>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/objstr.h"
+
+#ifndef TONBERRY_GIT_REVISION
+#define TONBERRY_GIT_REVISION "unknown"
+#endif
+#ifndef TONBERRY_VERSION
+#define TONBERRY_VERSION "unknown"
+#endif
+
+static const MP_DEFINE_STR_OBJ(tonberry_git_revision_obj, TONBERRY_GIT_REVISION);
+static const MP_DEFINE_STR_OBJ(tonberry_version_obj, TONBERRY_VERSION);
+
+static const mp_rom_map_elem_t board_module_globals_table[] = {
+    {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_board)},
+    {MP_ROM_QSTR(MP_QSTR_revision), MP_ROM_PTR(&tonberry_git_revision_obj)},
+    {MP_ROM_QSTR(MP_QSTR_version), MP_ROM_PTR(&tonberry_version_obj)},
+};
+static MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
+
+const mp_obj_module_t board_cmodule = {
+    .base = {&mp_type_module},
+    .globals = (mp_obj_dict_t *)&board_module_globals,
+};
+MP_REGISTER_MODULE(MP_QSTR_board, board_cmodule);
diff --git a/software/boards/RPI_PICO_W/mpconfigboard.cmake b/software/boards/RPI_PICO_W/mpconfigboard.cmake
index 937e648..875f951 100644
--- a/software/boards/RPI_PICO_W/mpconfigboard.cmake
+++ b/software/boards/RPI_PICO_W/mpconfigboard.cmake
@@ -20,3 +20,22 @@ set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
 
 add_link_options("-Wl,--print-memory-usage")
 set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)
+
+find_program(GIT git)
+
+execute_process(COMMAND ${GIT} rev-parse HEAD
+    WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+    OUTPUT_VARIABLE TONBERRY_GIT_REVISION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+execute_process(COMMAND ${GIT} describe --match 'v*' --always --dirty
+    WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+    OUTPUT_VARIABLE TONBERRY_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+set(MICROPY_SOURCE_BOARD "${CMAKE_CURRENT_LIST_DIR}/board.c")
+set(MICROPY_DEF_BOARD
+    TONBERRY_GIT_REVISION="${TONBERRY_GIT_REVISION}"
+    TONBERRY_VERSION="${TONBERRY_VERSION}")
diff --git a/software/frontend/index.html b/software/frontend/index.html
index 0184d89..20f2a22 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -131,6 +131,12 @@
         list-style: none;
     }
 
+    .footer {
+        font-size: x-small;
+        color: gray;
+        margin-top: 20px;
+    }
+
 </style>
 </head>
 <body>
@@ -257,7 +263,17 @@
         </div>
     </div>
 </div>
-    
+<div class="footer">
+    <hr>
+    <div class="flex-horizontal">
+        <div>
+            <a href="https://git.ka.blankertz.org/TonBERRY/tonberry-pico">TonBERRY pico</a>
+        </div>
+        <div>
+            Version: <span id="footer-version">unknown</span>
+        </div>
+    </div>
+</div>
 <script>
     const Screens = {};
     let activeScreen = null;
@@ -981,6 +997,13 @@
     });
 
     showScreen("menu");
+
+    fetch('/api/v1/info')
+        .then((resp) => resp.json())
+        .then((info) => {
+            const version = document.getElementById('footer-version');
+            version.innerText = info.version;
+        });
 </script>
 
 </body>
diff --git a/software/src/webserver.py b/software/src/webserver.py
index ea7f3cb..78803f3 100644
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -4,11 +4,14 @@ Copyright (c) 2024-2025 Stefan Kratochwil <Kratochwil-LA@gmx.de>
 '''
 
 import asyncio
+import board
 import hwconfig
 import json
 import machine
+import network
 import os
 import time
+import ubinascii
 
 from array import array
 from microdot import Microdot, redirect, send_file, Request
@@ -270,3 +273,10 @@ async def reboot(request, method):
     else:
         return 'method not supported', 400
     return '', 204
+
+
+@webapp.route('/api/v1/info', methods=['GET'])
+async def get_info(request):
+    mac = ubinascii.hexlify(network.WLAN().config('mac'), ':').decode()
+    return {'version': board.version,
+            'mac': mac}

From 67d7650923c0c71ef848d4db42116a6187fbabd6 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Mon, 22 Dec 2025 12:24:07 +0100
Subject: [PATCH 03/20] fix: webserver: Catch and report IO errors on upload

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/webserver.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/software/src/webserver.py b/software/src/webserver.py
index 78803f3..474ef18 100644
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -219,11 +219,17 @@ async def audiofile_upload(request):
         data = array('b', range(4096))
         bytes_copied = 0
         while True:
-            bytes_read = await request.stream.readinto(data)
+            try:
+                bytes_read = await request.stream.readinto(data)
+            except OSError as ex:
+                return f'read error: {ex}', 500
             if bytes_read == 0:
                 # End of body
                 break
-            bytes_written = newfile.write(data[:bytes_read])
+            try:
+                bytes_written = newfile.write(data[:bytes_read])
+            except OSError as ex:
+                return f'write error: {ex}', 500
             if bytes_written != bytes_read:
                 # short writes shouldn't happen
                 return 'write failure', 500

From b9baa1c7d5e2d547f75623ae2e8d38e74e9a4ee7 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Mon, 22 Dec 2025 12:24:16 +0100
Subject: [PATCH 04/20] microdot: Update to v2.5.1

The important fix is an urldecode bug causing umlauts to be decoded
incorrectly from url arguments. This was fixed in v2.2.0, but let's just
update to the latest version.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/lib/microdot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/lib/microdot b/software/lib/microdot
index d864b81..10e740d 160000
--- a/software/lib/microdot
+++ b/software/lib/microdot
@@ -1 +1 @@
-Subproject commit d864b81b651a1b80b277ec46817dd5b709bcb72b
+Subproject commit 10e740da2b4adb2a19c2cf251dae2e2d7de447ba

From d3aef1be329dbbc6d49fca4dd288170ad2b589d4 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 11:44:31 +0100
Subject: [PATCH 05/20] fix: frontend: don't convert text that looks like an
 integer to integers

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 20f2a22..cd70a29 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -360,6 +360,21 @@
                     'tagstartstop': 'Present tag once to start, present again to stop playback'
                 }
             },
+            'root.BUTTON_MAP.NEXT':  {
+                'input-type': 'number'
+            },
+            'root.BUTTON_MAP.PREV':  {
+                'input-type': 'number'
+            },
+            'root.BUTTON_MAP.VOLUP':  {
+                'input-type': 'number'
+            },
+            'root.BUTTON_MAP.VOLDOWN':  {
+                'input-type': 'number'
+            },
+            'root.BUTTON_MAP.PLAY_PAUSE':  {
+                'input-type': 'number'
+            },
             'root.IDLE_TIMEOUT_SECS': {
                 'input-type': 'number'
             },
@@ -439,7 +454,7 @@
         
                 let val = input.value.trim();
                 if (val === "") val = null;
-                else if (!isNaN(val)) val = Number(val);
+                else if (!isNaN(val) && input.type != 'text') val = Number(val);
         
                 current[path[path.length - 1]] = val;
             });

From 58f8526d7eb79bc9a3437fce85388eaae8a39b5b Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 11:46:32 +0100
Subject: [PATCH 06/20] feat: Join an existing WiFi network

Add ssid and passphrase to config to configure the network to join. If
empty SSID is configured, it will create the "TonberryPicoAP..." network
in AP mode as before.

Holding the button 1 during startup will revert to AP mode regardless of
the current configuration.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html |  6 ++++++
 software/src/main.py         | 27 +++++++++++++++++++--------
 software/src/utils/config.py | 12 +++++++++++-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index cd70a29..7cce847 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -384,6 +384,12 @@
             'root.LED_COUNT': {
                 'input-type': 'number'
             },
+            'root.WLAN.SSID': {
+                'input-type': 'text'
+            },
+            'root.WLAN.PASSPHRASE': {
+                'input-type': 'text'
+            }
         };
     
         function renderObject(obj, path) {
diff --git a/software/src/main.py b/software/src/main.py
index e1e7b15..d3a0ca3 100644
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -37,14 +37,22 @@ hwconfig.board_init()
 machine.mem32[0x40030000 + 0x00] = 0x10
 
 
-def setup_wifi():
+def setup_wifi(ssid='', passphrase='', sec=network.WLAN.SEC_WPA2_WPA3):
     network.hostname("TonberryPico")
-    wlan = network.WLAN(network.WLAN.IF_AP)
-    wlan.config(ssid=f"TonberryPicoAP_{machine.unique_id().hex()}", security=wlan.SEC_OPEN)
-    wlan.active(True)
+    if ssid is None or ssid == '':
+        apname = f"TonberryPicoAP_{machine.unique_id().hex()}"
+        print(f"Create AP {apname}")
+        wlan = network.WLAN(network.WLAN.IF_AP)
+        wlan.config(ssid=apname, security=wlan.SEC_OPEN)
+        wlan.active(True)
+    else:
+        print(f"Connect to SSID {ssid} with passphrase {passphrase}...")
+        wlan = network.WLAN()
+        wlan.active(True)
+        wlan.connect(ssid, passphrase if passphrase is not None else '', security=sec)
 
-    # disable power management
-    wlan.config(pm=network.WLAN.PM_NONE)
+    # configure power management
+    wlan.config(pm=network.WLAN.PM_PERFORMANCE)
 
     mac = ubinascii.hexlify(network.WLAN().config('mac'), ':').decode()
     print(f"     mac: {mac}")
@@ -71,8 +79,11 @@ def run():
     # Setup LEDs
     np = NeoPixel(hwconfig.LED_DIN, config.get_led_count(), sm=1)
 
-    # Wifi with default config
-    setup_wifi()
+    if machine.Pin(hwconfig.BUTTONS[1], machine.Pin.IN, machine.Pin.PULL_UP).value() == 0:
+        # Force default access point
+        setup_wifi('', '')
+    else:
+        setup_wifi(config.get_wifi_ssid(), config.get_wifi_passphrase())
 
     # Setup MP3 player
     with SDContext(mosi=hwconfig.SD_DI, miso=hwconfig.SD_DO, sck=hwconfig.SD_SCK, ss=hwconfig.SD_CS,
diff --git a/software/src/utils/config.py b/software/src/utils/config.py
index 0ab4ad2..f5891b6 100644
--- a/software/src/utils/config.py
+++ b/software/src/utils/config.py
@@ -22,7 +22,11 @@ class Configuration:
             'PREV': None,
             'NEXT': 1,
         },
-        'TAGMODE': 'tagremains'
+        'TAGMODE': 'tagremains',
+        'WIFI': {
+            'SSID': '',
+            'PASSPHRASE': '',
+        }
     }
 
     def __init__(self, config_path='/config.json'):
@@ -87,6 +91,12 @@ class Configuration:
     def get_tagmode(self) -> str:
         return self._get('TAGMODE')
 
+    def get_wifi_ssid(self) -> str:
+        return self._get('WIFI')['SSID']
+
+    def get_wifi_passphrase(self) -> str:
+        return self._get('WIFI')['PASSPHRASE']
+
     # For the web API
     def get_config(self) -> Mapping[str, Any]:
         return self.config

From 02954cd87c1689f0789e03d25c91d112d9d5e670 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 11:49:28 +0100
Subject: [PATCH 07/20] feat: Visual feedback on LEDs during startup

Set the LEDs to a fixed color during bootup to show the different modes:
- Orange when the device is booting
- Red when button 0 is held and the device goes to a shell
- Blue when button 1 is held and the device goes to AP mode instead of
  joining the configured WiFi network
- Red blinking when the run() method throws an exception for any reason

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/main.py | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/software/src/main.py b/software/src/main.py
index d3a0ca3..cf1deea 100644
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -10,6 +10,7 @@ import network
 import os
 import time
 import ubinascii
+import sys
 
 # Own modules
 import app
@@ -73,13 +74,18 @@ DB_PATH = '/sd/tonberry.db'
 
 config = Configuration()
 
+# Setup LEDs
+np = NeoPixel(hwconfig.LED_DIN, config.get_led_count(), sm=1)
+np.fill((32, 32, 0))
+np.write()
+
 
 def run():
     asyncio.new_event_loop()
-    # Setup LEDs
-    np = NeoPixel(hwconfig.LED_DIN, config.get_led_count(), sm=1)
 
     if machine.Pin(hwconfig.BUTTONS[1], machine.Pin.IN, machine.Pin.PULL_UP).value() == 0:
+        np.fill((0, 0, 32))
+        np.write()
         # Force default access point
         setup_wifi('', '')
     else:
@@ -141,7 +147,24 @@ def builddb():
     os.sync()
 
 
+def error_blink():
+    while True:
+        np.fill((32, 0, 0))
+        np.write()
+        time.sleep_ms(500)
+        np.fill((0, 0, 0))
+        np.write()
+        time.sleep_ms(500)
+
+
 if __name__ == '__main__':
     time.sleep(1)
     if machine.Pin(hwconfig.BUTTONS[0], machine.Pin.IN, machine.Pin.PULL_UP).value() != 0:
-        run()
+        try:
+            run()
+        except Exception as ex:
+            sys.print_exception(ex)
+            error_blink()
+    else:
+        np.fill((32, 0, 0))
+        np.write()

From cd5939f4eeb7334888caddd612766129dd35ebca Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 11:59:55 +0100
Subject: [PATCH 08/20] feat: Enable dualstack IPv4/IPv6 for microdot

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/webserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/src/webserver.py b/software/src/webserver.py
index 474ef18..8808dde 100644
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -31,7 +31,7 @@ Request.max_content_length = 128 * 1024 * 1024  # 128MB requests allowed
 
 def start_webserver(config_, app_):
     global server, config, app, nfc, playlist_db, leds, timer_manager
-    server = asyncio.create_task(webapp.start_server(port=80))
+    server = asyncio.create_task(webapp.start_server(host='::0', port=80))
     config = config_
     app = app_
     nfc = app.get_nfc()

From 743188e1a436c7a6777916a91afc957604fc25e0 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 12:08:36 +0100
Subject: [PATCH 09/20] fix: frontend: Replace generic 'Device admin' title

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 7cce847..01867da 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <meta charset="UTF-8">
-<title>Device Admin</title>
+<title>TonBERRY pico</title>
 <style>
     body {
         font-family: Arial, sans-serif;
@@ -141,7 +141,7 @@
 </head>
 <body>
 
-<h1>Device Admin</h1>
+<h1>TonBERRY pico</h1>
 
 <nav>
     <button onclick="showScreen('menu')">🏠 Main Menu</button>

From fe1c1eadf79cd80f18d23eae6ca7a83e79d217b9 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 13:25:39 +0100
Subject: [PATCH 10/20] feat: Add names to playlists

Fixes #63.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html     | 17 ++++++++++----
 software/src/utils/playlistdb.py | 38 +++++++++++++++++++++++---------
 software/src/webserver.py        | 10 +++++----
 3 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 01867da..2f87fb7 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -213,6 +213,10 @@
                     <option value="audioplay">Audioplay (no shuffle, start at previous track)</option>
                 </select>
             </div>
+            <div>
+                <label>Playlist name</label>
+                <input type="text" placeholder="Playlist name" id="playlist-edit-name" />
+            </div>
             <div class="flex-horizontal">
                 <div style="flex-grow: 1">
                     <label>Tracks</label>
@@ -493,7 +497,7 @@
             document.getElementById('playlist-exist-button-delete')
                 .addEventListener('click', (e) => {
                     if (lastSelected === null) return;
-                    const tagid = lastSelected.innerText;
+                    const tagid = lastSelected.getAttribute('data-tag');
                     if(confirm(`Really delete playlist ${tagid}?`)) {
                         fetch(`/api/v1/playlist/${tagid}`, {
                             method: 'DELETE'})
@@ -504,7 +508,7 @@
                 .addEventListener('click', selectLastTag);
             document.getElementById('playlist-exist-button-edit').addEventListener("click", (e) => {
                 if (lastSelected !== null)
-                    showScreen("playlist_edit", {load: lastSelected.innerText});
+                    showScreen("playlist_edit", {load: lastSelected.getAttribute('data-tag')});
             });
             document.getElementById('playlist-exist-list').addEventListener("click", (e) => {
                 const node = e.target.closest("li");
@@ -559,8 +563,9 @@
             container.innerHTML = "";
             for (const playlist of playlists) {
                 const li = document.createElement("li");
-                li.innerHTML = playlist;
+                li.innerHTML = `${playlist.name} (${playlist.tag})`;
                 li.className = "node"
+                li.setAttribute('data-tag', playlist.tag);
                 container.appendChild(li)
             }
         }
@@ -585,7 +590,7 @@
             document.getElementById('playlist-exist-list')
                     .querySelectorAll("li")
                     .forEach(n => {
-                        if (n.innerText == tagtext) {
+                        if (n.getAttribute('data-tag') == tagtext) {
                             n.classList.add("selected");
                             lastSelected = n;
                         } else {
@@ -687,6 +692,8 @@
             } else if (playlist.persist === "track" && playlist.shuffle === "no") {
                 playlisttype.value = "audioplay";
             }
+            const playlistname = document.getElementById('playlist-edit-name');
+            playlistname.value = playlist.name;
         }
 
         async function save() {
@@ -709,6 +716,8 @@
                     playlistData.shuffle = "no";
                     break;
             }
+            const playlistname = document.getElementById('playlist-edit-name');
+            playlistData.name = playlistname.value;
             const container = document.getElementById('playlist-edit-list');
             playlistData.paths = [...container.querySelectorAll("li")].map((node) => node.innerText);
             const saveRes = await fetch(`/api/v1/playlist/${playlistId}`,
diff --git a/software/src/utils/playlistdb.py b/software/src/utils/playlistdb.py
index 546311b..770010e 100644
--- a/software/src/utils/playlistdb.py
+++ b/software/src/utils/playlistdb.py
@@ -33,12 +33,13 @@ class BTreeDB(IPlaylistDB):
     PERSIST_OFFSET = b'offset'
 
     class Playlist(IPlaylist):
-        def __init__(self, parent: "BTreeDB", tag: bytes, pos: int, persist, shuffle):
+        def __init__(self, parent: "BTreeDB", tag: bytes, pos: int, persist, shuffle, name):
             self.parent = parent
             self.tag = tag
             self.pos = pos
             self.persist = persist
             self.shuffle = shuffle
+            self.name = name
             self.length = self.parent._getPlaylistLength(self.tag)
             self._shuffle()
 
@@ -168,6 +169,10 @@ class BTreeDB(IPlaylistDB):
         return (b''.join([tag, b'/playlist/']),
                 b''.join([tag, b'/playlist0']))
 
+    @staticmethod
+    def _keyPlaylistName(tag):
+        return b''.join([tag, b'/playlistname'])
+
     def _flush(self):
         """
         Flush the database and call the flush_func if it was provided.
@@ -222,12 +227,13 @@ class BTreeDB(IPlaylistDB):
             raise RuntimeError("Malformed playlist key")
         return int(elements[2])+1
 
-    def _savePlaylist(self, tag, entries, persist, shuffle, flush=True):
+    def _savePlaylist(self, tag, entries, persist, shuffle, name, flush=True):
         self._deletePlaylist(tag, False)
         for idx, entry in enumerate(entries):
             self.db[self._keyPlaylistEntry(tag, idx)] = entry
         self.db[self._keyPlaylistPersist(tag)] = persist
         self.db[self._keyPlaylistShuffle(tag)] = shuffle
+        self.db[self._keyPlaylistName(tag)] = name.encode()
         if flush:
             self._flush()
 
@@ -240,7 +246,7 @@ class BTreeDB(IPlaylistDB):
                 pass
         for k in (self._keyPlaylistPos(tag), self._keyPlaylistPosOffset(tag),
                   self._keyPlaylistPersist(tag), self._keyPlaylistShuffle(tag),
-                  self._keyPlaylistShuffleSeed(tag)):
+                  self._keyPlaylistShuffleSeed(tag), self._keyPlaylistName(tag)):
             try:
                 del self.db[k]
             except KeyError:
@@ -248,15 +254,18 @@ class BTreeDB(IPlaylistDB):
         if flush:
             self._flush()
 
-    def getPlaylistTags(self):
+    def getPlaylists(self):
         """
-        Get a keys-only dict of all defined playlists. Playlists currently do not have names, but are identified by
-        their tag.
+        Get a list of all defined playlists with their tag and names.
         """
         playlist_tags = set()
         for item in self.db:
             playlist_tags.add(item.split(b'/')[0])
-        return playlist_tags
+        playlists = []
+        for tag in playlist_tags:
+            name = self.db.get(self._keyPlaylistName(tag), b'').decode()
+            playlists.append({'tag': tag, 'name': name})
+        return playlists
 
     def getPlaylistForTag(self, tag: bytes):
         """
@@ -275,18 +284,19 @@ class BTreeDB(IPlaylistDB):
             return None
         if self._keyPlaylistEntry(tag, pos) not in self.db:
             pos = 0
+        name = self.db.get(self._keyPlaylistName(tag), b'').decode()
         shuffle = self.db.get(self._keyPlaylistShuffle(tag), self.SHUFFLE_NO)
-        return self.Playlist(self, tag, pos, persist, shuffle)
+        return self.Playlist(self, tag, pos, persist, shuffle, name)
 
     def createPlaylistForTag(self, tag: bytes, entries: typing.Iterable[bytes], persist=PERSIST_TRACK,
-                             shuffle=SHUFFLE_NO):
+                             shuffle=SHUFFLE_NO, name: str = ''):
         """
         Create and save a playlist for 'tag' and return the Playlist object. If a playlist already existed for 'tag' it
         is overwritten.
         """
         assert persist in (self.PERSIST_NO, self.PERSIST_TRACK, self.PERSIST_OFFSET)
         assert shuffle in (self.SHUFFLE_NO, self.SHUFFLE_YES)
-        self._savePlaylist(tag, entries, persist, shuffle)
+        self._savePlaylist(tag, entries, persist, shuffle, name)
         return self.getPlaylistForTag(tag)
 
     def deletePlaylistForTag(self, tag: bytes):
@@ -370,6 +380,14 @@ class BTreeDB(IPlaylistDB):
                     _ = int(val)
                 except ValueError:
                     fail(f' Bad playlistposoffset value for {last_tag}: {val!r}')
+            elif fields[1] == b'playlistname':
+                val = self.db[k]
+                try:
+                    name = val.decode()
+                    if dump:
+                        print(f'\tName: {name}')
+                except UnicodeError:
+                    fail(f' Bad playlistname for {last_tag}: Not valid unicode')
             else:
                 fail(f'Unknown key {k!r}')
         return result
diff --git a/software/src/webserver.py b/software/src/webserver.py
index 8808dde..f87f467 100644
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -112,7 +112,7 @@ async def static(request, path):
 
 @webapp.route('/api/v1/playlists', methods=['GET'])
 async def playlists_get(request):
-    return sorted(playlist_db.getPlaylistTags())
+    return playlist_db.getPlaylists()
 
 
 def is_hex(s):
@@ -133,10 +133,11 @@ async def playlist_get(request, tag):
         return None, 404
 
     return {
-            'shuffle': playlist.__dict__.get('shuffle'),
-            'persist': playlist.__dict__.get('persist'),
+            'shuffle': playlist.shuffle,
+            'persist': playlist.persist,
             'paths': [(p[len(fsroot):] if p.startswith(fsroot) else p).decode()
                       for p in playlist.getPaths()],
+            'name': playlist.name
     }
 
 
@@ -156,7 +157,8 @@ async def playlist_put(request, tag):
     playlist_db.createPlaylistForTag(tag.encode(),
                                      (fsroot + path.encode() for path in playlist.get('paths', [])),
                                      playlist.get('persist', 'track').encode(),
-                                     playlist.get('shuffle', 'no').encode())
+                                     playlist.get('shuffle', 'no').encode(),
+                                     playlist.get('name', ''))
     return '', 204
 
 

From f46c045589c305996c2c04a89c2df69988de71a6 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 13:56:07 +0100
Subject: [PATCH 11/20] feat: Allow limiting max. volume

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html     |  6 +++++-
 software/src/app.py              | 11 +++++++----
 software/src/utils/config.py     |  6 +++++-
 software/tests/test_playerapp.py |  3 +++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 2f87fb7..859c932 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -354,7 +354,8 @@
             'root.BUTTON_MAP.PLAY_PAUSE': 'Play/Pause',
             'root.TAG_TIMEOUT_SECS': 'Tag removal timeout (seconds)',
             'root.TAGMODE': 'Tag mode',
-            'root.LED_COUNT': 'Length of WS2182 (Neopixel) LED chain'
+            'root.LED_COUNT': 'Length of WS2182 (Neopixel) LED chain',
+            'root.VOLUME_MAX': 'Maximum volume (0-255)'
         };
         const config_input_override = {
             'root.TAGMODE': {
@@ -393,6 +394,9 @@
             },
             'root.WLAN.PASSPHRASE': {
                 'input-type': 'text'
+            },
+            'root.VOLUME_MAX': {
+                'input-type': 'number'
             }
         };
     
diff --git a/software/src/app.py b/software/src/app.py
index 71bb1d4..386c18e 100644
--- a/software/src/app.py
+++ b/software/src/app.py
@@ -9,8 +9,8 @@ from utils import TimerManager
 Dependencies = namedtuple('Dependencies', ('mp3player', 'nfcreader', 'buttons', 'playlistdb', 'hwconfig', 'leds',
                                            'config'))
 
-# Should be ~ 6dB steps
-VOLUME_CURVE = [1, 2, 4, 8, 16, 32, 63, 126, 251]
+# Should be ~ 3dB steps
+VOLUME_CURVE = [1, 2, 3, 4, 6, 8, 11, 16, 23, 32, 45, 64, 91, 128, 181, 255]
 
 
 class PlayerApp:
@@ -52,6 +52,7 @@ class PlayerApp:
         self.hwconfig = deps.hwconfig(self)
         self.leds = deps.leds(self)
         self.tag_mode = self.config.get_tagmode()
+        self.volume_max = self.config.get_volume_max()
         self.playing_tag = None
         self.playlist = None
         self.buttons = deps.buttons(self) if deps.buttons is not None else None
@@ -91,8 +92,10 @@ class PlayerApp:
     def onButtonPressed(self, what):
         assert self.buttons is not None
         if what == self.buttons.VOLUP:
-            self.volume_pos = min(self.volume_pos + 1, len(VOLUME_CURVE) - 1)
-            self.player.set_volume(VOLUME_CURVE[self.volume_pos])
+            new_volume = min(self.volume_pos + 1, len(VOLUME_CURVE) - 1)
+            if VOLUME_CURVE[new_volume] <= self.volume_max:
+                self.volume_pos = new_volume
+                self.player.set_volume(VOLUME_CURVE[self.volume_pos])
         elif what == self.buttons.VOLDOWN:
             self.volume_pos = max(self.volume_pos - 1, 0)
             self.player.set_volume(VOLUME_CURVE[self.volume_pos])
diff --git a/software/src/utils/config.py b/software/src/utils/config.py
index f5891b6..bb83398 100644
--- a/software/src/utils/config.py
+++ b/software/src/utils/config.py
@@ -26,7 +26,8 @@ class Configuration:
         'WIFI': {
             'SSID': '',
             'PASSPHRASE': '',
-        }
+        },
+        'VOLUME_MAX': 255
     }
 
     def __init__(self, config_path='/config.json'):
@@ -97,6 +98,9 @@ class Configuration:
     def get_wifi_passphrase(self) -> str:
         return self._get('WIFI')['PASSPHRASE']
 
+    def get_volume_max(self) -> int:
+        return self._get('VOLUME_MAX')
+
     # For the web API
     def get_config(self) -> Mapping[str, Any]:
         return self.config
diff --git a/software/tests/test_playerapp.py b/software/tests/test_playerapp.py
index 69f6bee..b416ac3 100644
--- a/software/tests/test_playerapp.py
+++ b/software/tests/test_playerapp.py
@@ -139,6 +139,9 @@ class FakeConfig:
     def get_tagmode(self):
         return 'tagremains'
 
+    def get_volume_max(self):
+        return 255
+
 
 def fake_open(filename, mode):
     return FakeFile(filename, mode)

From 355a8bd345d9aa9084d6b782a14a86f6d1ee9ff3 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 23 Dec 2025 17:10:59 +0100
Subject: [PATCH 12/20] fix: allow 'reboot' to application when on on battery

Having to press the power button again to wake up the device is less
annoying to the user than not being able to apply settings when the
device is on battery.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html | 6 ++++--
 software/src/webserver.py    | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 859c932..3b590a9 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -167,7 +167,7 @@
 <div id="screen-config" class="screen">
     <h2>Configuration Editor</h2>
     <div id="config-container">Loading…</div>
-    <button id="config-save-btn" disabled>Save</button>
+    <button id="config-save-btn" disabled>Save &amp; Reboot</button>
 </div>
 
 <!-- PLAYLIST EDITOR SCREEN 1: list of playlists -->
@@ -316,7 +316,9 @@
                         return;
                     }
             
-                    alert("Configuration saved successfully!");
+                    alert("Configuration saved successfully, device will now reboot/shutdown! " +
+                          "On battery, press Power button after shutdown to restart.");
+                    await fetch('/api/v1/reboot/application', {'method': 'POST'});
                 } catch (err) {
                     alert("Error saving configuration: " + err);
                 }
diff --git a/software/src/webserver.py b/software/src/webserver.py
index f87f467..3f26514 100644
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -269,10 +269,9 @@ async def audiofile_delete(request):
 
 @webapp.route('/api/v1/reboot/<method>', methods=['POST'])
 async def reboot(request, method):
-    if hwconfig.get_on_battery():
-        return 'not allowed: usb not connected', 403
-
     if method == 'bootloader':
+        if hwconfig.get_on_battery():
+            return 'not possible: connect USB first', 403
         leds.set_state(LedManager.REBOOTING)
         timer_manager.schedule(time.ticks_ms() + 1500, machine.bootloader)
     elif method == 'application':

From 4c85683fcb93b1c19edec0501f87a41dd9bc6527 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Sat, 27 Dec 2025 15:16:27 +0100
Subject: [PATCH 13/20] feat: Allow limiting LED brightness

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html |  6 +++++-
 software/src/main.py         | 11 ++++++-----
 software/src/utils/config.py |  6 +++++-
 software/src/utils/leds.py   |  4 ++--
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 3b590a9..87dfe92 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -357,7 +357,8 @@
             'root.TAG_TIMEOUT_SECS': 'Tag removal timeout (seconds)',
             'root.TAGMODE': 'Tag mode',
             'root.LED_COUNT': 'Length of WS2182 (Neopixel) LED chain',
-            'root.VOLUME_MAX': 'Maximum volume (0-255)'
+            'root.VOLUME_MAX': 'Maximum volume (0-255)',
+            'root.LED_MAX': 'Maximum LED brightness (0-255)'
         };
         const config_input_override = {
             'root.TAGMODE': {
@@ -399,6 +400,9 @@
             },
             'root.VOLUME_MAX': {
                 'input-type': 'number'
+            },
+            'root.LED_MAX': {
+                'input-type': 'number'
             }
         };
     
diff --git a/software/src/main.py b/software/src/main.py
index cf1deea..f968997 100644
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -76,7 +76,8 @@ config = Configuration()
 
 # Setup LEDs
 np = NeoPixel(hwconfig.LED_DIN, config.get_led_count(), sm=1)
-np.fill((32, 32, 0))
+led_max = config.get_led_max()
+np.fill((led_max, led_max, 0))
 np.write()
 
 
@@ -84,7 +85,7 @@ def run():
     asyncio.new_event_loop()
 
     if machine.Pin(hwconfig.BUTTONS[1], machine.Pin.IN, machine.Pin.PULL_UP).value() == 0:
-        np.fill((0, 0, 32))
+        np.fill((0, 0, led_max))
         np.write()
         # Force default access point
         setup_wifi('', '')
@@ -116,7 +117,7 @@ def run():
                                     buttons=lambda the_app: Buttons(the_app, config, hwconfig),
                                     playlistdb=lambda _: playlistdb,
                                     hwconfig=lambda _: hwconfig,
-                                    leds=lambda _: LedManager(np),
+                                    leds=lambda _: LedManager(np, config),
                                     config=lambda _: config)
             the_app = app.PlayerApp(deps)
 
@@ -149,7 +150,7 @@ def builddb():
 
 def error_blink():
     while True:
-        np.fill((32, 0, 0))
+        np.fill((led_max, 0, 0))
         np.write()
         time.sleep_ms(500)
         np.fill((0, 0, 0))
@@ -166,5 +167,5 @@ if __name__ == '__main__':
             sys.print_exception(ex)
             error_blink()
     else:
-        np.fill((32, 0, 0))
+        np.fill((led_max, 0, 0))
         np.write()
diff --git a/software/src/utils/config.py b/software/src/utils/config.py
index bb83398..53485e1 100644
--- a/software/src/utils/config.py
+++ b/software/src/utils/config.py
@@ -27,7 +27,8 @@ class Configuration:
             'SSID': '',
             'PASSPHRASE': '',
         },
-        'VOLUME_MAX': 255
+        'VOLUME_MAX': 255,
+        'LED_MAX': 255,
     }
 
     def __init__(self, config_path='/config.json'):
@@ -101,6 +102,9 @@ class Configuration:
     def get_volume_max(self) -> int:
         return self._get('VOLUME_MAX')
 
+    def get_led_max(self) -> int:
+        return self._get('LED_MAX')
+
     # For the web API
     def get_config(self) -> Mapping[str, Any]:
         return self.config
diff --git a/software/src/utils/leds.py b/software/src/utils/leds.py
index 621c1f4..5f9ece9 100644
--- a/software/src/utils/leds.py
+++ b/software/src/utils/leds.py
@@ -12,10 +12,10 @@ class LedManager:
     PLAYING = const(1)
     REBOOTING = const(2)
 
-    def __init__(self, np):
+    def __init__(self, np, config):
         self.led_state = LedManager.IDLE
+        self.brightness = config.get_led_max() / 255
         self.np = np
-        self.brightness = 0.1
         self.leds = len(self.np)
         asyncio.create_task(self.run())
 

From 5c8a61eb27fd7a23c9d80e53b8a36f72de74dda3 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Sat, 27 Dec 2025 15:17:00 +0100
Subject: [PATCH 14/20] feat: Allow configuring volume set at startup

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html     | 4 ++++
 software/src/app.py              | 9 ++++++++-
 software/src/utils/config.py     | 4 ++++
 software/tests/test_playerapp.py | 5 ++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 87dfe92..0a74d1a 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -358,6 +358,7 @@
             'root.TAGMODE': 'Tag mode',
             'root.LED_COUNT': 'Length of WS2182 (Neopixel) LED chain',
             'root.VOLUME_MAX': 'Maximum volume (0-255)',
+            'root.VOLUME_BOOT': 'Volume at startup (0-255)',
             'root.LED_MAX': 'Maximum LED brightness (0-255)'
         };
         const config_input_override = {
@@ -401,6 +402,9 @@
             'root.VOLUME_MAX': {
                 'input-type': 'number'
             },
+            'root.VOLUME_BOOT': {
+                'input-type': 'number'
+            },
             'root.LED_MAX': {
                 'input-type': 'number'
             }
diff --git a/software/src/app.py b/software/src/app.py
index 386c18e..5a9c0b7 100644
--- a/software/src/app.py
+++ b/software/src/app.py
@@ -53,11 +53,18 @@ class PlayerApp:
         self.leds = deps.leds(self)
         self.tag_mode = self.config.get_tagmode()
         self.volume_max = self.config.get_volume_max()
+        self.volume_pos = 3  # fallback if config.get_volume_boot is nonsense
+        try:
+            for idx, val in enumerate(VOLUME_CURVE):
+                if val >= self.config.get_volume_boot():
+                    self.volume_pos = idx
+                    break
+        except (TypeError, ValueError):
+            pass
         self.playing_tag = None
         self.playlist = None
         self.buttons = deps.buttons(self) if deps.buttons is not None else None
         self.mp3file = None
-        self.volume_pos = 3
         self.paused = False
         self.playing = False
         self.player.set_volume(VOLUME_CURVE[self.volume_pos])
diff --git a/software/src/utils/config.py b/software/src/utils/config.py
index 53485e1..6584cba 100644
--- a/software/src/utils/config.py
+++ b/software/src/utils/config.py
@@ -28,6 +28,7 @@ class Configuration:
             'PASSPHRASE': '',
         },
         'VOLUME_MAX': 255,
+        'VOLUME_BOOT': 16,
         'LED_MAX': 255,
     }
 
@@ -105,6 +106,9 @@ class Configuration:
     def get_led_max(self) -> int:
         return self._get('LED_MAX')
 
+    def get_volume_boot(self) -> int:
+        return self._get('VOLUME_BOOT')
+
     # For the web API
     def get_config(self) -> Mapping[str, Any]:
         return self.config
diff --git a/software/tests/test_playerapp.py b/software/tests/test_playerapp.py
index b416ac3..d9748b4 100644
--- a/software/tests/test_playerapp.py
+++ b/software/tests/test_playerapp.py
@@ -142,6 +142,9 @@ class FakeConfig:
     def get_volume_max(self):
         return 255
 
+    def get_volume_boot(self):
+        return 16
+
 
 def fake_open(filename, mode):
     return FakeFile(filename, mode)
@@ -170,7 +173,7 @@ def test_construct_app(micropythonify, faketimermanager):
     deps = _makedeps(mp3player=fake_mp3)
     dut = app.PlayerApp(deps)
     fake_mp3 = dut.player
-    assert fake_mp3.volume is not None
+    assert fake_mp3.volume is not None and fake_mp3.volume >= 16
 
 
 def test_load_playlist_on_tag(micropythonify, faketimermanager, monkeypatch):

From 73da134a1259c299ca072cd55f86be90887c36cb Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Sat, 27 Dec 2025 15:18:50 +0100
Subject: [PATCH 15/20] fix: webserver: file uploading

- Fix upload of files <= Request.max_body_length
  File uploads smaller than the limit were not given to the handler as a
  stream by microdot, instead the content is directly stored in the
  request.body.

- Refactor stream to file copy into a helper method

- Increase the copy buffer size to 16k

- Call app.reset_idle_timeout() periodically during file uploads to
  avoid the device turning off when uploading large files while on
  battery.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/webserver.py | 47 ++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/software/src/webserver.py b/software/src/webserver.py
index 3f26514..7fe17ef 100644
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -5,6 +5,7 @@ Copyright (c) 2024-2025 Stefan Kratochwil <Kratochwil-LA@gmx.de>
 
 import asyncio
 import board
+import errno
 import hwconfig
 import json
 import machine
@@ -202,6 +203,25 @@ async def audiofiles_get(request):
     return directory_iterator(), {'Content-Type': 'application/json; charset=UTF-8'}
 
 
+async def stream_to_file(stream, file_, length):
+    data = array('b', range(16384))
+    bytes_copied = 0
+    while True:
+        bytes_read = await stream.readinto(data)
+        if bytes_read == 0:
+            # End of body
+            break
+        bytes_written = file_.write(data[:bytes_read])
+        if bytes_written != bytes_read:
+            # short writes shouldn't happen
+            raise OSError(errno.EIO, 'unexpected short write')
+        bytes_copied += bytes_written
+        if bytes_copied == length:
+            break
+        app.reset_idle_timeout()
+    return bytes_copied
+
+
 @webapp.route('/api/v1/audiofiles', methods=['POST'])
 async def audiofile_upload(request):
     if 'type' not in request.args or request.args['type'] not in ['file', 'directory']:
@@ -218,26 +238,13 @@ async def audiofile_upload(request):
         os.mkdir(path)
         return '', 204
     with open(path, 'wb') as newfile:
-        data = array('b', range(4096))
-        bytes_copied = 0
-        while True:
-            try:
-                bytes_read = await request.stream.readinto(data)
-            except OSError as ex:
-                return f'read error: {ex}', 500
-            if bytes_read == 0:
-                # End of body
-                break
-            try:
-                bytes_written = newfile.write(data[:bytes_read])
-            except OSError as ex:
-                return f'write error: {ex}', 500
-            if bytes_written != bytes_read:
-                # short writes shouldn't happen
-                return 'write failure', 500
-            bytes_copied += bytes_written
-            if bytes_copied == length:
-                break
+        try:
+            if length > Request.max_body_length:
+                bytes_copied = await stream_to_file(request.stream, newfile, length)
+            else:
+                bytes_copied = newfile.write(request.body)
+        except OSError as ex:
+            return f'error writing data to file: {ex}', 500
     if bytes_copied == length:
         return '', 204
     else:

From 2cf88b26eebfc34705116bf091289bca81d8520d Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Sat, 27 Dec 2025 15:23:41 +0100
Subject: [PATCH 16/20] fix: button 0 to shutdown device when in error state

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/software/src/main.py b/software/src/main.py
index f968997..1af8e3c 100644
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -150,6 +150,8 @@ def builddb():
 
 def error_blink():
     while True:
+        if machine.Pin(hwconfig.BUTTONS[0], machine.Pin.IN, machine.Pin.PULL_UP).value() == 0:
+            machine.reset()
         np.fill((led_max, 0, 0))
         np.write()
         time.sleep_ms(500)

From 6d18437863095eefe7d6ab1e291198faaacb741d Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 6 Jan 2026 12:29:14 +0100
Subject: [PATCH 17/20] fix: Remove directory based db creation

Previously, if no tonberry.db existed on the SD card, the database was
initialized with a playlist for each directory containing mp3 files,
with the tag serial number matching the directory name. This was used
during development before the web UI to edit the playlist db existed.
It is no longer necessary, and confusing to the user when unusable
playlists are created when albums are preloaded onto the SD card before
putting it in the tonberry device.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/main.py | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/software/src/main.py b/software/src/main.py
index 1af8e3c..8ed430e 100644
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -3,11 +3,9 @@
 
 import aiorepl  # type: ignore
 import asyncio
-from errno import ENOENT
 import machine
 import micropython
 import network
-import os
 import time
 import ubinascii
 import sys
@@ -95,15 +93,6 @@ def run():
     # Setup MP3 player
     with SDContext(mosi=hwconfig.SD_DI, miso=hwconfig.SD_DO, sck=hwconfig.SD_SCK, ss=hwconfig.SD_CS,
                    baudrate=hwconfig.SD_CLOCKRATE):
-        # Temporary hack: build database from folders if no database exists
-        # Can be removed once playlists can be created via API
-        try:
-            _ = os.stat(DB_PATH)
-        except OSError as ex:
-            if ex.errno == ENOENT:
-                print("No playlist DB found, trying to build DB from tag dirs")
-                builddb()
-
         with BTreeFileManager(DB_PATH) as playlistdb, \
              AudioContext(hwconfig.I2S_DIN, hwconfig.I2S_DCLK, hwconfig.I2S_LRCLK) as audioctx:
 
@@ -130,24 +119,6 @@ def run():
             asyncio.get_event_loop().run_forever()
 
 
-def builddb():
-    """
-    For testing, build a playlist db based on the previous tag directory format.
-    Can be removed once uploading files / playlist via the web api is possible.
-    """
-    try:
-        os.unlink(DB_PATH)
-    except OSError:
-        pass
-    with BTreeFileManager(DB_PATH) as db:
-        for name, type_, _, _ in os.ilistdir(b'/sd'):
-            if type_ != 0x4000:
-                continue
-            fl = [b'/sd/' + name + b'/' + x for x in os.listdir(b'/sd/' + name) if x.endswith(b'.mp3')]
-            db.createPlaylistForTag(name, fl)
-    os.sync()
-
-
 def error_blink():
     while True:
         if machine.Pin(hwconfig.BUTTONS[0], machine.Pin.IN, machine.Pin.PULL_UP).value() == 0:

From 763305c659682ffa46d97e0d3a4b2e05a50a30e4 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 6 Jan 2026 12:37:31 +0100
Subject: [PATCH 18/20] fix[frontend]: Reset upload UI elements, don't expand
 tree view

- Make sure the upload progess bar and file choser are reset when
  loading the file browser screen.
- Don't expand the directories in the tree view by default.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index 0a74d1a..e05bc11 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -796,6 +796,10 @@
         
         async function onShow(intent) {
             document.getElementById('playlist-filebrowser-addtrack').disabled = true;
+            if (intent !== 'refresh') {
+                document.getElementById('playlist-filebrowser-upload-progress').value = 0;
+                document.getElementById("playlist-filebrowser-upload-files").value = "";
+            }
             tree = document.getElementById("playlist-filebrowser-tree");
             tree.innerHTML = "Loading...";
             fetch('/api/v1/audiofiles')
@@ -830,7 +834,6 @@
             if (type === 'directory') {
                 const nested = document.createElement('ul');
                 node.appendChild(nested);
-                node.classList.add('expanded');
                 parent.appendChild(node);
                 return nested;
             }
@@ -917,7 +920,7 @@
                     }
                     if (donecount + 1 === totalcount) {
                         // Reload file list from device
-                        onShow();
+                        onShow('refresh');
                     } else {
                         uploadFileHelper(totalcount, donecount + 1, destdir, files.slice(1));
                     }
@@ -944,7 +947,7 @@
             const saveRes = await fetch(`/api/v1/audiofiles?type=directory&location=${location}`,
                   {method: 'POST'});
             // Reload file list from device
-            onShow();
+            onShow('refresh');
         }
 
         async function deleteItems() {
@@ -965,7 +968,7 @@
                 }
             }
             // Reload file list from device
-            onShow();
+            onShow('refresh');
         }
         
         let tree = (() => {

From 6976aa6963671e195bc472d7c1a0391468e98407 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 6 Jan 2026 12:41:37 +0100
Subject: [PATCH 19/20] fix[player]: Don't latch tag if no playlist exists

When the device is in 'tagstartstop' tag mode, and the user presents a
new tag to get the serial number and create a playlist using the web UI,
the playerapp still remembered the tag as the currently playing tag even
though no playlist was found and no playback is running. After the user
saves the playlist in the UI and puts the tag on the device again, they
expect the playback to start with the new playlist. Instead, nothing
happens, because this is counted as the 'stop' event of the tagstartstop
mode. The user would have to remove the tag and present it again (after
waiting for the tagtimeout) to play the new playlist.

Fix this unexpected behaviour by not storing the current tag into the
playing_tag field if no playlist existed for the tag.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/src/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/src/app.py b/software/src/app.py
index 5a9c0b7..ea80602 100644
--- a/software/src/app.py
+++ b/software/src/app.py
@@ -82,7 +82,7 @@ class PlayerApp:
         uid_str = b''.join('{:02x}'.format(x).encode() for x in new_tag)
         if self.tag_mode == 'tagremains' or (self.tag_mode == 'tagstartstop' and new_tag != self.playing_tag):
             self._set_playlist(uid_str)
-            self.playing_tag = new_tag
+            self.playing_tag = new_tag if self.playlist is not None else None
         elif self.tag_mode == 'tagstartstop':
             print('Tag presented again, stopping playback')
             self._unset_playlist()

From 6dee7fff7e5dc2750fd05c4a2ff564e53dd73f72 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Tue, 6 Jan 2026 14:10:41 +0100
Subject: [PATCH 20/20] feat: Allow configuring WiFi security

Allow choosing between the three security modes exposed by the
micropython cyw43 wifi driver. Also allow setting up security in AP
mode.

Improve the WiFi section of the configuration UI.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>
---
 software/frontend/index.html | 18 +++++++++++++++---
 software/src/main.py         | 20 +++++++++++++++-----
 software/src/utils/config.py |  7 +++++++
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/software/frontend/index.html b/software/frontend/index.html
index e05bc11..43de408 100644
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -359,7 +359,10 @@
             'root.LED_COUNT': 'Length of WS2182 (Neopixel) LED chain',
             'root.VOLUME_MAX': 'Maximum volume (0-255)',
             'root.VOLUME_BOOT': 'Volume at startup (0-255)',
-            'root.LED_MAX': 'Maximum LED brightness (0-255)'
+            'root.LED_MAX': 'Maximum LED brightness (0-255)',
+            'root.WIFI.SSID': 'Network name (SSID) (leave empty for AP mode)',
+            'root.WIFI.PASSPHRASE': 'Password',
+            'root.WIFI.SECURITY': 'Security mode'
         };
         const config_input_override = {
             'root.TAGMODE': {
@@ -393,12 +396,21 @@
             'root.LED_COUNT': {
                 'input-type': 'number'
             },
-            'root.WLAN.SSID': {
+            'root.WIFI.SSID': {
                 'input-type': 'text'
             },
-            'root.WLAN.PASSPHRASE': {
+            'root.WIFI.PASSPHRASE': {
                 'input-type': 'text'
             },
+            'root.WIFI.SECURITY': {
+                'element': 'select',
+                'values': {
+                    'open': 'Open',
+                    'wpa_wpa2': 'WPA/WPA2 (PSK Mixed)',
+                    'wpa3': 'WPA3 (SAE AES)',
+                    'wpa2_wpa3': 'WPA2/WPA3 (PSK AES)'
+                }
+            },
             'root.VOLUME_MAX': {
                 'input-type': 'number'
             },
diff --git a/software/src/main.py b/software/src/main.py
index 8ed430e..cae2b1f 100644
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -36,19 +36,19 @@ hwconfig.board_init()
 machine.mem32[0x40030000 + 0x00] = 0x10
 
 
-def setup_wifi(ssid='', passphrase='', sec=network.WLAN.SEC_WPA2_WPA3):
+def setup_wifi(ssid='', passphrase='', security=network.WLAN.SEC_WPA_WPA2):
     network.hostname("TonberryPico")
     if ssid is None or ssid == '':
         apname = f"TonberryPicoAP_{machine.unique_id().hex()}"
         print(f"Create AP {apname}")
         wlan = network.WLAN(network.WLAN.IF_AP)
-        wlan.config(ssid=apname, security=wlan.SEC_OPEN)
+        wlan.config(ssid=apname, password=passphrase if passphrase is not None else '', security=security)
         wlan.active(True)
     else:
         print(f"Connect to SSID {ssid} with passphrase {passphrase}...")
         wlan = network.WLAN()
         wlan.active(True)
-        wlan.connect(ssid, passphrase if passphrase is not None else '', security=sec)
+        wlan.connect(ssid, passphrase if passphrase is not None else '', security=security)
 
     # configure power management
     wlan.config(pm=network.WLAN.PM_PERFORMANCE)
@@ -86,9 +86,19 @@ def run():
         np.fill((0, 0, led_max))
         np.write()
         # Force default access point
-        setup_wifi('', '')
+        setup_wifi('', '', network.WLAN.SEC_OPEN)
     else:
-        setup_wifi(config.get_wifi_ssid(), config.get_wifi_passphrase())
+        secstring = config.get_wifi_security()
+        security = network.WLAN.SEC_WPA_WPA2
+        if secstring == 'open':
+            security = network.WLAN.SEC_OPEN
+        elif secstring == 'wpa_wpa2':
+            security = network.WLAN.SEC_WPA_WPA2
+        elif secstring == 'wpa3':
+            security = network.WLAN.SEC_WPA3
+        elif secstring == 'wpa2_wpa3':
+            security = network.WLAN.SEC_WPA2_WPA3
+        setup_wifi(config.get_wifi_ssid(), config.get_wifi_passphrase(), security)
 
     # Setup MP3 player
     with SDContext(mosi=hwconfig.SD_DI, miso=hwconfig.SD_DO, sck=hwconfig.SD_SCK, ss=hwconfig.SD_CS,
diff --git a/software/src/utils/config.py b/software/src/utils/config.py
index 6584cba..629a0fd 100644
--- a/software/src/utils/config.py
+++ b/software/src/utils/config.py
@@ -26,6 +26,7 @@ class Configuration:
         'WIFI': {
             'SSID': '',
             'PASSPHRASE': '',
+            'SECURITY': 'wpa_wpa2',
         },
         'VOLUME_MAX': 255,
         'VOLUME_BOOT': 16,
@@ -100,6 +101,9 @@ class Configuration:
     def get_wifi_passphrase(self) -> str:
         return self._get('WIFI')['PASSPHRASE']
 
+    def get_wifi_security(self) -> str:
+        return self._get('WIFI')['SECURITY']
+
     def get_volume_max(self) -> int:
         return self._get('VOLUME_MAX')
 
@@ -126,6 +130,9 @@ class Configuration:
         self._validate(self.DEFAULT_CONFIG, config)
         if 'TAGMODE' in config and config['TAGMODE'] not in ['tagremains', 'tagstartstop']:
             raise ValueError("Invalid TAGMODE: Must be 'tagremains' or 'tagstartstop'")
+        if 'WLAN' in config and 'SECURITY' in config['WLAN'] and \
+           config['WLAN']['SECURITY'] not in ['open', 'wpa_wpa2', 'wpa3', 'wpa2_wpa3']:
+            raise ValueError("Invalid WLAN SECURITY: Must be 'open', 'wpa_wpa2', 'wpa3' or 'wpa2_wpa3'")
         self._merge_configs(self.config, config)
         self.config = config
         self._save()