wip: frontend

Merge branch '30-frontend' into mbl-next
Merge remote-tracking branch 'origin/webapi-last-tag-uid' into mbl-next
2025-12-17 21:38:05 +01:00 · 2025-12-17 19:11:10 +01:00 · 2025-12-17 18:39:26 +01:00 · 2025-12-17 18:37:34 +01:00 · 2025-12-16 23:13:04 +01:00 · 2025-12-16 21:55:28 +00:00
18 changed files with 843 additions and 102 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -11,8 +11,10 @@ jobs:
        uses: actions/checkout@v4
      - name: Initialize submodules
        run: cd software && ./update-submodules.sh
+      - name: Prepare venv
+        run: python -m venv build-venv && source build-venv/bin/activate && pip install freezefs
      - name: Build
-        run: cd software && ./build.sh
+        run: source build-venv/bin/activate && cd software && ./build.sh
      - name: Upload firmware
        uses: actions/upload-artifact@v3
        with:
--- a/software/boards/RPI_PICO_W/manifest.py
+++ b/software/boards/RPI_PICO_W/manifest.py
@@ -22,3 +22,5 @@ module("mp3player.py", "../../src")
 module("webserver.py", "../../src")
 package("utils", base_path="../../src")
 package("nfc", base_path="../../src")
+
+module("frozen_frontend.py", "../../build")
--- a/software/build.sh
+++ b/software/build.sh
@@ -17,6 +17,7 @@ set -eu
 )

 BUILDDIR=lib/micropython/ports/rp2/build-TONBERRY_RPI_PICO_W/
+BUILDDIR_UNIX=lib/micropython/ports/unix/build-tonberry_unix/
 OUTDIR=$(pwd)/build
 mkdir -p "$OUTDIR"
 FS_STAGE_DIR=$(mktemp -d)
@@ -24,6 +25,11 @@ mkdir  "$FS_STAGE_DIR"/fs
 trap 'rm -rf $FS_STAGE_DIR' EXIT
 tools/mklittlefs/mklittlefs -p 256 -s 868352 -c "$FS_STAGE_DIR"/fs "$FS_STAGE_DIR"/filesystem.bin

