From f967a0b0de3062b526e8f9a22e271cbf006fe70d Mon Sep 17 00:00:00 2001
From: jixishi <lydxh935227514@gmail.com>
Date: Thu, 27 Jun 2024 19:11:22 +0800
Subject: [PATCH] UP

---
 demo/oled/page.c        | 43 +++++++++++++++++++++--------------------
 tools/unicode_ch_gen.py |  1 -
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/demo/oled/page.c b/demo/oled/page.c
index 285bc47..12cff0b 100644
--- a/demo/oled/page.c
+++ b/demo/oled/page.c
@@ -4,13 +4,13 @@
 #include "bmp.h"
 
 uint8_t pageid = 0, cur = 1, cnt = 0, item_h = 16, item_w = 0;
-uint8_t cnt_f=1;
+uint8_t cnt_f = 1;
 static List_t list;
 Page_L_t mainp = {0, 0, 0, 0, 1, 16, 16, mainpage};
-Page_L_t ap = {1, 2, 1, 0, 1, 12, 36, pageA};
-Page_L_t bp = {2, 2, 1, 0, 2, 12, 36, pageB};
-Page_L_t cp = {3, 2, 1, 0, 3, 12, 36, pageC};
-Page_L_t ip = {4, 0, 0, 0, 4, 0, 0, pageImg};
+Page_L_t ap = {1, 4, 1, 0, 2, 12, 26, pageA};
+Page_L_t bp = {2, 2, 1, 0, 3, 12, 36, pageB};
+Page_L_t cp = {3, 2, 1, 0, 4, 12, 36, pageC};
+Page_L_t ip = {4, 0, 0, 0, 0, 0, 0, pageImg};
 
 
 void pageinit() {
@@ -37,52 +37,53 @@ Page_L_t pagesearch(uint8_t id) {
 
 void pagecur(OLED_T *dev) {
     if (cnt % 2) {
-        if (pagesearch(pageid).curmin != pagesearch(pageid).curmax&&pagesearch(pageid).item_h != 0) {
+        if (pagesearch(pageid).curmin != pagesearch(pageid).curmax && pagesearch(pageid).item_h != 0) {
             OLED_ShowString(dev, item_w - item_h, cur * item_h, ">", item_h);
         }
     }
-    if(cnt_f){
+    if (cnt_f) {
         cnt++;
     }
 }
 
 
-
 void mainpage(OLED_T *dev) {
     OLED_CLS(dev);
     uint8_t fsbuf[16] = {0};
-    sprintf(fsbuf,"%c%c%c%c%c%c%c%c",0x4F, 0xE1 ,0x60, 0x6F,0x66, 0x3E,0x79, 0x3A);
+    sprintf(fsbuf, "%c%c%c%c%c%c%c%c", 0x4F, 0xE1, 0x60, 0x6F, 0x66, 0x3E, 0x79, 0x3A);
     OLED_ShowCHString(dev, 32, 0 * item_h, fsbuf);
-    sprintf(fsbuf,"%c%c%c%c%c%c%c%c%c",0x59, 0xD3 ,0x54, 0x0D,':',0x6B, 0x66,0x65, 0xED);
+    sprintf(fsbuf, "%c%c%c%c%c%c%c%c%c", 0x59, 0xD3, 0x54, 0x0D, ':', 0x6B, 0x66, 0x65, 0xED);
     OLED_ShowCHString(dev, 12, 1 * item_h, fsbuf);
-    sprintf(fsbuf,"%c%c%c%c:ZB211",0x73, 0xED ,0x7E, 0xA7);
+    sprintf(fsbuf, "%c%c%c%c:ZB211", 0x73, 0xED, 0x7E, 0xA7);
     OLED_ShowCHString(dev, 12, 2 * item_h, fsbuf);
-    sprintf(fsbuf,"%c%c%c%c:%c%c%c%c%c%c%c%c",0x4E, 0x13 ,0x4E, 0x1A ,0x75, 0x35,0x5B, 0x50,0x4F, 0xE1 ,0x60, 0x6F);
+    sprintf(fsbuf, "%c%c%c%c:%c%c%c%c%c%c%c%c", 0x4E, 0x13, 0x4E, 0x1A, 0x75, 0x35, 0x5B, 0x50, 0x4F, 0xE1, 0x60, 0x6F);
     OLED_ShowCHString(dev, 12, 3 * item_h, fsbuf);
     pagecur(dev);
 }
 
 void pageA(OLED_T *dev) {
     OLED_CLS(dev);
-    OLED_ShowString(dev, 32, 0, " A  Page", 12);
-    OLED_ShowString(dev, 36, 12, "1.contx", 12);
-    OLED_ShowString(dev, 36, 24, "         back", 12);
+    OLED_ShowString(dev, 32, 0 * item_h, "SYS Page", item_h);
+    OLED_ShowString(dev, item_w, 1 * item_h, "Clion:24.1.3", item_h);
+    OLED_ShowString(dev, item_w, 2 * item_h, "CUBEMX:6.8.1", item_h);
+    OLED_ShowString(dev, item_w, 3 * item_h, "MCU:F103C8T6", item_h);
+    OLED_ShowString(dev, item_w, 4 * item_h, "         back", item_h);
     pagecur(dev);
 }
 
 void pageB(OLED_T *dev) {
     OLED_CLS(dev);
-    OLED_ShowString(dev, 32, 0, " B  Page", 12);
-    OLED_ShowString(dev, 36, 12, "1.contx", 12);
-    OLED_ShowString(dev, 36, 24, "         back", 12);
+    OLED_ShowString(dev, 32, 0 * item_h, " B  Page", item_h);
+    OLED_ShowString(dev, item_w, 1 * item_h, "1.contx", item_h);
+    OLED_ShowString(dev, item_w, 2 * item_h, "         back", item_h);
     pagecur(dev);
 }
 
 void pageC(OLED_T *dev) {
     OLED_CLS(dev);
-    OLED_ShowString(dev, 32, 0, " C  Page", 12);
-    OLED_ShowString(dev, 36, 12, "1.contx", 12);
-    OLED_ShowString(dev, 36, 24, "         back", 12);
+    OLED_ShowString(dev, 32, 0 * item_h, " C  Page", 12);
+    OLED_ShowString(dev, item_w, 1 * item_h, "1.contx", 12);
+    OLED_ShowString(dev, item_w, 2 * item_h, "         back", 12);
     pagecur(dev);
 }
 
diff --git a/tools/unicode_ch_gen.py b/tools/unicode_ch_gen.py
index 891962e..b7431bc 100644
--- a/tools/unicode_ch_gen.py
+++ b/tools/unicode_ch_gen.py
@@ -127,7 +127,6 @@ def generate_and_write_chinese_array_output():
     # 生成包含汉字结构体的数组
     # simsun: 宋体
     # kaiti: 楷体
-    # size = (20, 20)
     # size = (12, 12)
     size = (16, 16)
     # chinese_array = generate_chinese_array("名字班级", 'simsun', size)