update

Author: funnygeeker

drivers/st7735_buf.mpy

@@ -67,7 +67,6 @@ def _encode_pixel(c):
 
 ROTATIONS = [0x00, 0x60, 0xC0, 0xA0]  # 旋转方向
 
-
 BLACK = const(0x0000)
 BLUE = const(0x001F)
 RED = const(0xF800)
@@ -280,9 +279,10 @@ def set_window(self, x0, y0, x1, y1):
             x1 (int): column end address
             y1 (int): row end address
         """
-        self._set_columns(x0, x1)
-        self._set_rows(y0, y1)
-        self._write(RAMWR)
+        if x0 < self.width and y0 < self.height:
+            self._set_columns(x0, x1)
+            self._set_rows(y0, y1)
+            self._write(RAMWR)
 
     def clear(self):
         """

drivers/st7735_buf.py

@@ -66,7 +66,6 @@ def _encode_pixel(c):
 
 ROTATIONS = [0x00, 0x60, 0xC0, 0xA0]  # 旋转方向
 
-
 BLACK = const(0x0000)
 BLUE = const(0x001F)
 RED = const(0xF800)
@@ -277,9 +276,10 @@ def set_window(self, x0, y0, x1, y1):
             x1 (int): column end address
             y1 (int): row end address
         """
-        self._set_columns(x0, x1)
-        self._set_rows(y0, y1)
-        self._write(RAMWR)
+        if x0 < self.width and y0 < self.height:
+            self._set_columns(x0, x1)
+            self._set_rows(y0, y1)
+            self._write(RAMWR)
 
     def clear(self):
         """

drivers/st7735_spi.mpy

@@ -353,9 +353,10 @@ def set_window(self, x0, y0, x1, y1):
             x1 (int): column end address
             y1 (int): row end address
         """
-        self._set_columns(x0, x1)
-        self._set_rows(y0, y1)
-        self._write(ST7789_RAMWR)
+        if x0 < self.width and y0 < self.height:
+            self._set_columns(x0, x1)
+            self._set_rows(y0, y1)
+            self._write(ST7789_RAMWR)
 
     def clear(self):
         """

drivers/st7735_spi.py

@@ -348,9 +348,10 @@ def set_window(self, x0, y0, x1, y1):
             x1 (int): column end address
             y1 (int): row end address
         """
-        self._set_columns(x0, x1)
-        self._set_rows(y0, y1)
-        self._write(ST7789_RAMWR)
+        if x0 < self.width and y0 < self.height:
+            self._set_columns(x0, x1)
+            self._set_rows(y0, y1)
+            self._write(ST7789_RAMWR)
 
     def clear(self):
         """

drivers/st7789_buf.mpy

@@ -377,7 +377,7 @@ def text(self, s: str, x: int, y: int,
                             FrameBuffer(data, font_size, font_size,
                                         RGB565), x, y, key)
                     else:
-                        dp.set_window(x, y, x + font_size - 1, y + font_size + 1)
+                        dp.set_window(x, y, x + font_size - 1, y + font_size)
                         dp.write_data(data)
                 else:
                     data = self._RGB565_font_size(byte_data, font_size, palette, self._size)
@@ -386,7 +386,7 @@ def text(self, s: str, x: int, y: int,
                             FrameBuffer(data,
                                         font_size, font_size, RGB565), x, y, key)
                     else:
-                        dp.set_window(x, y, x + font_size - 1, y + font_size + 1)
+                        dp.set_window(x, y, x + font_size - 1, y + font_size)
                         dp.write_data(data)
             # 英文字符半格显示
             if ord(char) < 128 and half_char:
@@ -450,7 +450,7 @@ def pbm(self, file: str, x, y, key: int = -1, show: bool = None, clear: bool = N
                     if reversion:  # New
                         color, bg_color = bg_color, color
                     palette = self._calculate_palette(color, bg_color)  # 计算调色板
-                    dp.set_window(x, y, x + _width - 1, y + _height + 1)  # 设置窗口
+                    dp.set_window(x, y, x + _width - 1, y + _height)  # 设置窗口
                     data = f_read(buffer_size)
                     write_data = dp.write_data
                     while data:
@@ -522,7 +522,7 @@ def pbm(self, file: str, x, y, key: int = -1, show: bool = None, clear: bool = N
                         except AttributeError:
                             pass
                 else:  # 直接驱动
-                    dp.set_window(x, y, x + _width - 1, y + _height + 1)  # 设置窗口
+                    dp.set_window(x, y, x + _width - 1, y + _height)  # 设置窗口
                     buffer = bytearray(_width * 2)
                     for _y in r_height:  # 逐行显示图片
                         for _x in r_width:
@@ -622,7 +622,7 @@ def bmp(self, file: str, x, y, key: int = -1, show: bool = None, clear: bool = N
                         buffer = bytearray(_width * 2)
                         self_buf = self._buffer
                         if not self_buf:
-                            dp.set_window(x, y, x + _width - 1, y + _height + 1)  # 设置窗口
+                            dp.set_window(x, y, x + _width - 1, y + _height)  # 设置窗口
                         r_width = range(_width)
                         r_height = range(_height)
                         for _y in r_height:
@@ -716,7 +716,7 @@ def dat(self, file, x, y, key=-1):
                         size = self.BUFFER_SIZE * 10
                         data = f_read(size)
                         dp_write = self.display.write_data
-                        self.display.set_window(x, y, x + _width - 1, y + _height + 1)
+                        self.display.set_window(x, y, x + _width - 1, y + _height)
                         while data:
                             dp_write(data)
                             data = f_read(size)