JiXieShi
/
HW_Lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UP 注释修正

main
JiXieShi 2024-06-27 22:50:32 +08:00
parent f967a0b0de
commit 7eb0f5e1f7
4 changed files with 68 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
demo/oled/page.c
View File

@ -8,9 +8,9 @@ uint8_t cnt_f = 1;
static List_t list; static List_t list;
Page_L_t mainp = {0, 0, 0, 0, 1, 16, 16, mainpage}; Page_L_t mainp = {0, 0, 0, 0, 1, 16, 16, mainpage};
Page_L_t ap = {1, 4, 1, 0, 2, 12, 26, pageA}; 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 bp = {2, 3, 1, 1, 3, 12, 20, pageB};
Page_L_t cp = {3, 2, 1, 0, 4, 12, 36, pageC}; Page_L_t cp = {3, 3, 1, 1, 4, 16, 20, pageC};
Page_L_t ip = {4, 0, 0, 0, 0, 0, 0, pageImg}; Page_L_t ip = {4, 0, 0, 3, 0, 0, 0, pageImg};
void pageinit() { void pageinit() {
@ -73,17 +73,22 @@ void pageA(OLED_T *dev) {
void pageB(OLED_T *dev) { void pageB(OLED_T *dev) {
OLED_CLS(dev); OLED_CLS(dev);
OLED_ShowString(dev, 32, 0 * item_h, " B Page", item_h); OLED_ShowString(dev, 32, 0 * item_h, " TEXT Page", item_h);
OLED_ShowString(dev, item_w, 1 * item_h, "1.contx", item_h); OLED_ShowString(dev, item_w, 1 * item_h, ".!@#$%^&*()_+", item_h);
OLED_ShowString(dev, item_w, 2 * item_h, " back", item_h); OLED_ShowString(dev, item_w, 2 * item_h, "<>/?:'[{]}=-,.;", item_h);
OLED_ShowString(dev, item_w, 3 * item_h, " back", item_h);
pagecur(dev); pagecur(dev);
} }
void pageC(OLED_T *dev) { void pageC(OLED_T *dev) {
OLED_CLS(dev); OLED_CLS(dev);
OLED_ShowString(dev, 32, 0 * item_h, " C Page", 12); uint8_t fsbuf[16] = {0};
OLED_ShowString(dev, item_w, 1 * item_h, "1.contx", 12); OLED_ShowString(dev, 32, 0 * item_h, " FUNC Page", item_h);
OLED_ShowString(dev, item_w, 2 * item_h, " back", 12); sprintf(fsbuf, "1.%c%c%c%c", 0x56, 0xFE, 0x72, 0x47);
OLED_ShowCHString(dev, item_w, 1 * item_h, fsbuf);
sprintf(fsbuf, "2.%c%c%c%c", 0x89, 0xC6, 0x98, 0x91);
OLED_ShowCHString(dev, item_w, 2 * item_h, fsbuf);
OLED_ShowString(dev, item_w, 3 * item_h, " back", item_h);
pagecur(dev); pagecur(dev);
} }

31
demo/oled/test.c
View File

@ -29,13 +29,13 @@ void Key_Call_E(Key_t *key) {
switch (key->event) { switch (key->event) {
case KEY_PRESS_DOWN: case KEY_PRESS_DOWN:
// LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "PressTheEvent"); // LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "PressTheEvent");
break;// 按下事件 break;// 按下事件
case KEY_PRESS_UP: case KEY_PRESS_UP:
// LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "BounceIncident"); // LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "BounceIncident");
break;// 弹起事件 break;// 弹起事件
case KEY_PRESS_REPEAT: case KEY_PRESS_REPEAT:
LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "RepeatThePressEvent"); LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "RepeatThePressEvent");
break;// 重复按下事件 break;// 重复按下事件
case KEY_SINGLE_CLICK: case KEY_SINGLE_CLICK:
LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "ClickEvent"); LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "ClickEvent");
if (key->key_id == SIM_KEY_UP)cur--; if (key->key_id == SIM_KEY_UP)cur--;
@ -54,7 +54,7 @@ void Key_Call_E(Key_t *key) {
case 1: case 1:
case 2: case 2:
case 3: case 3:
if (cur == 2)pageid = 0; if (cur == pagesearch(pageid).curmax)pageid = 0;
break; break;
case 4: case 4:
if(cnt_f==1)cnt_f=0; if(cnt_f==1)cnt_f=0;
@ -62,16 +62,16 @@ void Key_Call_E(Key_t *key) {
break; break;
} }
} }
break;// 单击事件 break;// 单击事件
case KEY_DOUBLE_CLICK: case KEY_DOUBLE_CLICK:
LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "DoubleClickTheEvent"); LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "DoubleClickTheEvent");
break;// 双击事件 break;// 双击事件
case KEY_LONG_PRESS_START: case KEY_LONG_PRESS_START:
// LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "LongPressToStartTheEvent"); // LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "LongPressToStartTheEvent");
break;// 长按开始事件 break;// 长按开始事件
case KEY_LONG_PRESS_HOLD: case KEY_LONG_PRESS_HOLD:
LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "LongPressToHoldTheEvent"); LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "LongPressToHoldTheEvent");
break;// 长按保持事件 break;// 长按保持事件
} }
} }
@ -94,7 +94,7 @@ void Get_Key(void *pVoid) {
key_attach(&k7, KEY_ALL_EVENT, Key_Call_E, true); key_attach(&k7, KEY_ALL_EVENT, Key_Call_E, true);
while (1) { while (1) {
// 每5ms调用一次key_ticks函数 // 每5ms调用一次key_ticks函数
key_ticks(); key_ticks();
Sleep(5); Sleep(5);
} }
@ -118,6 +118,15 @@ void Test_OLED() {
OLED_Init(&oled); OLED_Init(&oled);
OLED_CLS(&oled); OLED_CLS(&oled);
uint8_t buft[13] = {0x6C, 0x14, 0x6C, 0xE1, 0x5F, 0x0F, 0x6D, 0xB2, 0x4F, 0x4D, 0x8B, 0xA1, 0x00};
OLED_ShowCHString(&oled, 16, 1, buft);
uint8_t sbuf[30] = {0};
uint8_t bufx[8] = {0x5F, 0x53, 0x52, 0x4D, 0x6D, 0xB2, 0x4F, 0x4D};
sprintf(sbuf, "%s: 13.4271m\0", bufx);
OLED_ShowCHString(&oled, 1, 24, sbuf);
OLED_DrawRect(&oled, 0, 0, 127, 63); OLED_DrawRect(&oled, 0, 0, 127, 63);
// };// // };//
// char buf[30] = {0x60,0x6F,0x59, 0xD3,0x54, 0x0D,0x6B, 0x66,0x65, 0xED,0x73, 0xED,0x7E, 0xA7,0x4F, 0xE1,0x60, 0x6F,0x66, 0x3E,0x79, 0x3A,0x56, 0xFE,0x72, 0x47,0x89, 0xC6,0x98, 0x91,0x4E, 0x13,0x4E, 0x1A,0x75, 0x35,0x5B, 0x50,}; // char buf[30] = {0x60,0x6F,0x59, 0xD3,0x54, 0x0D,0x6B, 0x66,0x65, 0xED,0x73, 0xED,0x7E, 0xA7,0x4F, 0xE1,0x60, 0x6F,0x66, 0x3E,0x79, 0x3A,0x56, 0xFE,0x72, 0x47,0x89, 0xC6,0x98, 0x91,0x4E, 0x13,0x4E, 0x1A,0x75, 0x35,0x5B, 0x50,};
@ -131,7 +140,7 @@ void Test_OLED() {
Sleep(3000); Sleep(3000);
// extern lv_font_t myFont; // extern lv_font_t myFont;
// OLED_DisplayString(&oled, &myFont, "班级", 2, 1); // OLED_DisplayString(&oled, &myFont, "班级", 2, 1);
// OLED_ShowPic(&oled, 0, 0, 64, 64, BMP1); // OLED_ShowPic(&oled, 0, 0, 64, 64, BMP1);
OLED_Refresh(&oled); OLED_Refresh(&oled);
@ -141,7 +150,7 @@ void Test_OLED() {
if (pageid > 4)pageid = 0; if (pageid > 4)pageid = 0;
item_h = pagesearch(pageid).item_h; item_h = pagesearch(pageid).item_h;
item_w = pagesearch(pageid).item_w; item_w = pagesearch(pageid).item_w;
pagesearch(pageid).page(&oled); // pagesearch(pageid).page(&oled);
// sprintf(buf, "DATA:%d", s); // sprintf(buf, "DATA:%d", s);
// OLED_ShowString(&oled, 2, 51, buf, 12); // OLED_ShowString(&oled, 2, 51, buf, 12);
OLED_Refresh(&oled); OLED_Refresh(&oled);

144
lib/inc/oled/oled_font_chuc.h
View File

@ -12,147 +12,67 @@ uint8_t Hzk_size=16;
Chinese_t Hzk[] = { Chinese_t Hzk[] = {
{ {
// Original: 姓 // Original: 气
{ 0x59, 0xD3 }, {0x6C, 0x14},
{ {
0x10, 0x20, 0x10, 0x20, 0x11, 0x20, 0x11, 0x24, 0xFD, 0xFE, 0x25, 0x20, 0x26, 0x20, 0x24, 0x20, 0x10, 0x00, 0x10, 0x08, 0x1F, 0xFC, 0x20, 0x00, 0x2F, 0xF0, 0x40, 0x00, 0xBF, 0xE0, 0x00, 0x20,
0x24, 0x28, 0x45, 0xFC, 0x28, 0x20, 0x10, 0x20, 0x28, 0x20, 0x44, 0x24, 0x87, 0xFE, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x22, 0x00, 0x12, 0x00, 0x0A, 0x00, 0x04,
} }
}, },
{ {
// Original: 名 // Original: 泡
{ 0x54, 0x0D }, {0x6C, 0xE1},
{ {
0x02, 0x00, 0x02, 0x00, 0x07, 0xF0, 0x04, 0x10, 0x0C, 0x20, 0x12, 0x40, 0x01, 0x80, 0x06, 0x00, 0x01, 0x00, 0x41, 0x04, 0x31, 0xFE, 0x12, 0x04, 0x82, 0x24, 0x67, 0xF4, 0x2A, 0x24, 0x02, 0x24,
0x18, 0x08, 0xEF, 0xFC, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0F, 0xF8, 0x08, 0x08, 0x0A, 0x24, 0x13, 0xE4, 0xE2, 0x14, 0x22, 0x08, 0x22, 0x02, 0x22, 0x02, 0x21, 0xFE, 0x20, 0x00,
} }
}, },
{ {
// Original: 武 // Original: 式
{ 0x6B, 0x66 }, {0x5F, 0x0F},
{ {
0x00, 0x40, 0x02, 0x50, 0x3F, 0x48, 0x00, 0x48, 0x00, 0x40, 0xFF, 0xFE, 0x04, 0x40, 0x04, 0x40, 0x00, 0x80, 0x00, 0xA0, 0x00, 0x90, 0x00, 0x84, 0xFF, 0xFE, 0x00, 0x80, 0x00, 0x80, 0x3E, 0x80,
0x27, 0x40, 0x24, 0x40, 0x24, 0x20, 0x24, 0x20, 0x27, 0xA0, 0xF8, 0x12, 0x40, 0x0A, 0x00, 0x06, 0x08, 0x80, 0x08, 0x40, 0x08, 0x40, 0x09, 0x20, 0x0E, 0x22, 0x70, 0x12, 0x20, 0x0A, 0x00, 0x04,
} }
}, },
{ {
// Original: 旭 // Original: 液
{ 0x65, 0xED }, {0x6D, 0xB2},
{ {
0x10, 0x00, 0x10, 0x08, 0x10, 0xFC, 0x10, 0x88, 0xFE, 0x88, 0x12, 0x88, 0x12, 0x88, 0x12, 0xF8, 0x00, 0x80, 0x40, 0x44, 0x37, 0xFE, 0x10, 0x20, 0x81, 0x20, 0x61, 0x3C, 0x22, 0x44, 0x0A, 0x64,
0x12, 0x88, 0x12, 0x88, 0x12, 0x88, 0x12, 0x88, 0x22, 0xFA, 0x22, 0x02, 0x41, 0xFE, 0x80, 0x00, 0x16, 0x98, 0x2B, 0x48, 0xE2, 0x50, 0x22, 0x20, 0x22, 0x50, 0x22, 0x8E, 0x23, 0x04, 0x22, 0x00,
} }
}, },
{ {
// Original: 班 // Original: 位
{ 0x73, 0xED }, {0x4F, 0x4D},
{ {
0x01, 0x00, 0x09, 0x04, 0xFD, 0x7E, 0x21, 0x10, 0x25, 0x10, 0x25, 0x10, 0x25, 0x10, 0xF5, 0x7C, 0x08, 0x80, 0x08, 0x40, 0x08, 0x40, 0x10, 0x08, 0x17, 0xFC, 0x30, 0x00, 0x52, 0x08, 0x92, 0x08,
0x25, 0x10, 0x29, 0x10, 0x21, 0x10, 0x22, 0x10, 0x3A, 0x10, 0xE2, 0x14, 0x44, 0xFE, 0x08, 0x00, 0x11, 0x10, 0x11, 0x10, 0x10, 0x90, 0x10, 0xA0, 0x10, 0x24, 0x1F, 0xFE, 0x10, 0x00, 0x10, 0x00,
} }
}, },
{ {
// Original: 级 // Original: 计
{ 0x7E, 0xA7 }, {0x8B, 0xA1},
{ {
0x10, 0x08, 0x17, 0xFC, 0x21, 0x08, 0x21, 0x08, 0x49, 0x10, 0xF9, 0x10, 0x11, 0x3C, 0x21, 0x84, 0x00, 0x40, 0x20, 0x40, 0x10, 0x40, 0x10, 0x40, 0x00, 0x40, 0x00, 0x44, 0xF7, 0xFE, 0x10, 0x40,
0x41, 0x88, 0xF9, 0x48, 0x02, 0x50, 0x02, 0x20, 0x1A, 0x50, 0xE4, 0x88, 0x49, 0x0E, 0x02, 0x04, 0x10, 0x40, 0x10, 0x40, 0x10, 0x40, 0x12, 0x40, 0x14, 0x40, 0x18, 0x40, 0x10, 0x40, 0x00, 0x40,
} }
}, },
{ {
// Original: 信 // Original: 当
{ 0x4F, 0xE1 }, {0x5F, 0x53},
{ {
0x08, 0x80, 0x08, 0x44, 0x0F, 0xFE, 0x10, 0x00, 0x10, 0x08, 0x37, 0xFC, 0x50, 0x00, 0x90, 0x08, 0x01, 0x00, 0x21, 0x08, 0x19, 0x18, 0x09, 0x20, 0x01, 0x00, 0x01, 0x08, 0x7F, 0xFC, 0x00, 0x08,
0x17, 0xFC, 0x10, 0x00, 0x13, 0xF8, 0x12, 0x08, 0x12, 0x08, 0x12, 0x08, 0x13, 0xF8, 0x12, 0x08, 0x00, 0x08, 0x00, 0x08, 0x3F, 0xF8, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x7F, 0xF8, 0x00, 0x08,
} }
}, },
{ {
// Original: 息 // Original: 前
{ 0x60, 0x6F }, {0x52, 0x4D},
{ {
0x02, 0x00, 0x04, 0x10, 0x1F, 0xF8, 0x10, 0x10, 0x10, 0x10, 0x1F, 0xF0, 0x10, 0x10, 0x1F, 0xF0, 0x10, 0x10, 0x0C, 0x30, 0x04, 0x44, 0xFF, 0xFE, 0x00, 0x00, 0x3E, 0x08, 0x22, 0x48, 0x22, 0x48,
0x10, 0x10, 0x10, 0x10, 0x1F, 0xF0, 0x02, 0x00, 0x51, 0x84, 0x50, 0x92, 0x90, 0x12, 0x0F, 0xF0, 0x3E, 0x48, 0x22, 0x48, 0x22, 0x48, 0x3E, 0x48, 0x22, 0x08, 0x22, 0x08, 0x2A, 0x28, 0x24, 0x10,
}
},
{
// Original: 显
{ 0x66, 0x3E },
{
0x00, 0x10, 0x1F, 0xF8, 0x10, 0x10, 0x10, 0x10, 0x1F, 0xF0, 0x10, 0x10, 0x10, 0x10, 0x1F, 0xF0,
0x14, 0x50, 0x44, 0x44, 0x34, 0x4C, 0x14, 0x50, 0x04, 0x40, 0x04, 0x44, 0xFF, 0xFE, 0x00, 0x00,
}
},
{
// Original: 示
{ 0x79, 0x3A },
{
0x00, 0x10, 0x3F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFE, 0x01, 0x00,
0x01, 0x00, 0x09, 0x20, 0x19, 0x18, 0x21, 0x0C, 0x41, 0x04, 0x01, 0x00, 0x05, 0x00, 0x02, 0x00,
}
},
{
// Original: 图
{ 0x56, 0xFE },
{
0x00, 0x04, 0x7F, 0xFE, 0x44, 0x04, 0x47, 0xE4, 0x4C, 0x44, 0x52, 0x84, 0x41, 0x04, 0x42, 0x84,
0x46, 0x44, 0x49, 0x3C, 0x70, 0x94, 0x46, 0x04, 0x41, 0x04, 0x40, 0x84, 0x7F, 0xFC, 0x40, 0x04,
}
},
{
// Original: 片
{ 0x72, 0x47 },
{
0x00, 0x80, 0x20, 0x80, 0x20, 0x80, 0x20, 0x80, 0x20, 0x84, 0x3F, 0xFE, 0x20, 0x00, 0x20, 0x00,
0x3F, 0xC0, 0x20, 0x40, 0x20, 0x40, 0x20, 0x40, 0x20, 0x40, 0x20, 0x40, 0x40, 0x40, 0x80, 0x40,
}
},
{
// Original: 视
{ 0x89, 0xC6 },
{
0x20, 0x08, 0x13, 0xFC, 0x12, 0x08, 0x02, 0x48, 0xFE, 0x48, 0x0A, 0x48, 0x12, 0x48, 0x32, 0x48,
0x5A, 0x48, 0x96, 0x68, 0x12, 0xA8, 0x10, 0xA0, 0x11, 0x22, 0x11, 0x22, 0x12, 0x1E, 0x14, 0x00,
}
},
{
// Original: 频
{ 0x98, 0x91 },
{
0x10, 0x04, 0x13, 0xFE, 0x54, 0x20, 0x5E, 0x44, 0x51, 0xFE, 0x55, 0x04, 0xFF, 0x24, 0x11, 0x24,
0x55, 0x24, 0x55, 0x24, 0x55, 0x24, 0x95, 0x24, 0x08, 0x20, 0x10, 0x50, 0x20, 0x8C, 0x43, 0x04,
}
},
{
// Original: 专
{ 0x4E, 0x13 },
{
0x01, 0x00, 0x01, 0x00, 0x01, 0x10, 0x3F, 0xF8, 0x02, 0x00, 0x02, 0x04, 0xFF, 0xFE, 0x04, 0x00,
0x04, 0x00, 0x0F, 0xF8, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x06, 0x80, 0x01, 0x80, 0x00, 0x40,
}
},
{
// Original: 业
{ 0x4E, 0x1A },
{
0x04, 0x40, 0x04, 0x40, 0x04, 0x40, 0x04, 0x40, 0x44, 0x44, 0x24, 0x44, 0x24, 0x48, 0x14, 0x48,
0x14, 0x50, 0x14, 0x50, 0x14, 0x60, 0x04, 0x40, 0x04, 0x40, 0x04, 0x44, 0xFF, 0xFE, 0x00, 0x00,
}
},
{
// Original: 电
{ 0x75, 0x35 },
{
0x02, 0x00, 0x02, 0x00, 0x02, 0x10, 0x7F, 0xF8, 0x42, 0x10, 0x42, 0x10, 0x7F, 0xF0, 0x42, 0x10,
0x42, 0x10, 0x7F, 0xF0, 0x42, 0x10, 0x02, 0x00, 0x02, 0x04, 0x02, 0x04, 0x01, 0xFC, 0x00, 0x00,
}
},
{
// Original: 子
{ 0x5B, 0x50 },
{
0x00, 0x00, 0x3F, 0xF0, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x01, 0x80, 0x01, 0x04, 0xFF, 0xFE,
0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x02, 0x00,
} }
}, },
}; };

4
tools/unicode_ch_gen.py
View File

@ -129,8 +129,8 @@ def generate_and_write_chinese_array_output():
# kaiti: 楷体 # kaiti: 楷体
# size = (12, 12) # size = (12, 12)
size = (16, 16) size = (16, 16)
# chinese_array = generate_chinese_array("名字班级", 'simsun', size) # chinese_array = generate_chinese_array("当前液位", 'simsun', size)
chinese_array = generate_chinese_array("姓名学号班级信息显示图片视频专业电子", 'simsun', size) chinese_array = generate_chinese_array("气泡式液位计当前", 'simsun', size)
# 将数组格式化为文本输出并写入文件 # 将数组格式化为文本输出并写入文件
text_output = format_chinese_array_as_text(chinese_array, size) text_output = format_chinese_array_as_text(chinese_array, size)