diff --git a/components/micropython/usermodule/mp_sys_display.c b/components/micropython/usermodule/mp_sys_display.c
index acf16e9e4673ddc4665f711c5cbd10fb8caa4086..a27e68ed2ad707b2d206b34550afa0a40b50b0dc 100644
--- a/components/micropython/usermodule/mp_sys_display.c
+++ b/components/micropython/usermodule/mp_sys_display.c
@@ -36,16 +36,16 @@ STATIC mp_obj_t mp_set_backlight(mp_obj_t percent_in) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_set_backlight_obj, mp_set_backlight);
-STATIC mp_obj_t mp_set_gfx_mode(mp_obj_t mode) {
- st3m_set_gfx_mode(mp_obj_get_int(mode));
+STATIC mp_obj_t mp_set_mode(mp_obj_t mode) {
+ st3m_gfx_set_mode(mp_obj_get_int(mode));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_set_gfx_mode_obj, mp_set_gfx_mode);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_set_mode_obj, mp_set_mode);
-STATIC mp_obj_t mp_get_gfx_mode(void) {
- return mp_obj_new_int(st3m_get_gfx_mode());
+STATIC mp_obj_t mp_get_mode(void) {
+ return mp_obj_new_int(st3m_gfx_get_mode());
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_get_gfx_mode_obj, mp_get_gfx_mode);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_get_mode_obj, mp_get_mode);
STATIC mp_obj_t mp_set_palette(mp_obj_t pal_in) {
size_t count = mp_obj_get_int(mp_obj_len(pal_in));
@@ -123,15 +123,15 @@ STATIC const mp_rom_map_elem_t mp_module_sys_display_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sys_display) },
{ MP_ROM_QSTR(MP_QSTR_pipe_full), MP_ROM_PTR(&mp_pipe_full_obj) },
{ MP_ROM_QSTR(MP_QSTR_pipe_flush), MP_ROM_PTR(&mp_pipe_flush_obj) },
- { MP_ROM_QSTR(MP_QSTR_set_backlight), MP_ROM_PTR(&mp_set_backlight_obj) },
- { MP_ROM_QSTR(MP_QSTR_overlay_clip), MP_ROM_PTR(&mp_overlay_clip_obj) },
{ MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&mp_update_obj) },
{ MP_ROM_QSTR(MP_QSTR_fb), MP_ROM_PTR(&mp_fb_obj) },
{ MP_ROM_QSTR(MP_QSTR_ctx), MP_ROM_PTR(&mp_ctx_obj) },
- { MP_ROM_QSTR(MP_QSTR_set_gfx_mode), MP_ROM_PTR(&mp_set_gfx_mode_obj) },
- { MP_ROM_QSTR(MP_QSTR_set_palette), MP_ROM_PTR(&mp_set_palette_obj) },
- { MP_ROM_QSTR(MP_QSTR_get_gfx_mode), MP_ROM_PTR(&mp_get_gfx_mode_obj) },
{ MP_ROM_QSTR(MP_QSTR_fps), MP_ROM_PTR(&mp_fps_obj) },
+ { MP_ROM_QSTR(MP_QSTR_set_mode), MP_ROM_PTR(&mp_set_mode_obj) },
+ { MP_ROM_QSTR(MP_QSTR_get_mode), MP_ROM_PTR(&mp_get_mode_obj) },
+ { MP_ROM_QSTR(MP_QSTR_set_palette), MP_ROM_PTR(&mp_set_palette_obj) },
+ { MP_ROM_QSTR(MP_QSTR_set_backlight), MP_ROM_PTR(&mp_set_backlight_obj) },
+ { MP_ROM_QSTR(MP_QSTR_overlay_clip), MP_ROM_PTR(&mp_overlay_clip_obj) },
};
STATIC MP_DEFINE_CONST_DICT(mp_module_sys_display_globals,
diff --git a/components/st3m/st3m_gfx.c b/components/st3m/st3m_gfx.c
index df0c88d765613b97675ffca4213b39055b5166a9..2a114ca43b342e1c8c7d17e033f8d70373f2bc25 100644
--- a/components/st3m/st3m_gfx.c
+++ b/components/st3m/st3m_gfx.c
@@ -193,7 +193,7 @@ static void ice_palette(void) {
st3m_gfx_set_palette(pal, 256);
}
-void st3m_set_gfx_mode(st3m_gfx_mode mode) {
+void st3m_gfx_set_mode(st3m_gfx_mode mode) {
memset(fb, 0, sizeof(fb));
memset(st3m_osd_fb, 0, sizeof(st3m_osd_fb));
@@ -223,7 +223,7 @@ void st3m_set_gfx_mode(st3m_gfx_mode mode) {
_st3m_gfx_mode = mode;
}
-st3m_gfx_mode st3m_get_gfx_mode(void) { return _st3m_gfx_mode; }
+st3m_gfx_mode st3m_gfx_get_mode(void) { return _st3m_gfx_mode; }
uint8_t *st3m_gfx_fb(st3m_gfx_mode mode) {
st3m_gfx_mode set_mode =
@@ -280,7 +280,7 @@ uint8_t *st3m_gfx_fb(st3m_gfx_mode mode) {
static void st3m_gfx_task(void *_arg) {
(void)_arg;
- st3m_set_gfx_mode(0);
+ st3m_gfx_set_mode(0);
while (true) {
int desc_no = 0;
diff --git a/components/st3m/st3m_gfx.h b/components/st3m/st3m_gfx.h
index 68f20139636a37efc18abfd2ad47932949af1a57..36992db64c251619b6022270c177243d48cdf0cc 100644
--- a/components/st3m/st3m_gfx.h
+++ b/components/st3m/st3m_gfx.h
@@ -29,9 +29,9 @@ typedef enum {
} st3m_gfx_mode;
// sets the current graphics mode
-void st3m_set_gfx_mode(st3m_gfx_mode mode);
+void st3m_gfx_set_mode(st3m_gfx_mode mode);
-st3m_gfx_mode st3m_get_gfx_mode(void);
+st3m_gfx_mode st3m_gfx_get_mode(void);
uint8_t *st3m_gfx_fb(st3m_gfx_mode mode);
diff --git a/components/video_mpeg/video_mpeg.c b/components/video_mpeg/video_mpeg.c
index 2caeb54793c10a68eda970adb26332dad351acd7..2985322154fb68275270d69a800cf18c990e27f7 100644
--- a/components/video_mpeg/video_mpeg.c
+++ b/components/video_mpeg/video_mpeg.c
@@ -191,7 +191,7 @@ static void mpg1_destroy(st3m_media *media) {
plm_destroy(self->plm);
free(self->frame_data);
free(self);
- st3m_set_gfx_mode(0);
+ st3m_gfx_set_mode(0);
}
st3m_media *st3m_media_load_mpg1(const char *path) {
@@ -238,7 +238,7 @@ st3m_media *st3m_media_load_mpg1(const char *path) {
(uint8_t *)malloc(plm_get_width(self->plm) * plm_get_height(self->plm) *
2); // XXX : this is not quite right
- st3m_set_gfx_mode(32);
+ st3m_gfx_set_mode(32);
mpg1_think((st3m_media *)self, 0); // the frame is constructed in think
return (st3m_media *)self;
}
diff --git a/python_payload/apps/clouds/__init__.py b/python_payload/apps/clouds/__init__.py
index 76f5c1e8e5ccc50b20e0848e0977863cc4de24cf..1f5263f47bf64997a69dd5b2a9e9d6ce3475ad71 100644
--- a/python_payload/apps/clouds/__init__.py
+++ b/python_payload/apps/clouds/__init__.py
@@ -61,7 +61,7 @@ class App(Application):
def on_enter(self, vm):
# we are compositing heavy and going back and forth to 16bit is
# too much overhead
- sys_display.set_gfx_mode(32)
+ sys_display.set_mode(32)
super().on_enter(vm)
def draw(self, ctx):
diff --git a/python_payload/apps/mandelbrot/4bit.py b/python_payload/apps/mandelbrot/4bit.py
index ad5b22731e2ab957fb634848c131811889731911..628e05c53ea20cdfe6022467a4e2fe6e4318fba5 100644
--- a/python_payload/apps/mandelbrot/4bit.py
+++ b/python_payload/apps/mandelbrot/4bit.py
@@ -8,7 +8,7 @@ class App(Application):
def on_enter(self, vm):
super().on_enter(vm)
- sys_display.set_gfx_mode(4)
+ sys_display.set_mode(4)
self.y = 0
self.xa = -1.5
self.xb = 1.5
diff --git a/python_payload/apps/mandelbrot/__init__.py b/python_payload/apps/mandelbrot/__init__.py
index b682671b0249394aa25536fba100e5d87313fbe0..38ddd4dba91ec66c5ca930ea03e93f1a2a81164e 100644
--- a/python_payload/apps/mandelbrot/__init__.py
+++ b/python_payload/apps/mandelbrot/__init__.py
@@ -8,7 +8,7 @@ class App(Application):
def on_enter(self, vm):
super().on_enter(vm)
- sys_display.set_gfx_mode(8)
+ sys_display.set_mode(8)
self.y = 0
self.xa = -1.5
self.xb = 1.5
diff --git a/python_payload/st3m/application.py b/python_payload/st3m/application.py
index 8821a6ecff84b4d1c49108fb48f2ada65a8f0a7e..5efaecf9fb609483d7608db121a07b51084c6570 100644
--- a/python_payload/st3m/application.py
+++ b/python_payload/st3m/application.py
@@ -76,7 +76,7 @@ class Application(BaseView):
super().on_exit()
# set the default graphics mode, this is a no-op if
# it is already set
- sys_display.set_gfx_mode(0)
+ sys_display.set_mode(0)
def think(self, ins: InputState, delta_ms: int) -> None:
super().think(ins, delta_ms)
diff --git a/python_payload/st3m/ui/elements/overlays.py b/python_payload/st3m/ui/elements/overlays.py
index 82698a9c1634d8b6094e6d807777dfe34b32ea8e..aa016809ec7e8981ca17086b16874dbdc2c60fde 100644
--- a/python_payload/st3m/ui/elements/overlays.py
+++ b/python_payload/st3m/ui/elements/overlays.py
@@ -81,13 +81,10 @@ class Compositor(Responder):
def think(self, ins: InputState, delta_ms: int) -> None:
self.main.think(ins, delta_ms)
- if sys_display.get_gfx_mode() != 0:
+ if sys_display.get_mode() != 0:
return
if self._frame_skip <= 0:
- if (
- not settings.onoff_show_fps.value
- and not sys_display.get_gfx_mode() != 0
- ):
+ if not settings.onoff_show_fps.value and not sys_display.get_mode() != 0:
for overlay in self._enabled_overlays():
overlay.think(ins, delta_ms)
@@ -97,7 +94,7 @@ class Compositor(Responder):
global _clip_x1
global _clip_y1
self.main.draw(ctx)
- if sys_display.get_gfx_mode() != 0:
+ if sys_display.get_mode() != 0:
return
if self._frame_skip <= 0:
octx = sys_display.ctx(1) # XXX add symbolic name for overlay
diff --git a/sim/fakes/sys_display.py b/sim/fakes/sys_display.py
index b3ea8d0510662b5c64172262a52ae8e004a91d2f..de4a04bfb36d25ebf7bd0e22d076adc9c866c856 100644
--- a/sim/fakes/sys_display.py
+++ b/sim/fakes/sys_display.py
@@ -9,11 +9,11 @@ def overlay_clip(x0, y0, x1, y1):
pass
-def get_gfx_mode():
+def get_mode():
return 0
-def set_gfx_mode(no):
+def set_mode(no):
pass