From 73d98494c9102ea6c2917a3c76187766cf895f57 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak <dos@dosowisko.net> Date: Thu, 21 Sep 2023 01:51:30 +0200 Subject: [PATCH] py: Consistently use st3m.run.run_app --- docs/badge/programming.rst | 2 +- python_payload/apps/audio_passthrough/__init__.py | 2 +- python_payload/apps/demo_cap_touch/main.py | 2 +- python_payload/apps/demo_imu/__init__.py | 2 +- python_payload/apps/demo_melodic/__init__.py | 2 +- python_payload/apps/demo_scroll/__init__.py | 2 +- python_payload/apps/demo_worms/__init__.py | 2 +- python_payload/apps/led_painter/__init__.py | 2 +- python_payload/apps/nick/__init__.py | 2 +- python_payload/apps/otamatone/__init__.py | 4 ++-- python_payload/apps/tiny_sampler/__init__.py | 2 +- python_payload/st3m/run.py | 1 + 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/badge/programming.rst b/docs/badge/programming.rst index 9dc85ab6fe..65dcd1e14a 100644 --- a/docs/badge/programming.rst +++ b/docs/badge/programming.rst @@ -577,7 +577,7 @@ Here is our previous code changed to use `Application` for the base of its main if __name__ == '__main__': # Continue to make runnable via mpremote run. - st3m.run.run_view(MyDemo(ApplicationContext())) + st3m.run.run_app(MyDemo) Using `Application` also gives you access to the `ApplicationContext`, which for example gives you a way to find out the base path of your app, in `app_ctx.bundle_path` or its diff --git a/python_payload/apps/audio_passthrough/__init__.py b/python_payload/apps/audio_passthrough/__init__.py index 3fc06c72c4..9614e0be48 100644 --- a/python_payload/apps/audio_passthrough/__init__.py +++ b/python_payload/apps/audio_passthrough/__init__.py @@ -142,4 +142,4 @@ class AudioPassthrough(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(AudioPassthrough(ApplicationContext())) + st3m.run.run_app(AudioPassthrough) diff --git a/python_payload/apps/demo_cap_touch/main.py b/python_payload/apps/demo_cap_touch/main.py index a801d829cf..d39fb9ed33 100644 --- a/python_payload/apps/demo_cap_touch/main.py +++ b/python_payload/apps/demo_cap_touch/main.py @@ -86,4 +86,4 @@ class CapTouchDemo(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(CapTouchDemo(ApplicationContext())) + st3m.run.run_app(CapTouchDemo) diff --git a/python_payload/apps/demo_imu/__init__.py b/python_payload/apps/demo_imu/__init__.py index b20b8d7cb4..268706cdff 100644 --- a/python_payload/apps/demo_imu/__init__.py +++ b/python_payload/apps/demo_imu/__init__.py @@ -43,4 +43,4 @@ class IMUDemo(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(IMUDemo(ApplicationContext())) + st3m.run.run_app(IMUDemo) diff --git a/python_payload/apps/demo_melodic/__init__.py b/python_payload/apps/demo_melodic/__init__.py index c6adf847d7..b926ae2fca 100644 --- a/python_payload/apps/demo_melodic/__init__.py +++ b/python_payload/apps/demo_melodic/__init__.py @@ -230,4 +230,4 @@ class MelodicApp(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(MelodicApp(ApplicationContext())) + st3m.run.run_app(MelodicApp) diff --git a/python_payload/apps/demo_scroll/__init__.py b/python_payload/apps/demo_scroll/__init__.py index b4eebad188..c6efb3abc7 100644 --- a/python_payload/apps/demo_scroll/__init__.py +++ b/python_payload/apps/demo_scroll/__init__.py @@ -76,4 +76,4 @@ class ScrollDemo(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(ScrollDemo(ApplicationContext())) + st3m.run.run_app(ScrollDemo) diff --git a/python_payload/apps/demo_worms/__init__.py b/python_payload/apps/demo_worms/__init__.py index e380ce746a..d256ff708c 100644 --- a/python_payload/apps/demo_worms/__init__.py +++ b/python_payload/apps/demo_worms/__init__.py @@ -134,4 +134,4 @@ class Worm: if __name__ == "__main__": import st3m.run - st3m.run.run_view(AppWorms(ApplicationContext())) + st3m.run.run_app(AppWorms) diff --git a/python_payload/apps/led_painter/__init__.py b/python_payload/apps/led_painter/__init__.py index 700880f655..035949ef5c 100644 --- a/python_payload/apps/led_painter/__init__.py +++ b/python_payload/apps/led_painter/__init__.py @@ -284,4 +284,4 @@ class LEDPainter(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(LEDPainter(ApplicationContext())) + st3m.run.run_app(LEDPainter) diff --git a/python_payload/apps/nick/__init__.py b/python_payload/apps/nick/__init__.py index 0f7bb05351..210c8649d0 100644 --- a/python_payload/apps/nick/__init__.py +++ b/python_payload/apps/nick/__init__.py @@ -188,4 +188,4 @@ class NickApp(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(NickApp(ApplicationContext())) + st3m.run.run_app(NickApp) diff --git a/python_payload/apps/otamatone/__init__.py b/python_payload/apps/otamatone/__init__.py index 6b483010b7..f4c46484e4 100644 --- a/python_payload/apps/otamatone/__init__.py +++ b/python_payload/apps/otamatone/__init__.py @@ -204,6 +204,6 @@ class Otamatone(Application): if __name__ == "__main__": - from st3m.run import run_view + from st3m.run import run_app - run_view(Otamatone(ApplicationContext())) + run_app(Otamatone) diff --git a/python_payload/apps/tiny_sampler/__init__.py b/python_payload/apps/tiny_sampler/__init__.py index 3b50316bdf..eac6d1bcda 100644 --- a/python_payload/apps/tiny_sampler/__init__.py +++ b/python_payload/apps/tiny_sampler/__init__.py @@ -290,4 +290,4 @@ class TinySampler(Application): if __name__ == "__main__": import st3m.run - st3m.run.run_view(TinySampler(ApplicationContext())) + st3m.run.run_app(TinySampler) diff --git a/python_payload/st3m/run.py b/python_payload/st3m/run.py index b7e278fdac..83c5ea6dba 100644 --- a/python_payload/st3m/run.py +++ b/python_payload/st3m/run.py @@ -243,4 +243,5 @@ __all__ = [ "run_responder", "run_view", "run_main", + "run_app", ] -- GitLab