+FRONTEND_STAGE_DIR=$(mktemp -d)
+trap 'rm -rf $FRONTEND_STAGE_DIR' EXIT
+gzip -c frontend/index.html > "$FRONTEND_STAGE_DIR"/index.html.gz
+python -m freezefs "$FRONTEND_STAGE_DIR" build/frozen_frontend.py --target=/frontend
+
 for hwconfig in boards/RPI_PICO_W/manifest-*.py; do
    hwconfig_base=$(basename "$hwconfig")
    hwname=${hwconfig_base##manifest-}
@@ -51,5 +57,9 @@ for hwconfig in boards/RPI_PICO_W/manifest-*.py; do
    $PICOTOOL uf2 convert $BUILDDIR/firmware-filesystem.bin "$OUTDIR"/firmware-filesystem-"$hwname".uf2
 done

+cp "$BUILDDIR_UNIX"/micropython "$OUTDIR"/micropython-tonberry_unix
+chmod u+x "$OUTDIR"/micropython-tonberry_unix
+
 echo "Output in" "${OUTDIR}"/firmware-*.uf2
 echo "Images with filesystem in" "${OUTDIR}"/firmware-filesystem-*.uf2
+echo "Unix build in" "${OUTDIR}"/micropython-tonberry_unix
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -0,0 +1,450 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<title>Device Admin</title>
+<style>
+    body {
+        font-family: Arial, sans-serif;
+        padding: 20px;
+        max-width: 700px;
+        margin: auto;
+    }
+
+    /* Navigation */
+    nav button {
+        margin: 5px;
+        padding: 10px 16px;
+        cursor: pointer;
+    }
+
+    /* Screens */
+    .screen {
+        display: none;
+        margin-top: 20px;
+    }
+    .screen.active {
+        display: block;
+    }
+
+    /* Config editor UI */
+    label {
+        font-weight: bold;
+        margin-top: 12px;
+        display: block;
+    }
+    input {
+        width: 100%;
+        padding: 6px;
+        box-sizing: border-box;
+        margin-top: 4px;
+    }
+    .nested {
+        margin-left: 20px;
+        border-left: 2px solid #ddd;
+        padding-left: 10px;
+        margin-top: 10px;
+    }
+
+    /* Tree view */
+    .tree ul {
+      list-style: none;
+      padding-left: 1rem;
+    }
+    
+    .tree li {
+      margin: 2px 0;
+    }
+    
+    .caret {
+      cursor: pointer;
+      display: inline-block;
+      width: 1em;
+      height: 1em;
+      user-select: none;
+    }
+    
+    .caret::before {
+      content: "▶";
+      opacity: 0.6;
+    }
+    
+    li.expanded > .caret::before {
+      content: "▼";
+    }
+    
+    li:not(:has(ul)) > .caret::before {
+      content: "";
+    }
+    
+    .node {
+      cursor: pointer;
+      padding: 2px 6px;
+      border-radius: 4px;
+      user-select: none;
+    }
+    
+    .node:hover {
+      background: #eee;
+    }
+    
+    .node.selected {
+      background: #0078d7;
+      color: white;
+    }
+    
+    .tree ul ul {
+      display: none;
+    }
+    
+    li.expanded > ul {
+      display: block;
+    }
+
+    .scroll-tree-container {
+      border: 1px solid #ccc;
+      border-radius: 4px;
+    
+      height: 300px;
+      overflow-y: auto;
+      overflow-x: hidden;
+    }
+
+</style>
+</head>
+<body>
+
+<h1>Device Admin</h1>
+
+<nav>
+    <button onclick="showScreen('menu')">🏠 Main Menu</button>
+    <button onclick="showScreen('config')">⚙️ Config Editor</button>
+    <button onclick="showScreen('playlist')">🖹 Playlist Editor</button>
+</nav>
+
+<!-- MAIN MENU -->
+<div id="screen-menu" class="screen active">
+    <h2>Main Menu</h2>
+    <p>Select a tool:</p>
+
+    <ul>
+        <li><button onclick="showScreen('config')">Open Config Editor</button></li>
+        <li><button onclick="showScreen('playlist')">Open Playlist Editor</button></li>
+        <!-- More screens can be added later -->
+    </ul>
+</div>
+
+<!-- CONFIG EDITOR SCREEN -->
+<div id="screen-config" class="screen">
+    <h2>Configuration Editor</h2>
+    <div id="config-container">Loading…</div>
+    <button id="config-save-btn" disabled>Save</button>
+</div>
+
+<!-- PLAYLIST EDITOR SCREEN -->
+<div id="screen-playlist" class="screen">
+    <h2>Playlist Editor</h2>
+    <div id="playlist-container">Loading…</div>
+    <div class="scroll-tree-container">
+        <div class="tree" id="tree">
+            <ul>
+                <li>
+                  <span class="caret"></span>
+                  <span class="node">Fruits</span>
+                  <ul>
+                    <li>
+                      <span class="caret"></span>
+                      <span class="node">Apple</span>
+                    </li>
+                    <li>
+                      <span class="caret"></span>
+                      <span class="node">Citrus</span>
+                      <ul>
+                        <li>
+                          <span class="caret"></span>
+                          <span class="node">Orange</span>
+                        </li>
+                        <li>
+                          <span class="caret"></span>
+                          <span class="node">Lemon</span>
+                        </li>
+                      </ul>
+                    </li>
+                    <li>
+                      <span class="caret"></span>
+                      <span class="node">Strawberry</span>
+                    </li>
+                  </ul>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <button id="playlist-save-btn" disabled>Save</button>
+</div>
+
+<script>
+    const Screens = {};
+    let activeScreen = null;
+    /* -----------------------------
+       Screen switching
+    ----------------------------- */
+    function showScreen(name) {
+        document.querySelectorAll('.screen').forEach(s => s.classList.remove('active'));
+        document.getElementById('screen-' + name).classList.add('active');
+
+        activeScreen = name;
+        Screens[name]?.onShow?.();
+    }
+    
+    /* -----------------------------
+       CONFIG EDITOR LOGIC
+    ----------------------------- */
+    Screens.config = (() => {
+        let screenroot = null;
+        function init() {
+            screenroot = document.getElementById('screen-config');
+            document.getElementById('config-save-btn').addEventListener('click', async () => {
+                const res = await fetch('/api/v1/config');
+                const original = await res.json();
+                const updated = serialize(original);
+            
+                try {
+                    const saveRes = await fetch('/api/v1/config', {
+                        method: 'PUT',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify(updated, null, 2)
+                    });
+            
+                    if (!saveRes.ok) {
+                        alert("Failed to save config: " + await saveRes.text());
+                        return;
+                    }
+            
+                    alert("Configuration saved successfully!");
+                } catch (err) {
+                    alert("Error saving configuration: " + err);
+                }
+            });
+        }
+        
+        async function onShow() {
+            const container = document.getElementById('config-container');
+            container.innerHTML = "Loading…";
+            document.getElementById('config-save-btn').disabled = true;
+        
+            try {
+                const res = await fetch('/api/v1/config');
+                const config = await res.json();
+                render(config);
+            } catch (err) {
+                container.innerHTML = "Failed to load config: " + err;
+            }
+        }
+    
+        function render(config) {
+            const container = document.getElementById('config-container');
+            container.innerHTML = "";
+            container.appendChild(renderObject(config, "root"));
+            document.getElementById('config-save-btn').disabled = false;
+        }
+    
+        const config_names = {
+            'root.IDLE_TIMEOUT_SECS': 'Idle Timeout (seconds)',
+            'root.BUTTON_MAP': 'Button map',
+            'root.BUTTON_MAP.NEXT': 'Next track',
+            'root.BUTTON_MAP.PREV': 'Previous track',
+            'root.BUTTON_MAP.VOLUP': 'Volume up',
+            'root.BUTTON_MAP.VOLDOWN': 'Volume down',
+            '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'
+        };
+        const config_input_override = {
+            'root.TAGMODE': {
+                'element': 'select',
+                'values': {
+                    'tagremains': 'Play until tag is removed',
+                    'tagstartstop': 'Present tag once to start, present again to stop playback'
+                }
+            },
+            'root.IDLE_TIMEOUT_SECS': {
+                'input-type': 'number'
+            },
+            'root.TAG_TIMEOUT_SECS': {
+                'input-type': 'number'
+            },
+            'root.LED_COUNT': {
+                'input-type': 'number'
+            },
+        };
+    
+        function renderObject(obj, path) {
+            const wrapper = document.createElement('div');
+        
+            Object.entries(obj).forEach(([key, value]) => {
+                const currentPath = path + '.' + key;
+                const label = document.createElement('label');
+                if (currentPath in config_names) {
+                    label.textContent = config_names[currentPath];
+                } else {
+                    label.textContent = key;
+                }
+        
+                if (value !== null && typeof value === 'object') {
+                    wrapper.appendChild(label);
+                    const nested = document.createElement('div');
+                    nested.className = "nested";
+                    nested.appendChild(renderObject(value, currentPath));
+                    wrapper.appendChild(nested);
+                } else {
+                    wrapper.appendChild(label);
+                    if (currentPath in config_input_override && 'element' in config_input_override[currentPath]) {
+                        const override = config_input_override[currentPath];
+                        if (override['element'] === 'select') {
+                            const input = document.createElement('select');
+                            input.dataset.path = currentPath;
+        
+                            for (const val in override.values) {
+                                const option = document.createElement('option');
+                                option.value = val;
+                                option.textContent = override.values[val];
+                                if (val === value) {
+                                    option.selected = true;
+                                }
+        
+                                input.appendChild(option);
+                            }
+        
+                            wrapper.appendChild(input);
+                        }
+                    } else {
+                        const input = document.createElement('input');
+                        if (currentPath in config_input_override && 'input-type' in config_input_override[currentPath]) {
+                            input.type = config_input_override[currentPath]['input-type'];
+                        }
+                        input.value = value === null ? "" : value;
+                        input.dataset.path = currentPath;
+        
+                        wrapper.appendChild(input);
+                    }
+                }
+            });
+        
+            return wrapper;
+        }
+    
+        function serialize(rootObj) {
+            const inputs = screenroot.querySelectorAll("input[data-path], select[data-path]");
+        
+            inputs.forEach(input => {
+                const path = input.dataset.path.split('.').slice(1); // remove "root"
+                let current = rootObj;
+        
+                for (let i = 0; i < path.length - 1; i++) {
+                    current = current[path[i]];
+                }
+        
+                let val = input.value.trim();
+                if (val === "") val = null;
+                else if (!isNaN(val)) val = Number(val);
+        
+                current[path[path.length - 1]] = val;
+            });
+        
+            return rootObj;
+        }
+    
+        return { init, onShow };
+    })();
+
+/* -----------------------------
+   PLAYLIST EDITOR LOGIC
+----------------------------- */
+    Screens.playlist = (() => {
+        let lastSelected = null;
+        
+        function init() {
+            document.getElementById("tree").addEventListener("click", (e) => {
+                // CARET CLICK → expand/collapse
+                const caret = e.target.closest(".caret");
+                if (caret) {
+                    const li = caret.parentElement;
+                    if (li.querySelector("ul")) {
+                      li.classList.toggle("expanded");
+                    }
+                    return; // IMPORTANT: don't affect selection
+                }
+                
+                // NODE LABEL CLICK → selection only
+                const node = e.target.closest(".node");
+                if (!node) return;
+                
+                if (e.shiftKey && lastSelected) {
+                    selectRange(lastSelected, node);
+                } else if (e.ctrlKey || e.metaKey) {
+                    node.classList.toggle("selected");
+                } else {
+                    clearSelection();
+                    node.classList.add("selected");
+                }
+                
+                lastSelected = node;
+            });
+        }
+        
+        async function onShow() {
+            const container = document.getElementById('playlist-container');
+            container.innerHTML = "Loading…";
+            document.getElementById('playlist-save-btn').disabled = true;
+        
+            try {
+                const res = await fetch('/api/v1/playlist');
+                const config = await res.json();
+                renderPlaylistForm(config);
+            } catch (err) {
+                container.innerHTML = "Failed to load config: " + err;
+            }
+        }
+        
+        function renderPlaylistForm(config) {
+            const container = document.getElementById('playlist-container');
+            container.innerHTML = "";
+            container.appendChild(renderPlaylistObject(config, "root"));
+            document.getElementById('playlist-save-btn').disabled = false;
+        }
+    
+        function clearSelection() {
+            tree.querySelectorAll(".selected").forEach(n =>
+                n.classList.remove("selected")
+            );
+        }
+        
+        function selectRange(start, end) {
+            const nodes = [...tree.querySelectorAll(".node")];
+            const startIndex = nodes.indexOf(start);
+            const endIndex = nodes.indexOf(end);
+    
+            const [from, to] = startIndex < endIndex
+                ? [startIndex, endIndex]
+                : [endIndex, startIndex];
+    
+            clearSelection();
+            nodes.slice(from, to + 1).forEach(n =>
+                n.classList.add("selected")
+            );
+        }
+        
+        return { init, onShow };
+    })();
+
+// Initialization
+    Object.values(Screens).forEach(screen => {
+        screen.init?.();
+    });
+
+    showScreen("menu");
+</script>
+
+</body>
+</html>
--- a/software/requirements.txt
+++ b/software/requirements.txt
@@ -0,0 +1 @@
+freezefs
--- a/software/src/app.py
+++ b/software/src/app.py
@@ -6,7 +6,8 @@ import time
 from utils import TimerManager


-Dependencies = namedtuple('Dependencies', ('mp3player', 'nfcreader', 'buttons', 'playlistdb', 'hwconfig', 'leds'))
+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]
@@ -14,11 +15,12 @@ VOLUME_CURVE = [1, 2, 4, 8, 16, 32, 63, 126, 251]

 class PlayerApp:
    class TagStateMachine:
