feat: allow reboot commands only if usb cable is inserted

2025-12-21 17:43:00 +01:00
10 changed files with 26 additions and 197 deletions
--- a/software/boards/RPI_PICO_W/board.c
+++ b/software/boards/RPI_PICO_W/board.c
@@ -1,29 +0,0 @@
-// 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);
--- a/software/boards/RPI_PICO_W/mpconfigboard.cmake
+++ b/software/boards/RPI_PICO_W/mpconfigboard.cmake
@@ -20,22 +20,3 @@ 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}")
--- a/software/frontend/index.html
+++ b/software/frontend/index.html
@@ -131,12 +131,6 @@
        list-style: none;
    }

-    .footer {
-        font-size: x-small;
-        color: gray;
-        margin-top: 20px;
-    }
-
 </style>
 </head>
 <body>
@@ -159,8 +153,6 @@
        <li><button onclick="showScreen('playlist')">Open Playlist Editor</button></li>
        <!-- More screens can be added later -->
    </ul>
-    <hr>
-    <button onclick="requestReboot()">Reboot to bootloader</button>
 </div>

 <!-- CONFIG EDITOR SCREEN -->
@@ -263,17 +255,7 @@
        </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;
@@ -360,21 +342,6 @@
                    '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'
            },
@@ -384,12 +351,6 @@
            'root.LED_COUNT': {
                'input-type': 'number'
            },
-            'root.WLAN.SSID': {
-                'input-type': 'text'
-            },
-            'root.WLAN.PASSPHRASE': {
-                'input-type': 'text'
-            }
        };
    
        function renderObject(obj, path) {
@@ -460,7 +421,7 @@
        
                let val = input.value.trim();
                if (val === "") val = null;
-                else if (!isNaN(val) && input.type != 'text') val = Number(val);
+                else if (!isNaN(val)) val = Number(val);
        
                current[path[path.length - 1]] = val;
            });
@@ -1003,14 +964,6 @@
        
        return { init, onShow };
    })();
-
-// Misc
-    async function requestReboot() {
-        const resp = await fetch('/api/v1/reboot/bootloader', {'method': 'POST'});
-        if (!resp.ok) {
-            alert('Reboot to bootloader failed: ' + await resp.text());
-        }
-    }
    
 // Initialization
    Object.values(Screens).forEach(screen => {
@@ -1018,13 +971,6 @@
    });

    showScreen("menu");
-
-    fetch('/api/v1/info')
-        .then((resp) => resp.json())
-        .then((info) => {
-            const version = document.getElementById('footer-version');
-            version.innerText = info.version;
-        });
 </script>

 </body>
--- a/software/lib/microdot
+++ b/software/lib/microdot
--- a/software/src/app.py
+++ b/software/src/app.py
@@ -196,5 +196,8 @@ class PlayerApp:
    def get_playlist_db(self):
        return self.playlist_db

+    def get_timer_manager(self):
+        return self.timer_manager
+
    def get_leds(self):
        return self.leds
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -10,7 +10,6 @@ import network
 import os
 import time
 import ubinascii
-import sys

 # Own modules
 import app
@@ -38,22 +37,14 @@ hwconfig.board_init()
 machine.mem32[0x40030000 + 0x00] = 0x10


-def setup_wifi(ssid='', passphrase='', sec=network.WLAN.SEC_WPA2_WPA3):
+def setup_wifi():
    network.hostname("TonberryPico")
-    if 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, security=sec)
+    wlan = network.WLAN(network.WLAN.IF_AP)
+    wlan.config(ssid=f"TonberryPicoAP_{machine.unique_id().hex()}", security=wlan.SEC_OPEN)
+    wlan.active(True)

-    # configure power management
-    wlan.config(pm=network.WLAN.PM_PERFORMANCE)
+    # disable power management
+    wlan.config(pm=network.WLAN.PM_NONE)

    mac = ubinascii.hexlify(network.WLAN().config('mac'), ':').decode()
    print(f"     mac: {mac}")
@@ -74,22 +65,14 @@ 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:
-        setup_wifi(config.get_wifi_ssid(), config.get_wifi_passphrase())
+    # Wifi with default config
+    setup_wifi()

    # Setup MP3 player
    with SDContext(mosi=hwconfig.SD_DI, miso=hwconfig.SD_DO, sck=hwconfig.SD_SCK, ss=hwconfig.SD_CS,
@@ -147,24 +130,7 @@ 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:
-        try:
-            run()
-        except Exception as ex:
-            sys.print_exception(ex)
-            error_blink()
-    else:
-        np.fill((32, 0, 0))
-        np.write()
+        run()
--- a/software/src/utils/init.py
+++ b/software/src/utils/init.py
@@ -2,7 +2,6 @@
 # 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
@@ -10,6 +9,7 @@ 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"]
--- 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, TimerManager
+from utils import safe_callback
 try:
    from typing import TYPE_CHECKING  # type: ignore
 except ImportError:
@@ -32,7 +32,6 @@ 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():
@@ -43,7 +42,6 @@ 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())
@@ -71,10 +69,6 @@ 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:
@@ -82,9 +76,3 @@ 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()
--- a/software/src/utils/config.py
+++ b/software/src/utils/config.py
@@ -22,11 +22,7 @@ class Configuration:
            'PREV': None,
            'NEXT': 1,
        },
-        'TAGMODE': 'tagremains',
-        'WIFI': {
-            'SSID': '',
-            'PASSPHRASE': '',
-        }
+        'TAGMODE': 'tagremains'
    }

    def __init__(self, config_path='/config.json'):
@@ -91,12 +87,6 @@ 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
--- a/software/src/webserver.py
+++ b/software/src/webserver.py
@@ -4,14 +4,11 @@ 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
@@ -31,13 +28,13 @@ 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(host='::0', port=80))
+    server = asyncio.create_task(webapp.start_server(port=80))
    config = config_
    app = app_
    nfc = app.get_nfc()
    playlist_db = app.get_playlist_db()
    leds = app.get_leds()
-    timer_manager = TimerManager()
+    timer_manager = app.get_timer_manager()


@webapp.before_request
@@ -219,17 +216,11 @@ async def audiofile_upload(request):
        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
+            bytes_read = await request.stream.readinto(data)
            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
+            bytes_written = newfile.write(data[:bytes_read])
            if bytes_written != bytes_read:
                # short writes shouldn't happen
                return 'write failure', 500
@@ -268,21 +259,14 @@ 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
+        return 'not allowed: no vbus', 403

    if method == 'bootloader':
        leds.set_state(LedManager.REBOOTING)
        timer_manager.schedule(time.ticks_ms() + 1500, machine.bootloader)
-    elif method == 'application':
+    elif method =='application':
        leds.set_state(LedManager.REBOOTING)
        timer_manager.schedule(time.ticks_ms() + 1500, machine.reset)
    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}