update

Author: funnygeeker

README.ZH-CN.md

@@ -0,0 +1,68 @@
+[English (英语)](https://github.com/funnygeeker/micropython-easydisplay/blob/main/README.md)
+
+# micropython-easydisplay
+- 适用于 `Micropython` 的：高通用性，多功能，纯 `Micropython` 实现的显示库
+- 自用，顺便开源，希望能够推动 `Micropython` 生态的发展
+
+
+### 显示效果
+以下为 `2.0` 版本的显示效果
+[image]
+
+### 项目特点
+- 可以通过导入 `bmf` 字体文件，显示非 `ASCII` 字符，比如：中文 和 特殊符号
+- 支持 `P4`/`P6` 格式的 `PBM` 图片显示，以及 `24-bit` 的 `BMP` 图片显示
+- 初始化时可以设置默认参数，调用函数时更简洁，同时调用指定函数时，本次调用可覆盖默认参数
+- 兼容大多数 `MicroPython` 官方和非官方版本，纯 `MicroPython` 原生实现，不需要进行固件编译，同时尽可能保持了高效率
+- 支持多种屏幕的多种工作模式 `SSD1306`，`ST7735`，`ST7789`，支持低内存开发板驱动高分辨率屏幕（如 `ESP32C3` 驱动 `240*240` `ST7789`）
+
+### 使用方法
+- 详见源码注释
+
+### 示例代码
+```python
+# 这是一个使用示例 This is an example of usage
+import time
+import framebuf
+from machine import SPI, Pin
+from drivers import st7735_buf
+from libs.easydisplay import EasyDisplay
+
+# ESP32C3 & ST7735
+spi = SPI(1, baudrate=20000000, polarity=0, phase=0, sck=Pin(19), mosi=Pin(18))
+dp = st7735_buf.ST7735(width=160, height=128, spi=spi, cs=0, dc=1, rst=11, rotation=1)
+ed = EasyDisplay(display=dp, font="/text_lite_16px_2311.v3.bmf", show=True, color=0xFFFF, clear=True,
+                 color_type=framebuf.RGB565, text_half_char=True, text_auto_wrap=True)
+
+ed.bmp("/img/test.bmp", 0, 0)
+time.sleep(3)
+ed.pbm("/img/test.pbm", 0, 0, color_type=framebuf.MONO_HLSB)
+time.sleep(3)
+ed.text("你好，世界！\nHello World!\nこんにちは、世界！", 0, 0)
+
+
+# 更多高级使用方式详见源码注释：/libs/easydisplay.py
+```
+
+### 特别致谢
+参考项目：
+
+中文显示：[https://github.com/AntonVanke/MicroPython-Chinese-Font](https://github.com/AntonVanke/MicroPython-Chinese-Font)
+
+BMP图片显示：[https://github.com/boochow/MicroPython-ST7735/blob/master/tftbmp.py](https://github.com/boochow/MicroPython-ST7735/blob/master/tftbmp.py)
+
+
+### 参考资料
+PBM图像显示：[https://www.bilibili.com/video/av798158808/](https://www.bilibili.com/video/av798158808/)
+
+PBM文件格式：[https://www.cnblogs.com/SeekHit/p/7055748.html](https://www.cnblogs.com/SeekHit/p/7055748.html)
+
+PBM文件转换：[https://blog.csdn.net/jd3096/article/details/121319042](https://blog.csdn.net/jd3096/article/details/121319042)
+
+灰度化、二值化：[https://blog.csdn.net/li_wen01/article/details/72867057](https://blog.csdn.net/li_wen01/article/details/72867057)
+
+
+### 其他
+感谢各位大佬对开源做出的贡献！
+
+交流QQ群：[748103265](https://jq.qq.com/?_wv=1027&k=I74bKifU)

README.md

@@ -1,28 +1,26 @@
-# micropython-easydisplay
-- 适用于 `Micropython` 的：高通用性，多功能，纯 `Micropython` 实现的显示库
-- 自用，顺便开源，希望能够推动 `Micropython` 生态的发展
-
+[简体中文 (Chinese)](https://github.com/funnygeeker/micropython-easydisplay/blob/main/README.ZH-CN.md)
 
-### 显示效果
-以下为 `1.1` 版本的显示效果，`2.0` 版本存在字体文件缺陷，正在修复，请留意最新的字体文件版本...
-![font_display](https://user-images.githubusercontent.com/96659329/217912388-32b67ae0-c586-426a-8409-15d66626af67.jpg)
-![bmp_color_display](https://user-images.githubusercontent.com/96659329/217912256-576ae657-9355-4384-a8b3-1430f295f700.jpg)
-![pbm_display](https://user-images.githubusercontent.com/96659329/217912280-92b902f8-b177-4b37-bc25-84ffdb13978b.jpg)
+# micropython-easydisplay
+- A display library for `Micropython`: high versatility, multifunctionality, implemented purely in `Micropython`.
+-  This `README` may contain translations that are not entirely accurate.
 
+### Display Effects
+The following are the display effects of version `2.0`.
+[image]
 
-### 项目特点
-- 可以通过导入 `bmf` 字体文件，显示非 `ASCII` 字符，比如：中文 和 特殊符号
-- 支持 `P4`/`P6` 格式的 `PBM` 图片显示，以及 `24-bit` 的 `BMP` 图片显示
-- 初始化时可以设置默认参数，调用函数时更简洁，同时调用指定函数时，本次调用可覆盖默认参数
-- 兼容大多数 `MicroPython` 官方和非官方版本，纯 `MicroPython` 原生实现，不需要进行固件编译，同时尽可能保持了高效率
-- 支持多种屏幕的多种工作模式 `SSD1306`，`ST7735`，`ST7789`，支持低内存开发板驱动高分辨率屏幕（如 `ESP32C3` 驱动 `240*240` `ST7789`）
+### Project Features
+- Ability to display non-ASCII characters, such as Chinese and special symbols, by importing `bmf` font files.
+- Supports displaying `PBM` images in `P4`/`P6` format and `BMP` images in `24-bit`.
+- Default parameters can be set during initialization, making function calls more concise. Additionally, the current function call can override the default parameters.
+- Compatible with most official and unofficial versions of `MicroPython`. It is implemented purely with native `MicroPython` and does not require firmware compilation. Additionally, it maintains high efficiency as much as possible.
+- Supports multiple screen models such as `SSD1306`, `ST7735`, and `ST7789`. It also supports driving high-resolution screens on low-memory development boards (e.g., `ESP32C3` driving `240*240 ST7789` screens).
 
-### 使用方法
-- 详见源码注释
+### Usage
+- Please refer to the source code comments.（The comments section is written in Chinese and may need translation in order to read.）
 
-### 示例代码
+### Example Code
 ```python
-# 这是一个使用示例 This is an example of usage
+# This is an example of usage
 import time
 import framebuf
 from machine import SPI, Pin
@@ -32,41 +30,33 @@ from libs.easydisplay import EasyDisplay
 # ESP32C3 & ST7735
 spi = SPI(1, baudrate=20000000, polarity=0, phase=0, sck=Pin(19), mosi=Pin(18))
 dp = st7735_buf.ST7735(width=160, height=128, spi=spi, cs=0, dc=1, rst=11, rotation=1)
-ed = EasyDisplay(display=dp, font="/text_lite_16px_2311-1.v3.bmf", show=True, color=0xFFFF, clear=True,
-                 color_type=framebuf.RGB565, text_half_char=False)
+ed = EasyDisplay(display=dp, font="/text_lite_16px_2311.v3.bmf", show=True, color=0xFFFF, clear=True,
+                 color_type=framebuf.RGB565, text_half_char=True, text_auto_wrap=True)
 
 ed.bmp("/img/test.bmp", 0, 0)
 time.sleep(3)
 ed.pbm("/img/test.pbm", 0, 0, color_type=framebuf.MONO_HLSB)
 time.sleep(3)
 ed.text("你好，世界！\nHello World!\nこんにちは、世界！", 0, 0)
 
-# 更多高级使用方式详见源码注释：/libs/easydisplay.py
+# For more advanced usage, please refer to the source code comments: /libs/easydisplay.py
 ```
 
-### 特别致谢
-参考项目：
-
-中文显示：[https://github.com/AntonVanke/MicroPython-Chinese-Font](https://github.com/AntonVanke/MicroPython-Chinese-Font)
-
-BMP图片显示：[https://github.com/boochow/MicroPython-ST7735/blob/master/tftbmp.py](https://github.com/boochow/MicroPython-ST7735/blob/master/tftbmp.py)
-
-
-### 参考资料
-PBM图像显示：[https://www.bilibili.com/video/av798158808/](https://www.bilibili.com/video/av798158808/)
+### Special Thanks
+Reference projects:
 
-PBM文件格式：[https://www.cnblogs.com/SeekHit/p/7055748.html](https://www.cnblogs.com/SeekHit/p/7055748.html)
+Chinese display: [https://github.com/AntonVanke/MicroPython-Chinese-Font](https://github.com/AntonVanke/MicroPython-Chinese-Font)
 
-PBM文件转换：[https://blog.csdn.net/jd3096/article/details/121319042](https://blog.csdn.net/jd3096/article/details/121319042)
+BMP image display: [https://github.com/boochow/MicroPython-ST7735/blob/master/tftbmp.py](https://github.com/boochow/MicroPython-ST7735/blob/master/tftbmp.py)
 
-灰度化、二值化：[https://blog.csdn.net/li_wen01/article/details/72867057](https://blog.csdn.net/li_wen01/article/details/72867057)
+### References
+PBM image display: [https://www.bilibili.com/video/av798158808/](https://www.bilibili.com/video/av798158808/)
 
+PBM file format: [https://www.cnblogs.com/SeekHit/p/7055748.html](https://www.cnblogs.com/SeekHit/p/7055748.html)
 
-### 其他
-感谢各位大佬对开源做出的贡献！
+PBM file conversion: [https://blog.csdn.net/jd3096/article/details/121319042](https://blog.csdn.net/jd3096/article/details/121319042)
 
-交流QQ群：[748103265](https://jq.qq.com/?_wv=1027&k=I74bKifU)
+Grayscale, binarization: [https://blog.csdn.net/li_wen01/article/details/72867057](https://blog.csdn.net/li_wen01/article/details/72867057)
 
-# TODO 2311
-- 修复 `Lite` 字符集缺少空格的问题
-- 更换更合适的字体，以优化英文显示
+### Others
+Thanks to all contributors for their contributions to open source!

main.py

@@ -8,8 +8,8 @@
 # ESP32C3 & ST7735
 spi = SPI(1, baudrate=20000000, polarity=0, phase=0, sck=Pin(19), mosi=Pin(18))
 dp = st7735_buf.ST7735(width=160, height=128, spi=spi, cs=0, dc=1, rst=11, rotation=1)
-ed = EasyDisplay(display=dp, font="/text_lite_16px_2311-1.v3.bmf", show=True, color=0xFFFF, clear=True,
-                 color_type=framebuf.RGB565, text_half_char=False)
+ed = EasyDisplay(display=dp, font="/text_lite_16px_2311.v3.bmf", show=True, color=0xFFFF, clear=True,
+                 color_type=framebuf.RGB565, text_half_char=True, text_auto_wrap=True)
 
 ed.bmp("/img/test.bmp", 0, 0)
 time.sleep(3)