-        def __init__(self, parent, timer_manager):
+        def __init__(self, parent, timer_manager, timeout=5000):
            self.parent = parent
            self.timer_manager = timer_manager
            self.current_tag = None
            self.current_tag_time = time.ticks_ms()
+            self.timeout = timeout

        def onTagChange(self, new_tag):
            if new_tag is not None:
@@ -31,7 +33,7 @@ class PlayerApp:
                self.current_tag = new_tag
                self.parent.onNewTag(new_tag)
            else:
-                self.timer_manager.schedule(time.ticks_ms() + 5000, self.onTagRemoveDelay)
+                self.timer_manager.schedule(time.ticks_ms() + self.timeout, self.onTagRemoveDelay)

        def onTagRemoveDelay(self):
            if self.current_tag is not None:
@@ -40,18 +42,23 @@ class PlayerApp:

    def __init__(self, deps: Dependencies):
        self.timer_manager = TimerManager()
-        self.tag_state_machine = self.TagStateMachine(self, self.timer_manager)
+        self.config = deps.config(self)
+        self.tag_timeout_ms = self.config.get_tag_timeout() * 1000
+        self.idle_timeout_ms = self.config.get_idle_timeout() * 1000
+        self.tag_state_machine = self.TagStateMachine(self, self.timer_manager, self.tag_timeout_ms)
        self.player = deps.mp3player(self)
        self.nfc = deps.nfcreader(self.tag_state_machine)
        self.playlist_db = deps.playlistdb(self)
        self.hwconfig = deps.hwconfig(self)
        self.leds = deps.leds(self)
-        self.tag_mode = self.playlist_db.getSetting('tagmode')
+        self.tag_mode = self.config.get_tagmode()
        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])
        self._onIdle()

@@ -91,6 +98,10 @@ class PlayerApp:
            self.player.set_volume(VOLUME_CURVE[self.volume_pos])
        elif what == self.buttons.NEXT:
            self._play_next()
+        elif what == self.buttons.PREV:
+            self._play_prev()
+        elif what == self.buttons.PLAY_PAUSE:
+            self._pause_toggle()

    def onPlaybackDone(self):
        assert self.mp3file is not None
@@ -103,7 +114,14 @@ class PlayerApp:
            self.hwconfig.power_off()
        else:
            # Check again in a minute
-            self.timer_manager.schedule(time.ticks_ms() + 60*1000, self.onIdleTimeout)
+            self.timer_manager.schedule(time.ticks_ms() + self.idle_timeout_ms, self.onIdleTimeout)
+
+    def reset_idle_timeout(self):
+        if not self.playing:
+            self.timer_manager.schedule(time.ticks_ms() + self.idle_timeout_ms, self.onIdleTimeout)
+
+    def is_playing(self) -> bool:
+        return self.playing

    def _set_playlist(self, tag: bytes):
        if self.playlist is not None:
@@ -131,6 +149,15 @@ class PlayerApp:
            self.playlist = None
            self.playing_tag = None

+    def _play_prev(self):
+        if self.playlist is None:
+            return
+        filename = self.playlist.getPrevPath()
+        self._play(filename)
+        if filename is None:
+            self.playlist = None
+            self.playing_tag = None
+
    def _play(self, filename: bytes | None, offset=0):
        if self.mp3file is not None:
            self.player.stop()
@@ -141,12 +168,28 @@ class PlayerApp:
            print(f'Playing {filename!r}')
            self.mp3file = open(filename, 'rb')
            self.player.play(self.mp3file, offset)
+            self.paused = False
            self._onActive()

+    def _pause_toggle(self):
+        if self.playlist is None:
+            return
+        if self.paused:
+            self._play(self.playlist.getCurrentPath(), self.pause_offset)
+        else:
+            self.pause_offset = self.player.stop()
+            self.paused = True
+            self._onIdle()
+
    def _onIdle(self):
