Skip to content

Commit 7c0186b

Browse files
author
funnygeeker
committed
Fix the bug that global default parameters cannot be inherited
1 parent 210fa72 commit 7c0186b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/easydisplay.mpy

-3 Bytes
Binary file not shown.

lib/easydisplay.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def load_font(self, file: str):
261261
self.font_bitmap_size = self.font_bmf_info[8]
262262

263263
def text(self, s: str, x: int, y: int,
264-
color: int = 0xFFFF, bg_color: int = 0, size: int = None,
264+
color: int = None, bg_color: int = None, size: int = None,
265265
half_char: bool = None, auto_wrap: bool = None, show: bool = None, clear: bool = None,
266266
key: bool = None, invert: bool = None, line_spacing: int = None, *args, **kwargs):
267267
"""
@@ -401,7 +401,7 @@ def text(self, s: str, x: int, y: int,
401401
def ppm(self, *args, **kwargs):
402402
self.pbm(*args, **kwargs)
403403

404-
def pbm(self, file, x, y, key: int = -1, show: bool = None, clear: bool = None, invert: bool = False,
404+
def pbm(self, file, x, y, key: int = None, show: bool = None, clear: bool = None, invert: bool = False,
405405
color: int = None, bg_color: int = None):
406406
"""
407407
Display PBM / PPM Image
@@ -578,7 +578,7 @@ def pbm(self, file, x, y, key: int = -1, show: bool = None, clear: bool = None,
578578

579579
self.show() if show else 0 # 立即显示
580580

581-
def bmp(self, file, x, y, key: int = -1, show: bool = None, clear: bool = None, invert: bool = False,
581+
def bmp(self, file, x, y, key: int = None, show: bool = None, clear: bool = None, invert: bool = False,
582582
color: int = None, bg_color: int = None):
583583
"""
584584
Display BMP Image 显示 bmp 图片
@@ -722,7 +722,7 @@ def bmp(self, file, x, y, key: int = -1, show: bool = None, clear: bool = None,
722722
else:
723723
raise TypeError("Unsupported file type: only BMP images are supported.")
724724

725-
def dat(self, file, x, y, key=-1):
725+
def dat(self, file, x, y, key=None):
726726
"""
727727
Display screen raw data file, with extremely high efficiency, only supports RGB565 format.
728728
显示表示屏幕原始数据的文件,拥有极高的效率,仅支持 RGB565 格式

0 commit comments

Comments
 (0)