Merge branch 'file-upload' into mbl-next

Also make response from api more understandable for non-technical users.

Signed-off-by: Matthias Blankertz <matthias@blankertz.org>

software/frontend/index.html

@@ -153,6 +153,8 @@
         <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 -->
@@ -964,6 +966,14 @@
         
         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 => {

software/src/app.py

@@ -195,3 +195,6 @@ class PlayerApp:
 
     def get_playlist_db(self):
         return self.playlist_db
+
+    def get_leds(self):
+        return self.leds

software/src/utils/leds.py

@@ -10,6 +10,7 @@ import time
 class LedManager:
     IDLE = const(0)
     PLAYING = const(1)
+    REBOOTING = const(2)
 
     def __init__(self, np):
         self.led_state = LedManager.IDLE
@@ -19,7 +20,7 @@ class LedManager:
         asyncio.create_task(self.run())
 
     def set_state(self, state):
-        assert state in [LedManager.IDLE, LedManager.PLAYING]
+        assert state in [LedManager.IDLE, LedManager.PLAYING, LedManager.REBOOTING]
         self.led_state = state
 
     def _gamma(self, value, X=2.2):
@@ -50,6 +51,8 @@ class LedManager:
                 self._pulse(time_, (0, 1, 0), 3)
             elif self.led_state == LedManager.PLAYING:
                 self._rainbow(time_)
+            elif self.led_state == LedManager.REBOOTING:
+                self._pulse(time_, (1, 0, 1), 0.2)
             time_ += 0.02
             before = time.ticks_ms()
             await self.np.async_write()

software/src/webserver.py

@@ -4,11 +4,15 @@ Copyright (c) 2024-2025 Stefan Kratochwil <Kratochwil-LA@gmx.de>
 '''
 
 import asyncio
+import hwconfig
 import json
+import machine
 import os
+import time
 
 from array import array
 from microdot import Microdot, redirect, send_file, Request
+from utils import TimerManager, LedManager
 
 webapp = Microdot()
 server = None
@@ -16,17 +20,21 @@ config = None
 app = None
 nfc = None
 playlist_db = None
+leds = None
+timer_manager = None
 
 Request.max_content_length = 128 * 1024 * 1024  # 128MB requests allowed
 
 
 def start_webserver(config_, app_):
-    global server, config, app, nfc, playlist_db
+    global server, config, app, nfc, playlist_db, leds, timer_manager
     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()
 
 
 @webapp.before_request
@@ -246,3 +254,19 @@ async def audiofile_delete(request):
     path = fsroot + '/' + request.args['location']
     recursive_delete(path)
     return '', 204
+
+
+@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':
+        leds.set_state(LedManager.REBOOTING)
+        timer_manager.schedule(time.ticks_ms() + 1500, machine.bootloader)
+    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