-        self.timer_manager.schedule(time.ticks_ms() + 60*1000, self.onIdleTimeout)
+        self.timer_manager.schedule(time.ticks_ms() + self.idle_timeout_ms, self.onIdleTimeout)
        self.leds.set_state(self.leds.IDLE)
+        self.playing = False

    def _onActive(self):
        self.timer_manager.cancel(self.onIdleTimeout)
        self.leds.set_state(self.leds.PLAYING)
+        self.playing = True
+
+    def get_nfc(self):
+        return self.nfc
--- a/software/src/hwconfig_Rev1/hwconfig.py
+++ b/software/src/hwconfig_Rev1/hwconfig.py
@@ -28,13 +28,14 @@ RC522_SS = Pin.board.GP13

 # WS2812
 LED_DIN = Pin.board.GP16
-LED_COUNT = 1

 # Buttons
-BUTTON_VOLUP = Pin.board.GP17
-BUTTON_VOLDOWN = Pin.board.GP19
-BUTTON_NEXT = Pin.board.GP18
-BUTTON_POWER = Pin.board.GP21
+BUTTONS = [Pin.board.GP17,
+           Pin.board.GP18,
+           Pin.board.GP19,
+           Pin.board.GP20,
+           Pin.board.GP21,
+           ]

 # Power
 POWER_EN = Pin.board.GP22
--- a/software/src/hwconfig_breadboard/hwconfig.py
+++ b/software/src/hwconfig_breadboard/hwconfig.py
@@ -27,13 +27,12 @@ RC522_SS = Pin.board.GP13

 # WS2812
 LED_DIN = Pin.board.GP16
-LED_COUNT = 1

 # Buttons
-BUTTON_VOLUP = Pin.board.GP17
-BUTTON_VOLDOWN = Pin.board.GP19
-BUTTON_NEXT = Pin.board.GP18
-BUTTON_POWER = None
+BUTTONS = [Pin.board.GP17,
+           Pin.board.GP18,
+           Pin.board.GP19,
+           ]

 # Power
 POWER_EN = None
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -14,11 +14,12 @@ import ubinascii
 # Own modules
 import app
 from audiocore import AudioContext
+import frozen_frontend  # noqa: F401
 from mfrc522 import MFRC522
 from mp3player import MP3Player
 from nfc import Nfc
 from rp2_neopixel import NeoPixel
-from utils import BTreeFileManager, Buttons, SDContext, TimerManager, LedManager
+from utils import BTreeFileManager, Buttons, SDContext, TimerManager, LedManager, Configuration
 from webserver import start_webserver

 try:
@@ -53,17 +54,25 @@ def setup_wifi():
    print(f"ifconfig: {wlan.ifconfig()}")


+async def wdt_task(wdt):
+    # TODO: more checking of app health
+    # Right now this only protects against the asyncio executor crashing completely
+    while True:
+        await asyncio.sleep_ms(500)
+        wdt.feed()
+
 DB_PATH = '/sd/tonberry.db'

+config = Configuration()
+

 def run():
    asyncio.new_event_loop()
    # Setup LEDs
-    np = NeoPixel(hwconfig.LED_DIN, hwconfig.LED_COUNT, sm=1)
+    np = NeoPixel(hwconfig.LED_DIN, config.get_led_count(), sm=1)

    # Wifi with default config
    setup_wifi()
-    start_webserver()

    # Setup MP3 player
    with SDContext(mosi=hwconfig.SD_DI, miso=hwconfig.SD_DO, sck=hwconfig.SD_SCK, ss=hwconfig.SD_CS,
@@ -87,17 +96,19 @@ def run():
            # Setup app
            deps = app.Dependencies(mp3player=lambda the_app: MP3Player(audioctx, the_app),
                                    nfcreader=lambda the_app: Nfc(reader, the_app),
-                                    buttons=lambda the_app: Buttons(the_app, pin_volup=hwconfig.BUTTON_VOLUP,
-                                                                    pin_voldown=hwconfig.BUTTON_VOLDOWN,
-                                                                    pin_next=hwconfig.BUTTON_NEXT),
+                                    buttons=lambda the_app: Buttons(the_app, config, hwconfig),
                                    playlistdb=lambda _: playlistdb,
                                    hwconfig=lambda _: hwconfig,
-                                    leds=lambda _: LedManager(np))
+                                    leds=lambda _: LedManager(np),
+                                    config=lambda _: config)
            the_app = app.PlayerApp(deps)

+            start_webserver(config, the_app)
            # Start
+            wdt = machine.WDT(timeout=1000)
            asyncio.create_task(aiorepl.task({'timer_manager': TimerManager(),
                                              'app': the_app}))
+            asyncio.create_task(wdt_task(wdt))
            asyncio.get_event_loop().run_forever()


@@ -121,5 +132,5 @@ def builddb():

 if __name__ == '__main__':
    time.sleep(1)
-    if machine.Pin(hwconfig.BUTTON_VOLUP, machine.Pin.IN, machine.Pin.PULL_UP).value() != 0:
+    if machine.Pin(hwconfig.BUTTONS[0], machine.Pin.IN, machine.Pin.PULL_UP).value() != 0:
        run()
--- a/software/src/nfc/nfc.py
+++ b/software/src/nfc/nfc.py
@@ -6,6 +6,7 @@ Copyright (c) 2025 Matthias Blankertz <matthias@blankertz.org>

 import asyncio
 import time
+from utils import safe_callback

 from mfrc522 import MFRC522
 try:
@@ -74,7 +75,7 @@ class Nfc:
                self.last_uid = uid
                self.last_uid_timestamp = time.ticks_us()
            if self.cb is not None and last_callback_uid != uid:
-                self.cb.onTagChange(uid)
+                safe_callback(lambda: self.cb.onTagChange(uid), "nfc tag change")
                last_callback_uid = uid

            await asyncio.sleep_ms(poll_interval_ms)
--- a/software/src/utils/init.py
+++ b/software/src/utils/init.py
@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2025 Matthias Blankertz <matthias@blankertz.org>

+from utils.helpers import safe_callback
 from utils.buttons import Buttons
+from utils.config import Configuration
 from utils.leds import LedManager
 from utils.mbrpartition import MBRPartition
 from utils.pinindex import get_pin_index
@@ -9,5 +11,5 @@ from utils.playlistdb import BTreeDB, BTreeFileManager
 from utils.sdcontext import SDContext
 from utils.timer import TimerManager

-__all__ = ["BTreeDB", "BTreeFileManager", "Buttons", "get_pin_index", "LedManager", "MBRPartition", "SDContext",
-           "TimerManager"]
+__all__ = ["BTreeDB", "BTreeFileManager", "Buttons", "Configuration", "get_pin_index", "LedManager", "MBRPartition",
+           "safe_callback", "SDContext", "TimerManager"]
--- a/software/src/utils/buttons.py
+++ b/software/src/utils/buttons.py
@@ -5,6 +5,7 @@ import asyncio
 import machine
 import micropython
 import time
