Merge branch 'misc-fixes' into mbl-next
All checks were successful
Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m38s
Check code formatting / Check-C-Format (push) Successful in 7s
Check code formatting / Check-Python-Flake8 (push) Successful in 10s
Check code formatting / Check-Bash-Shellcheck (push) Successful in 4s
Run unit tests on host / Run-Unit-Tests (push) Successful in 8s
Run pytests / Check-Pytest (push) Successful in 11s
All checks were successful
Build RPi Pico firmware image / Build-Firmware (push) Successful in 4m38s
Check code formatting / Check-C-Format (push) Successful in 7s
Check code formatting / Check-Python-Flake8 (push) Successful in 10s
Check code formatting / Check-Bash-Shellcheck (push) Successful in 4s
Run unit tests on host / Run-Unit-Tests (push) Successful in 8s
Run pytests / Check-Pytest (push) Successful in 11s
This commit was merged in pull request #61.
This commit is contained in:
Submodule software/lib/micropython updated: 4ecb4099cf...6fdbf1d339
@@ -104,9 +104,6 @@ class PlayerApp:
|
|||||||
self._pause_toggle()
|
self._pause_toggle()
|
||||||
|
|
||||||
def onPlaybackDone(self):
|
def onPlaybackDone(self):
|
||||||
assert self.mp3file is not None
|
|
||||||
self.mp3file.close()
|
|
||||||
self.mp3file = None
|
|
||||||
self._play_next()
|
self._play_next()
|
||||||
|
|
||||||
def onIdleTimeout(self):
|
def onIdleTimeout(self):
|
||||||
@@ -141,9 +138,7 @@ class PlayerApp:
|
|||||||
self.playlist = None
|
self.playlist = None
|
||||||
|
|
||||||
def _play_next(self):
|
def _play_next(self):
|
||||||
if self.playlist is None:
|
filename = self.playlist.getNextPath() if self.playlist is not None else None
|
||||||
return
|
|
||||||
filename = self.playlist.getNextPath()
|
|
||||||
self._play(filename)
|
self._play(filename)
|
||||||
if filename is None:
|
if filename is None:
|
||||||
self.playlist = None
|
self.playlist = None
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ async def wdt_task(wdt):
|
|||||||
# TODO: more checking of app health
|
# TODO: more checking of app health
|
||||||
# Right now this only protects against the asyncio executor crashing completely
|
# Right now this only protects against the asyncio executor crashing completely
|
||||||
while True:
|
while True:
|
||||||
await asyncio.sleep_ms(500)
|
await asyncio.sleep_ms(100)
|
||||||
wdt.feed()
|
wdt.feed()
|
||||||
|
|
||||||
DB_PATH = '/sd/tonberry.db'
|
DB_PATH = '/sd/tonberry.db'
|
||||||
@@ -105,7 +105,7 @@ def run():
|
|||||||
|
|
||||||
start_webserver(config, the_app)
|
start_webserver(config, the_app)
|
||||||
# Start
|
# Start
|
||||||
wdt = machine.WDT(timeout=1000)
|
wdt = machine.WDT(timeout=2000)
|
||||||
asyncio.create_task(aiorepl.task({'timer_manager': TimerManager(),
|
asyncio.create_task(aiorepl.task({'timer_manager': TimerManager(),
|
||||||
'app': the_app}))
|
'app': the_app}))
|
||||||
asyncio.create_task(wdt_task(wdt))
|
asyncio.create_task(wdt_task(wdt))
|
||||||
|
|||||||
Reference in New Issue
Block a user