+from utils import safe_callback
 try:
    from typing import TYPE_CHECKING  # type: ignore
 except ImportError:
@@ -17,14 +18,27 @@ if TYPE_CHECKING:


 class Buttons:
-    def __init__(self, cb: "ButtonCallback", pin_volup=17, pin_voldown=19, pin_next=18):
-        self.VOLUP = micropython.const(1)
-        self.VOLDOWN = micropython.const(2)
-        self.NEXT = micropython.const(3)
+    VOLUP = micropython.const(1)
+    VOLDOWN = micropython.const(2)
+    NEXT = micropython.const(3)
+    PREV = micropython.const(4)
+    PLAY_PAUSE = micropython.const(5)
+    KEYMAP = {VOLUP: 'VOLUP',
+              VOLDOWN: 'VOLDOWN',
+              NEXT: 'NEXT',
+              PREV: 'PREV',
+              PLAY_PAUSE: 'PLAY_PAUSE'}
+
+    def __init__(self, cb: "ButtonCallback", config, hwconfig):
+        self.button_map = config.get_button_map()
+        self.hw_buttons = hwconfig.BUTTONS
        self.cb = cb
-        self.buttons = {machine.Pin(pin_volup, machine.Pin.IN, machine.Pin.PULL_UP): self.VOLUP,
-                        machine.Pin(pin_voldown, machine.Pin.IN, machine.Pin.PULL_UP): self.VOLDOWN,
-                        machine.Pin(pin_next, machine.Pin.IN, machine.Pin.PULL_UP): self.NEXT}
+        self.buttons = dict()
+        for key_id, key_name in self.KEYMAP.items():
+            pin = self._get_pin(key_name)
+            if pin is None:
+                continue
+            self.buttons[pin] = key_id
        self.int_flag = asyncio.ThreadSafeFlag()
        self.pressed: list[int] = []
        self.last: dict[int, int] = {}
@@ -32,6 +46,17 @@ class Buttons:
            button.irq(handler=self._interrupt, trigger=machine.Pin.IRQ_FALLING | machine.Pin.IRQ_RISING)
        asyncio.create_task(self.task())

+    def _get_pin(self, key):
+        key_id = self.button_map.get(key, None)
+        if key_id is None:
+            return None
+        if key_id < 0 or key_id >= len(self.hw_buttons):
+            return None
+        pin = self.hw_buttons[key_id]
+        if pin is not None:
+            pin.init(machine.Pin.IN, machine.Pin.PULL_UP)
+        return pin
+
    def _interrupt(self, button):
        keycode = self.buttons[button]
        last = self.last.get(keycode, 0)
@@ -50,4 +75,4 @@ class Buttons:
            await self.int_flag.wait()
            while len(self.pressed) > 0:
                what = self.pressed.pop()
-                self.cb.onButtonPressed(what)
+                safe_callback(lambda: self.cb.onButtonPressed(what), "button callback")
--- a/software/src/utils/config.py
+++ b/software/src/utils/config.py
@@ -0,0 +1,109 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2025 Matthias Blankertz <matthias@blankertz.org>
+
+from errno import ENOENT
+import json
+import os
+try:
+    from typing import TYPE_CHECKING, Mapping, Any
+except ImportError:
+    TYPE_CHECKING = False
+
+
+class Configuration:
+    DEFAULT_CONFIG = {
+        'LED_COUNT': 1,
+        'IDLE_TIMEOUT_SECS': 60,
+        'TAG_TIMEOUT_SECS': 5,
+        'BUTTON_MAP': {
+            'PLAY_PAUSE': 4,
+            'VOLUP': 0,
+            'VOLDOWN': 2,
+            'PREV': None,
+            'NEXT': 1,
+        },
+        'TAGMODE': 'tagremains'
+    }
+
+    def __init__(self, config_path='/config.json'):
+        self.config_path = config_path
+        try:
+            with open(self.config_path, 'r') as conf_file:
+                self.config = json.load(conf_file)
+            self._merge_configs(self.DEFAULT_CONFIG, self.config)
+        except OSError as ex:
+            if ex.errno == ENOENT:
+                self.config = Configuration.DEFAULT_CONFIG
+                self._save()
+            else:
+                raise
+        except ValueError as ex:
+            print(f"Warning: Could not load configuration {self.config_path}:\n{ex}")
+            self._move_config_to_backup()
+            self.config = Configuration.DEFAULT_CONFIG
+
+    def _move_config_to_backup(self):
+        # Remove old backup
+        try:
+            os.remove(self.config_path + '.bup')
+            os.rename(self.config_path, self.config_path + '.bup')
+        except OSError as ex:
+            if ex.errno != ENOENT:
+                raise
+        os.sync()
+
+    def _merge_configs(self, default, config):
+        for k in default.keys():
+            if k not in config:
+                if isinstance(default[k], dict):
+                    config[k] = default[k].copy()
+                else:
+                    config[k] = default[k]
+            elif isinstance(default[k], dict):
+                self._merge_configs(default[k], config[k])
+
+    def _save(self):
+        with open(self.config_path + '.new', 'w') as conf_file:
+            json.dump(self.config, conf_file)
+        self._move_config_to_backup()
+        os.rename(self.config_path + '.new', self.config_path)
+        os.sync()
+
+    def _get(self, key):
+        return self.config[key]
+
+    def get_led_count(self) -> int:
+        return self._get('LED_COUNT')
+
+    def get_idle_timeout(self) -> int:
+        return self._get('IDLE_TIMEOUT_SECS')
+
+    def get_tag_timeout(self) -> int:
+        return self._get('TAG_TIMEOUT_SECS')
+
+    def get_button_map(self) -> Mapping[str, int | None]:
+        return self._get('BUTTON_MAP')
+
+    def get_tagmode(self) -> str:
+        return self._get('TAGMODE')
+
+    # For the web API
+    def get_config(self) -> Mapping[str, Any]:
+        return self.config
+
+    def _validate(self, default, config, path=''):
+        for k in config.keys():
+            if k not in default:
+                raise ValueError(f'Invalid config key {path}/{k}')
+            if isinstance(default[k], dict):
+                if not isinstance(config[k], dict):
+                    raise ValueError(f'Invalid config: Value of {path}/{k} must be mapping')
+                self._validate(default[k], config[k], f'{path}/{k}')
+
+    def set_config(self, config):
+        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'")
+        self._merge_configs(self.config, config)
+        self.config = config
+        self._save()
--- a/software/src/utils/helpers.py
+++ b/software/src/utils/helpers.py
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2025 Matthias Blankertz <matthias@blankertz.org>
+
+import sys
+
+
+def safe_callback(func, name="callback"):
+    try:
+        func()
+    except Exception as ex:
+        print(f"Uncaught exception in {name}")
+        sys.print_exception(ex)
--- a/software/src/utils/playlistdb.py
+++ b/software/src/utils/playlistdb.py
@@ -31,9 +31,6 @@ class BTreeDB(IPlaylistDB):
    PERSIST_NO = b'no'
    PERSIST_TRACK = b'track'
    PERSIST_OFFSET = b'offset'
-    DEFAULT_SETTINGS = {
-        b'tagmode': b'tagremains'
-    }

    class Playlist(IPlaylist):
        def __init__(self, parent: "BTreeDB", tag: bytes, pos: int, persist, shuffle):
@@ -107,6 +104,17 @@ class BTreeDB(IPlaylistDB):
                self.setPlaybackOffset(0)
            return self.getCurrentPath()

+        def getPrevPath(self):
+            """
+            Select prev track and return path.
+            """
+            if self.pos > 0:
+                self.pos -= 1
+            if self.persist != BTreeDB.PERSIST_NO:
+                self.parent._setPlaylistPos(self.tag, self.pos)
+                self.setPlaybackOffset(0)
+            return self.getCurrentPath()
+
        def setPlaybackOffset(self, offset):
            """
            Store the current position in the track for PERSIST_OFFSET mode
@@ -271,11 +279,6 @@ class BTreeDB(IPlaylistDB):
        self._savePlaylist(tag, entries, persist, shuffle)
        return self.getPlaylistForTag(tag)

-    def getSetting(self, key: bytes | str) -> str:
-        if type(key) is str:
-            key = key.encode()
-        return self.db.get(b'settings/' + key, self.DEFAULT_SETTINGS[key]).decode()
-
    def validate(self, dump=False):
        """
        Validate the structure of the playlist database.
@@ -295,8 +298,7 @@ class BTreeDB(IPlaylistDB):
                fail(f'Malformed key {k!r}')
                continue
            if fields[0] == b'settings':
-                val = self.db[k].decode()
-                print(f'Setting {fields[1].decode()} = {val}')
+                # Legacy, not used any more
                continue
            if last_tag != fields[0]:
                last_tag = fields[0]
--- a/software/src/utils/timer.py
+++ b/software/src/utils/timer.py
@@ -4,6 +4,7 @@
 import asyncio
 import heapq
 import time
+from utils import safe_callback

 TIMER_DEBUG = True

@@ -22,6 +23,7 @@ class TimerManager(object):

    def schedule(self, when, what):
        cur_nearest = self.timers[0][0] if len(self.timers) > 0 else None
+        self._remove_timer(what)  # Ensure timer is not already scheduled
        heapq.heappush(self.timers, (when, what))
        if cur_nearest is None or cur_nearest > self.timers[0][0]:
            # New timer is closer than previous closest timer
@@ -31,41 +33,53 @@ class TimerManager(object):
            self.worker_event.set()

    def cancel(self, what):
-        try:
-            (when, _), i = next(filter(lambda item: item[0][1] == what, zip(self.timers, range(len(self.timers)))))
-        except StopIteration:
-            return False
-        del self.timers[i]
-        heapq.heapify(self.timers)
-        if i == 0:
+        remove_idx = self._remove_timer(what)
+        if remove_idx == 0:
            # Cancel timer was closest timer
            if self.timer_debug:
                print("cancel: wake")
            self.worker_event.set()
        return True

+    def _remove_timer(self, what):
+        try:
+            (when, _), i = next(filter(lambda item: item[0][1] == what, zip(self.timers, range(len(self.timers)))))
+        except StopIteration:
+            return False
+        del self.timers[i]
+        heapq.heapify(self.timers)
+        return i
+
+    def _next_timeout(self):
+        if len(self.timers) == 0:
+            if self.timer_debug:
+                print("timer: worker: queue empty")
+            return None
+        cur_nearest = self.timers[0][0]
+        next_timeout = cur_nearest - time.ticks_ms()
+        if self.timer_debug:
+            if next_timeout > 0:
+                print(f"timer: worker: next is {self.timers[0]}, sleep {next_timeout} ms")
+            else:
+                print(f"timer: worker: {self.timers[0]} elapsed @{cur_nearest}, delay {-next_timeout} ms")
+        return next_timeout
+
+    async def _wait(self, timeout):
+        try:
+            await asyncio.wait_for_ms(self.worker_event.wait(), timeout)
+            if self.timer_debug:
+                print("timer: worker: event")
+            # got woken up due to event
+            self.worker_event.clear()
+            return True
+        except asyncio.TimeoutError:
+            return False
+
    async def _timer_worker(self):
        while True:
-            if len(self.timers) == 0:
-                # Nothing to do
-                await self.worker_event.wait()
-                if self.timer_debug:
-                    print("_timer_worker: event 0")
-                self.worker_event.clear()
-                continue
-            cur_nearest = self.timers[0][0]
-            wait_time = cur_nearest - time.ticks_ms()
-            if wait_time > 0:
-                if self.timer_debug:
-                    print(f"_timer_worker: next is {self.timers[0]}, sleep {wait_time} ms")
-                try:
-                    await asyncio.wait_for_ms(self.worker_event.wait(), wait_time)
-                    if self.timer_debug:
-                        print("_timer_worker: event 1")
-                    # got woken up due to event
-                    self.worker_event.clear()
-                    continue
-                except asyncio.TimeoutError:
-                    pass
-            _, callback = heapq.heappop(self.timers)
-            callback()
+            next_timeout = self._next_timeout()
+            if next_timeout is None or next_timeout > 0:
+                await self._wait(next_timeout)
+            else:
+                _, callback = heapq.heappop(self.timers)
+                safe_callback(callback, "timer callback")
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -5,18 +5,31 @@ Copyright (c) 2024-2025 Stefan Kratochwil <Kratochwil-LA@gmx.de>

 import asyncio

-from microdot import Microdot
+from microdot import Microdot, redirect, send_file

 webapp = Microdot()
 server = None
+config = None
+app = None
+nfc = None


-def start_webserver():
-    global server
+def start_webserver(config_, app_):
+    global server, config, app, nfc
    server = asyncio.create_task(webapp.start_server(port=80))
+    config = config_
+    app = app_
+    nfc = app.get_nfc()


-@webapp.route('/')
+@webapp.before_request
+async def before_request_handler(request):
+    if request.method in ['PUT', 'POST'] and app.is_playing():
+        return "Cannot write to device while playback is active", 503
+    app.reset_idle_timeout()
+
+
+@webapp.route('/api/v1/hello')
 async def index(request):
    print("wohoo, a guest :)")
    print(f"  app: {request.app}")
@@ -39,3 +52,41 @@ async def filesystem_post(request):
 async def playlist_post(request):
    print(request)
    return {'success': False}
+
+
+@webapp.route('/api/v1/config', methods=['GET'])
+async def config_get(request):
+    return config.get_config()
+
+
+@webapp.route('/api/v1/config', methods=['PUT'])
+async def config_put(request):
+    try:
+        config.set_config(request.json)
+    except ValueError as ex:
+        return str(ex), 400
+    return '', 204
+
+
+@webapp.route('/api/v1/last_tag_uid', methods=['GET'])
+async def last_tag_uid_get(request):
+    tag, _ = nfc.get_last_uid()
+    return {'tag': tag}
+
+
+@webapp.route('/', methods=['GET'])
+async def root_get(request):
+    return redirect('/index.html')
+
+
+@webapp.route('/index.html', methods=['GET'])
+async def index_get(request):
+    return send_file('/frontend/index.html.gz', content_type='text/html', compressed='gzip')
+
+
+@webapp.route('/static/<path:path>', methods=['GET'])
+async def static(request, path):
+    if '..' in path:
+        # directory traversal is not allowed
+        return 'Not found', 404
+    return send_file('/frontend/static/' + path, max_age=86400)
--- a/software/tests/test_playerapp.py
+++ b/software/tests/test_playerapp.py
@@ -124,6 +124,22 @@ class FakeLeds:
        self.state = state


+class FakeConfig:
+    def __init__(self): pass
+
+    def get_led_count(self):
+        return 1
+
+    def get_idle_timeout(self):
+        return 60
+
+    def get_tag_timeout(self):
+        return 5
+
+    def get_tagmode(self):
+        return 'tagremains'
+
+
 def fake_open(filename, mode):
    return FakeFile(filename, mode)

@@ -136,13 +152,14 @@ def faketimermanager(monkeypatch):


 def _makedeps(mp3player=FakeMp3Player, nfcreader=FakeNfcReader, buttons=FakeButtons,
-              playlistdb=FakePlaylistDb, hwconfig=FakeHwconfig, leds=FakeLeds):
+              playlistdb=FakePlaylistDb, hwconfig=FakeHwconfig, leds=FakeLeds, config=FakeConfig):
    return app.Dependencies(mp3player=lambda _: mp3player() if callable(mp3player) else mp3player,
                            nfcreader=lambda x: nfcreader(x) if callable(nfcreader) else nfcreader,
                            buttons=lambda _: buttons() if callable(buttons) else buttons,
                            playlistdb=lambda _: playlistdb() if callable(playlistdb) else playlistdb,
                            hwconfig=lambda _: hwconfig() if callable(hwconfig) else hwconfig,
-                            leds=lambda _: leds() if callable(leds) else leds)
+                            leds=lambda _: leds() if callable(leds) else leds,
+                            config=lambda _: config() if callable(config) else config)


 def test_construct_app(micropythonify, faketimermanager):
@@ -212,18 +229,16 @@ def test_playlist_unknown_tag(micropythonify, faketimermanager, monkeypatch):


 def test_tagmode_startstop(micropythonify, faketimermanager, monkeypatch):
-    class MyFakePlaylistDb(FakePlaylistDb):
-        def __init__(self, tracklist=[b'test/path.mp3']):
-            super().__init__(tracklist)
+    class FakeStartStopConfig(FakeConfig):
+        def __init__(self):
+            super().__init__()

-        def getSetting(self, key: bytes | str):
-            if key == 'tagmode':
-                return 'tagstartstop'
-            return None
+        def get_tagmode(self):
+            return 'tagstartstop'

-    fake_db = MyFakePlaylistDb()
+    fake_db = FakePlaylistDb([b'test/path.mp3'])
    fake_mp3 = FakeMp3Player()
-    deps = _makedeps(mp3player=fake_mp3, playlistdb=fake_db)
+    deps = _makedeps(mp3player=fake_mp3, playlistdb=fake_db, config=FakeStartStopConfig)
    app.PlayerApp(deps)
    with monkeypatch.context() as m:
        m.setattr(builtins, 'open', fake_open)
@@ -250,16 +265,7 @@ def test_tagmode_startstop(micropythonify, faketimermanager, monkeypatch):


 def test_tagmode_remains(micropythonify, faketimermanager, monkeypatch):
-    class MyFakePlaylistDb(FakePlaylistDb):
-        def __init__(self, tracklist=[b'test/path.mp3']):
-            super().__init__(tracklist)
-
-        def getSetting(self, key: bytes | str):
-            if key == 'tagmode':
-                return 'tagremains'
-            return None
-
-    fake_db = MyFakePlaylistDb()
+    fake_db = FakePlaylistDb([b'test/path.mp3'])
    fake_mp3 = FakeMp3Player()
    deps = _makedeps(mp3player=fake_mp3, playlistdb=fake_db)
    app.PlayerApp(deps)
Author	SHA1	Message	Date
Matthias Blankertz	e5a2f7bc78	wip: frontend All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 5m5s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 7s Details Run pytests / Check-Pytest (push) Successful in 10s Details	2025-12-17 21:38:05 +01:00
Matthias Blankertz	735167db22	Merge branch '30-frontend' into mbl-next All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m38s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 4s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 7s Details Run pytests / Check-Pytest (push) Successful in 10s Details	2025-12-17 19:11:10 +01:00
Matthias Blankertz	11e31aabc2	Merge remote-tracking branch 'origin/webapi-last-tag-uid' into mbl-next	2025-12-17 18:39:26 +01:00
Matthias Blankertz	32e996e446	build: add requirements.txt for host python deps All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m40s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 8s Details Run pytests / Check-Pytest (push) Successful in 11s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-17 18:37:34 +01:00
Stefan Kratochwil	32bf6a8d68	always return content type application/json All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m36s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 8s Details Run pytests / Check-Pytest (push) Successful in 10s Details	2025-12-16 23:13:04 +01:00
Matthias Blankertz	49197c8ca4	Merge pull request 'feat: Move tagmode setting to config.json, remove playlistdb settings' (#57 ) from unify-config into main All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m38s Details Check code formatting / Check-C-Format (push) Successful in 6s Details Check code formatting / Check-Python-Flake8 (push) Successful in 9s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 8s Details Run pytests / Check-Pytest (push) Successful in 11s Details Reviewed-on: #57 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-12-16 21:55:28 +00:00
Stefan Kratochwil	e2f9287ebd	feat: last connected tag uid available at /api/v1/last_tag_uid All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m39s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 9s Details Run pytests / Check-Pytest (push) Successful in 11s Details	2025-12-16 22:41:55 +01:00
Matthias Blankertz	19dff763bd	feat: webserver: keep alive; move playback write prot to handler - Reset the app idle timer when interacting with the webapp, so that the device does not turn off while the web ui is used. - Handle denying put/post while playback is active centrally in the before_request handler, so that it does not need to be copy/pasted into every request handler. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 22:34:06 +01:00
Matthias Blankertz	b20a31ccf4	feat: webserver: redirect / to /index.html All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m41s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 9s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 4s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 7s Details Run pytests / Check-Pytest (push) Successful in 10s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 21:01:18 +01:00
Matthias Blankertz	8a2d621c7d	feat: webserver: keep alive; move playback write prot to handler - Reset the app idle timer when interacting with the webapp, so that the device does not turn off while the web ui is used. - Handle denying put/post while playback is active centrally in the before_request handler, so that it does not need to be copy/pasted into every request handler. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 20:48:01 +01:00
Matthias Blankertz	e447902001	feat: Move tagmode setting to config.json, remove playlistdb settings All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m35s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 9s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 8s Details Run pytests / Check-Pytest (push) Successful in 10s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 20:41:40 +01:00
Matthias Blankertz	93ea5036dc	feat: config frontend Implement nicer configuration UI: - Show human-readable names for config settings - Show error message received from server if storing settings fails - Show appropriate input elements for enum choice and numerical inputs Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 20:41:40 +01:00
Matthias Blankertz	aee5a48967	fix: config: Merge defaults into config at load time Merge defaults into config at load time to ensure that all config options show up in the configuration dialog, even if they were added after the local configuration was last changed. Also use the merge method to merge the local config with the new config in set_config, ensuring the config contains all keys even if the submitted config leaves some out. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 20:41:40 +01:00
Matthias Blankertz	936020df58	feat: Add and deploy frontend Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 20:41:40 +01:00
Matthias Blankertz	768b630722	Merge pull request 'misc-stability-improvements' (#56 ) from misc-stability-improvements into main All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m36s Details Check code formatting / Check-C-Format (push) Successful in 7s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 7s Details Run pytests / Check-Pytest (push) Successful in 10s Details Reviewed-on: #56 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-12-16 19:25:44 +00:00
Matthias Blankertz	e0ff9c54bc	refactor: timer: split out two helpers from _timer_worker All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m35s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 5s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 8s Details Run pytests / Check-Pytest (push) Successful in 11s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-16 20:19:30 +01:00
Matthias Blankertz	c0b9ef2961	fix: timer: handle modifications to timers when _timer_worker is already scheduled correctly All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m45s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 11s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 10s Details Run pytests / Check-Pytest (push) Successful in 12s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-07 13:25:35 +01:00
Matthias Blankertz	e23f8bd34c	fix: exceptions in callback should not terminate caller All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m46s Details Check code formatting / Check-C-Format (push) Successful in 9s Details Check code formatting / Check-Python-Flake8 (push) Successful in 11s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 10s Details Run pytests / Check-Pytest (push) Successful in 13s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-07 13:09:34 +01:00
Matthias Blankertz	97e9742c75	feat: Add basic watchdog timer Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-07 13:09:34 +01:00
Stefan Kratochwil	c687e3a977	Merge pull request 'feat: copy build unix executable to other build artifacts' (#54 ) from feat/publish_unix_build into main All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m40s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 10s Details Run pytests / Check-Pytest (push) Successful in 12s Details Reviewed-on: #54	2025-12-03 20:11:49 +00:00
Stefan Kratochwil	aa1a02ce54	feat: copy build unix executable to other build artifacts All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m45s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 11s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 8s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 10s Details Run pytests / Check-Pytest (push) Successful in 12s Details	2025-12-03 21:00:26 +01:00
Matthias Blankertz	3e888790e4	Merge pull request 'fix: Block certain requests during playback' (#55 ) from block-requests-during-playback into main All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m43s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 11s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 9s Details Run pytests / Check-Pytest (push) Successful in 12s Details Reviewed-on: #55 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-12-03 19:59:46 +00:00
Matthias Blankertz	96759c999c	fix: Block certain requests during playback All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m42s Details Check code formatting / Check-C-Format (push) Successful in 9s Details Check code formatting / Check-Python-Flake8 (push) Successful in 12s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 7s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 10s Details Run pytests / Check-Pytest (push) Successful in 13s Details Probably due to memory/stack overrun, some more involved web API requests cause the system to hang if performed during playback. For now, block these requests during playback. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-03 20:36:41 +01:00
Matthias Blankertz	82ed3a3c2e	Merge pull request '27-configuration-storage' (#53 ) from 27-configuration-storage into main All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m42s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 10s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 9s Details Run pytests / Check-Pytest (push) Successful in 12s Details Reviewed-on: #53 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-12-03 19:20:26 +00:00
Matthias Blankertz	a7e58853bb	feat: Add api/v1/config to get, put config All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m40s Details Check code formatting / Check-C-Format (push) Successful in 9s Details Check code formatting / Check-Python-Flake8 (push) Successful in 12s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 10s Details Run pytests / Check-Pytest (push) Successful in 12s Details Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-03 20:12:29 +01:00
Matthias Blankertz	2e1bc7782b	fix: Ensure each timer can only be scheduled once All checks were successful Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m58s Details Check code formatting / Check-C-Format (push) Successful in 8s Details Check code formatting / Check-Python-Flake8 (push) Successful in 11s Details Check code formatting / Check-Bash-Shellcheck (push) Successful in 6s Details Run unit tests on host / Run-Unit-Tests (push) Successful in 10s Details Run pytests / Check-Pytest (push) Successful in 13s Details If a timer is scheduled with the timer manager while it is already scheduled, the new exipry time should override the prev. expiry time instead of adding a second instance of the same timer function. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-01 20:25:30 +01:00
Matthias Blankertz	fa0e23ee87	feat: Add play/pause and prev track function Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-01 20:25:30 +01:00
Matthias Blankertz	856bf34161	feat: Make button mapping configurable - Remove Pin to button mapping from hwconfig, replace with a simple list of Pins to which buttons are attached - Add BUTTON_MAP to config.json which maps indices in the HW button list to button names - Update utils.Buttons to use the button map to connect the correct pins to the matching key codes Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-01 20:25:30 +01:00
Matthias Blankertz	83deb1b4c2	feat: Replace hardcoded timeouts in app with configurable Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-01 20:25:30 +01:00
Matthias Blankertz	2225906664	feat: Move LED_COUNT from hwconfig to config.json Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-01 20:25:30 +01:00
Matthias Blankertz	176fc66c17	feat: config store Load a config.json file from the root of the littlefs flash filesystem. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-12-01 20:25:30 +01:00