diff --git a/Global/Global.c b/Global/Global.c index 6d5c144..47af05d 100644 --- a/Global/Global.c +++ b/Global/Global.c @@ -33,11 +33,11 @@ GUI_SWITCH ParamGuiData[] = const LEBEL_UI UI_Label[] = { - {5, 115, 30, 60, (const uint8_t*)"\xD2\xC6\xB5\xF7", LCD_ALIGN_CENTER, WHITE,BLACK,11, LCD_ALIGN_CENTER,WHITE,BLACK,16, GUI_TRANSPOSE}, - {125,110, 30, 60, (const uint8_t*)"\xCB\xD9\xB6\xC8", LCD_ALIGN_CENTER, WHITE,BLACK,11, LCD_ALIGN_CENTER,WHITE,BLACK,16, GUI_SPEED}, - {5, 230, 95, 55, (const uint8_t*)"\xB8\xE8\xC7\xFA\xD1\xA1\xD2\xE9", LCD_ALIGN_LEFT,WHITE,BLACK,11,LCD_ALIGN_CENTER,WHITE,BLACK,13,GUI_MODE_PARAM}, - {5, 230, 155,55, (const uint8_t*)"\xCF\xD2\xD2\xF4\xC9\xAB\xD1\xA1\xD2\xE9",LCD_ALIGN_LEFT,WHITE,BLACK,11,LCD_ALIGN_CENTER,WHITE,BLACK,13,GUI_TIMBRE_SELECT}, - {5, 230, 210,55, (const uint8_t*)"\xD1\xDD\xD7\xE0\xB6\xCE\xC2\xE4",LCD_ALIGN_LEFT,WHITE,BLACK,11,LCD_ALIGN_CENTER,WHITE,BLACK,13,GUI_PLAY_SECTION}, + {13, 102, 48, 55, (const uint8_t*)"\xD2\xC6\xB5\xF7", LCD_ALIGN_CENTER, WHITE,BLACK,12, LCD_ALIGN_CENTER,WHITE,BLACK,16, GUI_TRANSPOSE}, + {126,101, 48, 55, (const uint8_t*)"\xCB\xD9\xB6\xC8", LCD_ALIGN_CENTER, WHITE,BLACK,12, LCD_ALIGN_CENTER,WHITE,BLACK,16, GUI_SPEED}, + {13, 215, 105,51, (const uint8_t*)"\xB8\xE8\xC7\xFA\xD1\xA1\xD2\xE9", LCD_ALIGN_LEFT,WHITE,BLACK,11,LCD_ALIGN_CENTER,WHITE,BLACK,13,GUI_MODE_PARAM}, + {13, 215, 161,50, (const uint8_t*)"\xCF\xD2\xD2\xF4\xC9\xAB\xD1\xA1\xD2\xE9",LCD_ALIGN_LEFT,WHITE,BLACK,11,LCD_ALIGN_CENTER,WHITE,BLACK,13,GUI_TIMBRE_SELECT}, + {13, 215, 210,55, (const uint8_t*)"\xB6\xCE\xC2\xE4",LCD_ALIGN_LEFT,WHITE,BLACK,11,LCD_ALIGN_CENTER,WHITE,BLACK,13,GUI_PLAY_SECTION}, }; @@ -53,26 +53,26 @@ Fader_t faders[4] = { const Touch_AreaTypeDef Touch_Areas[] = { /* Xmin,Xmax,Ymin,Ymax, Flag, Value, ID, action — 坐标相对 240x320 */ - { 0, 60, 25, 95, -1, 0, GUI_TRANSPOSE, NULL }, - { 60, 120, 25, 95, 1, 0, GUI_TRANSPOSE, NULL }, + { 13, 64, 48, 102, -1, 0, GUI_TRANSPOSE, NULL }, + { 65, 114, 48, 102, 1, 0, GUI_TRANSPOSE, NULL }, - { 125, 180, 25, 95, -1, 0, GUI_SPEED, NULL }, - { 180, 239, 25, 95, 1, 0, GUI_SPEED, NULL }, + { 126, 176, 48, 102, -1, 0, GUI_SPEED, NULL }, + { 177, 226, 48, 102, 1, 0, GUI_SPEED, NULL }, - { 0, 85, 95, 130, 0, 0, GUI_AUTOBAND_SW, NULL }, - { 90, 175, 95, 130, 0, 1, GUI_AUTOBAND_SW, NULL }, + { 12, 66, 100, 129, 0, 0, GUI_AUTOBAND_SW, NULL }, + { 72, 127, 100, 129, 0, 1, GUI_AUTOBAND_SW, NULL }, - { 0, 120, 130, 165, -1, 0, GUI_MODE_PARAM, NULL }, - { 120, 239, 130, 165, 1, 0, GUI_MODE_PARAM, NULL }, + { 13, 120, 130, 163, -1, 0, GUI_MODE_PARAM, NULL }, + { 121, 227, 130, 163, 1, 0, GUI_MODE_PARAM, NULL }, - { 0, 120, 165, 215, -1, 0, GUI_TIMBRE_SELECT, NULL }, - { 120, 239, 165, 215, 1, 0, GUI_TIMBRE_SELECT, NULL }, + { 13, 120, 168, 214, -1, 0, GUI_TIMBRE_SELECT, NULL }, + { 121, 227, 168, 214, 1, 0, GUI_TIMBRE_SELECT, NULL }, /* 演奏段落 1~4 */ - { 10, 60, 220, 270, 0, 0, GUI_PLAY_SECTION, NULL }, - { 60, 110, 220, 270, 0, 1, GUI_PLAY_SECTION, NULL }, - { 110, 165, 220, 270, 0, 2, GUI_PLAY_SECTION, NULL }, - { 165, 220, 220, 270, 0, 3, GUI_PLAY_SECTION, NULL }, + { 12, 58, 225, 268, 0, 0, GUI_PLAY_SECTION, NULL }, + { 69, 114, 225, 268, 0, 1, GUI_PLAY_SECTION, NULL }, + { 125, 171, 225, 268, 0, 2, GUI_PLAY_SECTION, NULL }, + { 182, 228, 225, 268, 0, 3, GUI_PLAY_SECTION, NULL }, /* 底栏 TAB:万能/普通/专业/设置(Value=目标 TAB) */ { 0, 79, 280, 319, 0, 0, GUI_NAV_BAR, NULL }, diff --git a/UI/UI_SongMode.c b/UI/UI_SongMode.c index af1c58a..a569ed3 100644 --- a/UI/UI_SongMode.c +++ b/UI/UI_SongMode.c @@ -8,16 +8,16 @@ static uint8_t Speed[6] = {0xF0, 0x51, 0x03, 0x00, 0x00, 0xF7}; void Draw_Tab_Mode_Menu(const LEBEL_UI *UI, GUI_SWITCH *Group) { // ===================== TAB 閰嶇疆鍙傛暟 ===================== - const uint16_t tab_w = 80; // TAB瀹藉�???? - const uint16_t tab_h = 20; // TAB楂樺�???? - const uint8_t tab_r = 5; // 鍦嗚�???? + const uint16_t tab_w = 55; // TAB瀹藉�???? + const uint16_t tab_h = 18; // TAB楂樺�???? + const uint8_t tab_r = 6; // 鍦嗚�???? //const uint8_t space = 3; // 闂�?�窛 - const uint16_t start_x = UI->x; // 璧峰X - const uint16_t start_y = UI->y; // 璧峰Y - const uint16_t text_y = UI->y + 2; // 鏂囧�????Y + const uint16_t start_x = 12; // 璧峰X + const uint16_t start_y = UI->y + 3; // 璧峰Y + const uint16_t text_y = UI->y + 6; // 鏂囧�????Y // ===================== 棰滆壊瀹氫�???? ===================== - uint16_t color_sel_bg = UI_IsFocused(GUI_MODE_PARAM) ? COLOR_PRIMARY : COLOR_NORMAL_BG; + uint16_t color_sel_bg = COLOR_GRAD_MID; uint16_t color_unsel_bg = COLOR_NORMAL_BG; uint16_t color_text = UI->Text_fc; // 鏂囧瓧棰滆�?? @@ -31,7 +31,7 @@ void Draw_Tab_Mode_Menu(const LEBEL_UI *UI, GUI_SWITCH *Group) tab_r, color_unsel_bg); - LCD_FillRoundRect(start_x+tab_w +10, + LCD_FillRoundRect(start_x+tab_w +5, start_y, tab_w, tab_h, @@ -47,18 +47,18 @@ void Draw_Tab_Mode_Menu(const LEBEL_UI *UI, GUI_SWITCH *Group) color_text, color_unsel_bg, 0, - 16 + 12 ); LCD_ShowChinese_AutoAlign( - start_x + tab_w + 15, - start_x + tab_w + tab_w, + start_x + tab_w + 5, + start_x + tab_w + 5 + tab_w, text_y, (const uint8_t *)"\xB1\xBE\xB5\xD8\xC7\xFA\xC4\xBF", UI->Text_Align, color_text, color_sel_bg, 0, - 16 + 12 ); } else @@ -70,7 +70,7 @@ void Draw_Tab_Mode_Menu(const LEBEL_UI *UI, GUI_SWITCH *Group) tab_r, color_sel_bg); - LCD_FillRoundRect(start_x+tab_w +10, + LCD_FillRoundRect(start_x+tab_w +5, start_y, tab_w, tab_h, @@ -86,18 +86,18 @@ void Draw_Tab_Mode_Menu(const LEBEL_UI *UI, GUI_SWITCH *Group) color_text, color_sel_bg, 0, - 16 + 12 ); LCD_ShowChinese_AutoAlign( - start_x + tab_w + 15, - start_x + tab_w + tab_w, + start_x + tab_w + 5, + start_x + tab_w + 5 + tab_w, text_y, (const uint8_t *)"\xB1\xBE\xB5\xD8\xC7\xFA\xC4\xBF", //�?地曲�? UI->Text_Align, color_text, color_unsel_bg, 0, - 16 + 12 ); } } diff --git a/UI/UI_global.c b/UI/UI_global.c index e513e1e..8eda88c 100644 --- a/UI/UI_global.c +++ b/UI/UI_global.c @@ -482,6 +482,7 @@ void label_Tranzpose_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) { uint8_t Textstr[20] = {0}; uint16_t c_top, c_bot; + uint16_t chev_cy = UI->y + UI->h - 12; /* < > 纵向中心 */ UI_GetFocusGrad(UI->Id, &c_top, &c_bot); LCD_FillRoundRectGradient( @@ -504,8 +505,8 @@ void label_Tranzpose_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) c_bot, UI->Tab_size ); - LCD_DrawArrow_Left(UI->x+10+5+5, UI->y+UI->h-20, 12, WHITE, c_top); - LCD_DrawArrow_Right(UI->x+UI->w+10-25-5, UI->y+UI->h-20, 12, WHITE, c_top); + LCD_DrawChevron_Left(UI->x + 18, chev_cy, 7, 2, WHITE); + LCD_DrawChevron_Right(UI->x + UI->w - 18, chev_cy, 7, 2, WHITE); GET_Num_Str(mGuiData[UI->Id].Current, 0, (char*)Textstr, UI->Id); LCD_ShowString_AutoAlign_Gradient( UI->x, @@ -521,7 +522,7 @@ void label_Tranzpose_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) LCD_ShowString_AutoAlign_Gradient( UI->x, UI->x+UI->w, - UI->y + 17+25, + UI->y + 17+21, (const uint8_t*)"KEY", UI->Text_Align, UI->Text_fc, @@ -554,8 +555,13 @@ void label_Speed_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) c_bot, UI->Tab_size ); - LCD_DrawMinus_RoundBox(UI->x+10+5+5, UI->y+UI->h-20, 30,5, WHITE, c_top); - LCD_DrawPlus_RoundBox(UI->x+UI->w+10-25-5, UI->y+UI->h-20, 30,5, WHITE, c_top); + LCD_WR_PIC_FROM_FLASH_Trans(UI->x + 5, UI->y + UI->h - 22, + UI0902_BTN_MINUS_GRAY_W, UI0902_BTN_MINUS_GRAY_H, + UI0902_BTN_MINUS_GRAY_ADDR); + LCD_WR_PIC_FROM_FLASH_Trans(UI->x + UI->w - 5 - UI0902_BTN_PLUS_GRAY_W, + UI->y + UI->h - 22, + UI0902_BTN_PLUS_GRAY_W, UI0902_BTN_PLUS_GRAY_H, + UI0902_BTN_PLUS_GRAY_ADDR); GET_Num_Str(mGuiData[UI->Id].Current, 0, (char*)Textstr, UI->Id); LCD_ShowString_AutoAlign_Gradient( UI->x, @@ -571,7 +577,7 @@ void label_Speed_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) LCD_ShowString_AutoAlign_Gradient( UI->x, UI->x+UI->w, - UI->y + 17+25, + UI->y + 17+21, (const uint8_t*)"BPM", UI->Text_Align, UI->Text_fc, @@ -620,8 +626,8 @@ void label_ModeSelece_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) case 2: paramCurData = &ParamGuiData[ALL_MODE_PARAM]; break; } show_Param(&UI_Label[GUI_MODE_PARAM], paramCurData); - LCD_DrawArrow_Left(UI->x+10+5+5, UI->y+UI->h-15-2+5, 12, WHITE, c_top); - LCD_DrawArrow_Right(UI->x+UI->w+10-25-5, UI->y+UI->h-15-2+5, 12, WHITE, c_top); + LCD_DrawChevron_Left(UI->x + 15, UI->y + 40, 7, 2, WHITE); + LCD_DrawChevron_Right(UI->x + UI->w - 15, UI->y + 40, 7, 2, WHITE); } void label_TimbreSelece_ui(const LEBEL_UI *UI, GUI_SWITCH * Group) @@ -651,8 +657,8 @@ void label_TimbreSelece_ui(const LEBEL_UI *UI, GUI_SWITCH * Group) 0, UI->Tab_size ); - LCD_DrawArrow_Left(UI->x+10+5+5, UI->y+UI->h-20+3, 12, WHITE, c_top); - LCD_DrawArrow_Right(UI->x+UI->w+10-25-5, UI->y+UI->h-20+3, 12, WHITE, c_top); + LCD_DrawChevron_Left(UI->x + 15, UI->y + 35, 7, 2, WHITE); + LCD_DrawChevron_Right(UI->x + UI->w - 15, UI->y + 35, 7, 2, WHITE); LCD_FillRoundRectGradient( UI->x + 40, UI->y+20, @@ -718,14 +724,14 @@ void Draw_Bottom_Bar(uint8_t sel, uint8_t first_back) else { icon0 = gImage_UI0902_TabSetting_Not_35x28; w0 = 35; h0 = 28; } if (sel == 1) { icon1 = gImage_UI0902_TabMixer_Sel_35x27; w1 = 35; h1 = 27; } - else { icon1 = gImage_UI0902_TabMixer_Not_18x28; w1 = 18; h1 = 28; } + else { icon1 = gImage_UI0902_TabMixer_Not_35x28; w1 = 35; h1 = 28; } if (sel == 2) { icon2 = gImage_UI0902_TabMode_Sel_36x28; w2 = 36; h2 = 28; } else { icon2 = gImage_UI0902_TabMode_Not_35x29; w2 = 35; h2 = 29; } - LCD_WR_PIC_Trans(40 - w0 / 2, 288, w0, h0, icon0, BLACK); - LCD_WR_PIC_Trans(120 - w1 / 2, 288, w1, h1, icon1, BLACK); - LCD_WR_PIC_Trans(200 - w2 / 2, 288, w2, h2, icon2, BLACK); + LCD_WR_PIC_Trans(40 - w0 / 2, 283, w0, h0, icon0, BLACK); + LCD_WR_PIC_Trans(120 - w1 / 2, 283, w1, h1, icon1, BLACK); + LCD_WR_PIC_Trans(200 - w2 / 2, 283, w2, h2, icon2, BLACK); } void label_Tab_Select_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) @@ -738,21 +744,20 @@ void label_Tab_Select_ui(const LEBEL_UI *UI,GUI_SWITCH * Group) void Draw_Tab_Section_Menu(const LEBEL_UI *UI, TAB_SECTION_INDEX select_tab) { - const uint16_t tab_w = 50; - const uint16_t tab_h = 24 + 11; + const uint16_t tab_w = 47; + const uint16_t tab_h = 34; const uint8_t tab_r = 5; - const uint8_t space = 3; - const uint16_t start_x = UI->x + 10; - const uint16_t start_y = UI->y + 28 - 6; - const uint16_t text_y = UI->y + 28 - 3; + const uint8_t pitch = 57; + const uint16_t start_x = 12; + const uint16_t start_y = UI->y + 19; + const uint16_t text_y = start_y + 11; const char *nums[4] = {"1", "2", "3", "4"}; - uint8_t focused = UI_IsFocused(GUI_PLAY_SECTION); uint8_t i; for (i = 0; i < 4; i++) { - uint16_t x = start_x + i * (tab_w + space); - uint16_t bg = (focused && (select_tab == i)) ? COLOR_PRIMARY : COLOR_NORMAL_BG; + uint16_t x = start_x + i * pitch; + uint16_t bg = (select_tab == i) ? COLOR_GRAD_MID : COLOR_NORMAL_BG; LCD_FillRoundRect(x, start_y, tab_w, tab_h, tab_r, bg); LCD_ShowString_AutoAlign( x, x + tab_w, text_y, @@ -761,7 +766,7 @@ void Draw_Tab_Section_Menu(const LEBEL_UI *UI, TAB_SECTION_INDEX select_tab) WHITE, bg, 0, - 24 + 12 ); } } diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c b/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c index 3caba51..a1b0ae8 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c @@ -1631,6 +1631,17 @@ void LCD_DrawChevron_Right(uint16_t x, uint16_t y, uint8_t size, uint8_t thick, } } +/* LCD_DrawChevron_Right 的左向镜像:x,y 为尖角处坐标 */ +void LCD_DrawChevron_Left(uint16_t x, uint16_t y, uint8_t size, uint8_t thick, uint16_t color) +{ + for (uint8_t i = 0; i < thick; i++) { + LCD_DrawLine(x, y - size + i, x - size + i, y, color); + } + for (uint8_t i = 0; i < thick; i++) { + LCD_DrawLine(x, y + size - i, x - size + i, y, color); + } +} + /****************************************************************************** 函数说明:画【圆角框 + 居中加号 +】 diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_ChineseFont.h b/device/LCD_ILI9341/Drv_ILI9341_Lcd_ChineseFont.h index f8c4ac4..a3218ba 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_ChineseFont.h +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_ChineseFont.h @@ -164,6 +164,11 @@ const char CHS12Table[][2] = { {0xB3,0xA7}, // 厂 {0xC9,0xE8}, // 设 {0xD6,0xC3}, // 置 + {0xBD,0xDA}, // 节 + {0xC0,0xE0}, // 类 + {0xD0,0xCD}, // 型 + {0xB5,0xD8}, // 地 + {0xC4,0xBF}, // 目 }; const char CHS13Table[][2] = { @@ -871,6 +876,11 @@ const unsigned char Chinese_font_12[][24] = { {0x00,0x00,0x3F,0xC0,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x60,0x00,0x40,0x00,0x40,0x00,0x00,0x00},/*"厂",48*/ {0x00,0x00,0x67,0x80,0x24,0x80,0x0C,0xC0,0x68,0x00,0x2F,0xC0,0x2C,0x80,0x25,0x80,0x33,0x00,0x2F,0xC0,0x00,0x40,0x00,0x00},/*"设",49*/ {0x00,0x00,0x7F,0xC0,0x7B,0xC0,0x04,0x00,0x7F,0xC0,0x3F,0x80,0x3F,0x80,0x3F,0x80,0x20,0x80,0x20,0x80,0x00,0x00,0x00,0x00},/*"置",50*/ +{0x00,0x00,0x11,0x00,0x7F,0xC0,0x11,0x00,0x7F,0x80,0x7F,0x80,0x08,0x80,0x08,0x80,0x0B,0x80,0x08,0x00,0x08,0x00,0x00,0x00},/*"节",51*/ +{0x00,0x00,0x24,0x80,0x15,0x00,0x7F,0xC0,0x1E,0x00,0x75,0xC0,0x44,0x00,0x7F,0xC0,0x0E,0x00,0x71,0x80,0x40,0x40,0x00,0x00},/*"类",52*/ +{0x00,0x00,0x7C,0x40,0x29,0x40,0x2D,0x40,0x7D,0x40,0x68,0xC0,0x40,0x80,0x3F,0x80,0x04,0x00,0x06,0x00,0x00,0x00,0x00,0x00},/*"型",53*/ +{0x00,0x00,0x22,0x00,0x2A,0x00,0x6B,0xC0,0x7F,0x40,0x2A,0x40,0x2B,0xC0,0x2B,0x80,0x78,0x40,0x0F,0xC0,0x00,0x00,0x00,0x00},/*"地",54*/ +{0x00,0x00,0x3F,0x80,0x20,0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x00,0x00},/*"目",55*/ }; const unsigned char Chinese_font_11[][22] = { @@ -1492,9 +1502,9 @@ const unsigned char Chinese_font_16[][32] = { {0x00,0x40,0x3C,0x40,0x24,0x40,0x24,0x40,0x2C,0x40,0x28,0xC0,0x2C,0xC0,0x24,0xE0,0x24,0xE0,0x25,0xB0,0x3D,0x10,0x23,0x18,0x26,0x0C,0x24,0x04,0x00,0x00,0x00,0x00},/*"队",180*/ {0x00,0x00,0x7D,0xF8,0x6D,0xFC,0x6D,0x0C,0x69,0x0C,0x69,0x0C,0x69,0xFC,0x6D,0xFC,0x65,0x0C,0x65,0x0C,0x7D,0x0C,0x79,0xFC,0x61,0xFC,0x61,0x0C,0x00,0x00,0x00,0x00},/*"阳",181*/ {0x08,0x00,0x7F,0xF8,0x3E,0x8C,0x00,0xF8,0x7E,0xD8,0x7E,0x70,0x40,0x8C,0x5F,0xE0,0x7F,0xFC,0x0D,0x60,0x7F,0xFC,0x18,0x30,0x18,0x30,0x1F,0xF0,0x00,0x00,0x00,0x00},/*"馨",182*/ -{0x04,0x20,0x04,0x20,0x7F,0xFE,0x36,0x6C,0x12,0x48,0x1A,0x58,0x7F,0xFE,0x00,0x00,0x1F,0xF8,0x1F,0xF8,0x10,0x08,0x1F,0xF8,0x10,0x08,0x1F,0xF8,0x18,0x18,0x00,0x00},/*"普",183*/ -{0x00,0x00,0x27,0xFC,0x31,0x1C,0x11,0xF0,0x03,0xFC,0x07,0xFC,0x76,0x64,0x37,0xFC,0x36,0x64,0x37,0xFC,0x36,0x64,0x36,0x6C,0x38,0x08,0x6F,0xFE,0x03,0xFE,0x00,0x00},/*"通",184*/ -{0x00,0x00,0x06,0x60,0x06,0x60,0x26,0x64,0x26,0x66,0x36,0x6C,0x36,0x6C,0x16,0x68,0x1E,0x78,0x0E,0x70,0x06,0x60,0x06,0x60,0x06,0x60,0x7F,0xFE,0x00,0x00,0x00,0x00},/*"业",185*/ +{0x0C,0x20,0x0C,0x60,0x7F,0xFC,0x26,0xC8,0x16,0xD0,0x16,0xD0,0x7F,0xFC,0x00,0x00,0x1F,0xF0,0x10,0x10,0x1F,0xF0,0x10,0x10,0x1F,0xF0,0x10,0x10,0x00,0x00,0x00,0x00},/*"普",183*/ +{0x00,0x00,0x00,0x00,0x27,0xF8,0x31,0x38,0x11,0xE0,0x07,0xF8,0x74,0x48,0x77,0xF8,0x36,0xC8,0x37,0xF8,0x36,0xC8,0x34,0x48,0x34,0x18,0x6F,0xFC,0x07,0xFC,0x00,0x00},/*"通",184*/ +{0x00,0x00,0x04,0x40,0x06,0x40,0x06,0x40,0x66,0x4C,0x26,0x48,0x36,0x48,0x36,0x58,0x16,0x50,0x1E,0x70,0x06,0x40,0x06,0x40,0x06,0xC0,0x7F,0xFC,0x00,0x00,0x00,0x00},/*"业",185*/ }; const unsigned char Chinese_font_24[][72] = { diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Dump.c b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Dump.c index 8bd63c3..9306dcd 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Dump.c +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Dump.c @@ -211,6 +211,38 @@ static uint8_t LCD_Dump_CommandPending(void) s_cmd_buf[0] = '\0'; continue; } + /* TAP [x y]:缺省 120,80;换行后解析,避免坐标未收齐就触发 */ + if (strncmp(s_cmd_buf, LCD_DUMP_TAP_CMD, 3) == 0) { + unsigned tx = 120U; + unsigned ty = 80U; + if (s_cmd_buf[3] == ' ' || s_cmd_buf[3] == '\t') { + char *p1 = s_cmd_buf + 4; + char *p2; + tx = (unsigned)strtoul(p1, &p2, 10); + if (p2 != p1) { + while (*p2 == ' ' || *p2 == '\t') p2++; + ty = (unsigned)strtoul(p2, NULL, 10); + } + } + if (tx > 239U) tx = 239U; + if (ty > 319U) ty = 319U; + MainTask_Sendmsg(MSG_ID_TOUCH, 1, (uint16_t)tx, (uint16_t)ty); + SEGGER_RTT_WriteString(0, "TAP inject\n"); + s_cmd_len = 0U; + s_cmd_buf[0] = '\0'; + continue; + } + if (strcmp(s_cmd_buf, LCD_DUMP_RESET_CMD) == 0) { + (void)app_log_try_command(LCD_DUMP_RESET_CMD); + s_cmd_len = 0U; + s_cmd_buf[0] = '\0'; + continue; + } + if (strcmp(s_cmd_buf, LCD_DUMP_CMD) == 0) { + s_cmd_len = 0U; + s_cmd_buf[0] = '\0'; + return 1U; + } } s_cmd_len = 0U; s_cmd_buf[0] = '\0'; @@ -223,23 +255,7 @@ static uint8_t LCD_Dump_CommandPending(void) s_cmd_buf[s_cmd_len++] = c; s_cmd_buf[s_cmd_len] = '\0'; - /* 合成点击:验证 UI 命中路径(点万能按钮中心) */ - if (strstr(s_cmd_buf, LCD_DUMP_TAP_CMD) != NULL) { - s_cmd_len = 0U; - s_cmd_buf[0] = '\0'; - MainTask_Sendmsg(MSG_ID_TOUCH, 1, 120, 80); - SEGGER_RTT_WriteString(0, "TAP inject 120,80\n"); - continue; - } - - if (strstr(s_cmd_buf, LCD_DUMP_RESET_CMD) != NULL) { - s_cmd_len = 0U; - s_cmd_buf[0] = '\0'; - (void)app_log_try_command(LCD_DUMP_RESET_CMD); - continue; - } - - if (c == 0x01 || strstr(s_cmd_buf, LCD_DUMP_CMD) != NULL) { + if (c == 0x01) { s_cmd_len = 0U; s_cmd_buf[0] = '\0'; return 1U; diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c index 20db55b..5149a23 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.c @@ -588,6 +588,132 @@ const unsigned char gImage_UI0902_TabMixer_Not_18x28[1008] = { /* 18x28 RGB565 B 0x42,0x08,0x42,0x08,0x42,0x08,0x42,0x08,0x42,0x08,0x42,0x08,0x42,0x08,0x21,0x04, }; +const unsigned char gImage_UI0902_TabMixer_Not_35x28[1960] = { /* 35x28 RGB565 BE */ +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x09,0x8D,0x00,0xE7,0x09,0x8D,0x09,0x8D, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x12,0xD8,0x1B,0x9F,0x1A,0xFA,0x09,0xF1,0x12,0xD8,0x12,0xD8,0x12,0xD8,0x12,0xD8, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x12,0x54,0x1B,0x7E,0x12,0x54,0x1B,0x7E,0x09,0xF1, +0x1A,0xFA,0x1A,0xFA,0x1A,0xFA,0x12,0x54,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xE7, +0x1B,0x7E,0x1A,0xFA,0x1B,0x3C,0x09,0xF1,0x12,0xD8,0x12,0xD8,0x12,0xD8,0x09,0xF1, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x12,0xD8,0x09,0xAF,0x12,0x54,0x09,0xF1, +0x12,0xD8,0x12,0xD8,0x12,0xD8,0x09,0xF1,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x09,0xF1, +0x1B,0x9F,0x1A,0xFA,0x1B,0x9F,0x09,0xF1,0x12,0xD8,0x12,0xD8,0x12,0xD8,0x09,0xF1, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09,0x1B,0x3C,0x1A,0xFA,0x1B,0x9F,0x09,0xF1, +0x1B,0x7E,0x1B,0x7E,0x1B,0x7E,0x1B,0x3C,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x12,0xD8,0x12,0x96,0x12,0x33,0x09,0xF1,0x01,0x09,0x01,0x09,0x01,0x09,0x01,0x09, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xA6,0x00,0xA6, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xE7, +0x09,0xF1,0x00,0x42,0x12,0xD8,0x12,0x54,0x01,0x09,0x09,0x4B,0x1B,0x3C,0x09,0xF1, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09,0x12,0x33,0x12,0xD8,0x12,0xD8, +0x12,0xD8,0x12,0x33,0x00,0xE7,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xE7,0x1A,0xFA,0x1A,0xFA,0x12,0xD8,0x1B,0x9F, +0x1B,0x9F,0x1B,0x9F,0x1B,0x7E,0x00,0x64,0x00,0x42,0x00,0x42,0x00,0x64,0x12,0x96, +0x1B,0x9F,0x12,0x54,0x09,0xAF,0x01,0x09,0x09,0xAF,0x12,0x96,0x1B,0x9F,0x12,0x96, +0x00,0x64,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xA6, +0x09,0x8D,0x09,0xAF,0x09,0xF1,0x09,0xF1,0x09,0xF1,0x12,0x33,0x1B,0x7E,0x09,0xAF, +0x00,0x42,0x00,0x64,0x1A,0xFA,0x1A,0xFA,0x00,0xA6,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0xE7,0x1A,0xFA,0x1A,0xFA,0x00,0x64,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09,0x1B,0x7E,0x12,0xD8,0x12,0xD8,0x1B,0x3C, +0x1B,0x3C,0x09,0xF1,0x12,0xD8,0x12,0x96,0x00,0x42,0x12,0x96,0x1A,0xFA,0x00,0x64, +0x00,0x64,0x12,0x54,0x1A,0xFA,0x12,0xD8,0x1A,0xFA,0x09,0xF1,0x00,0x64,0x00,0x64, +0x1B,0x3C,0x12,0x33,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09, +0x1B,0x7E,0x1B,0x9F,0x12,0xD8,0x1B,0x3C,0x1B,0x3C,0x09,0xF1,0x12,0x54,0x12,0xD8, +0x00,0xE7,0x1B,0x9F,0x01,0x09,0x00,0x64,0x12,0xD8,0x09,0x4B,0x00,0x42,0x00,0x42, +0x00,0x42,0x09,0xAF,0x1A,0xFA,0x00,0x64,0x01,0x09,0x1B,0x9F,0x00,0xA6,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09,0x1B,0x3C,0x1B,0x9F,0x12,0xD8,0x1B,0x3C, +0x1B,0x3C,0x12,0x54,0x12,0xD8,0x12,0xD8,0x09,0xF1,0x1B,0x3C,0x00,0x42,0x12,0x54, +0x09,0xAF,0x00,0x42,0x00,0xA6,0x12,0x33,0x00,0x64,0x00,0x42,0x09,0xAF,0x09,0xF1, +0x00,0x42,0x1A,0xFA,0x09,0xAF,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09, +0x1B,0x9F,0x1B,0x3C,0x12,0x54,0x1A,0xFA,0x1A,0xFA,0x12,0x54,0x1B,0x9F,0x12,0xD8, +0x09,0xF1,0x09,0x4B,0x00,0x42,0x12,0x33,0x00,0x42,0x00,0xE7,0x1B,0x9F,0x1B,0x9F, +0x1A,0xFA,0x00,0xE7,0x00,0x42,0x12,0xD8,0x00,0x42,0x12,0x33,0x12,0x54,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xE7,0x12,0x54,0x09,0x8D,0x12,0xD8,0x12,0xD8, +0x12,0xD8,0x12,0xD8,0x12,0x96,0x12,0xD8,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x01,0x09,0x1B,0x9F,0x1B,0x9F,0x1B,0x9F,0x09,0xF1,0x00,0x42,0x1B,0x3C, +0x00,0x42,0x09,0xF1,0x12,0xD8,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x01,0x09,0x00,0x42,0x00,0x42,0x01,0x09,0x00,0xE7,0x00,0xA6,0x00,0x64, +0x00,0xE7,0x09,0xF1,0x09,0xF1,0x09,0xF1,0x09,0xF1,0x12,0x54,0x1B,0x9F,0x1B,0x9F, +0x1B,0x9F,0x01,0x09,0x00,0x64,0x12,0xD8,0x00,0x42,0x12,0x33,0x12,0x54,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xA6,0x01,0x09,0x1B,0x9F,0x09,0xAF,0x1B,0x3C, +0x1B,0x9F,0x12,0x33,0x01,0x09,0x01,0x09,0x09,0xAF,0x1B,0x7E,0x09,0xF1,0x09,0xF1, +0x09,0xF1,0x09,0xF1,0x09,0xF1,0x09,0xF1,0x00,0xE7,0x00,0x42,0x12,0x33,0x09,0x8D, +0x00,0x42,0x1B,0x3C,0x09,0x8D,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x09,0x8D, +0x12,0xD8,0x1B,0x9F,0x1A,0xFA,0x1B,0x9F,0x1A,0xFA,0x12,0xD8,0x12,0xD8,0x12,0xD8, +0x00,0xA6,0x1B,0x9F,0x09,0x4B,0x00,0x42,0x09,0x4B,0x12,0x33,0x00,0x64,0x00,0x42, +0x00,0xA6,0x12,0x96,0x12,0x54,0x00,0x42,0x09,0xAF,0x1B,0x7E,0x00,0x64,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x12,0x33,0x1B,0x3C,0x09,0x4B,0x1B,0x7E, +0x09,0xF1,0x12,0xD8,0x00,0xE7,0x1A,0xFA,0x00,0x42,0x12,0x33,0x1B,0x7E,0x00,0xE7, +0x00,0x42,0x09,0x8D,0x12,0xD8,0x12,0xD8,0x12,0x96,0x09,0x8D,0x00,0x42,0x00,0xE7, +0x1B,0x7E,0x09,0xAF,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09, +0x1B,0x3C,0x12,0xD8,0x1B,0x7E,0x1B,0x7E,0x12,0xD8,0x1B,0x9F,0x12,0x33,0x12,0x54, +0x00,0x42,0x00,0x42,0x12,0x54,0x1B,0x7E,0x09,0x8D,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x09,0xAF,0x1B,0x7E,0x12,0x54,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09,0x1B,0x3C,0x12,0xD8,0x12,0xD8,0x12,0xD8, +0x1B,0x3C,0x1B,0x9F,0x1B,0x7E,0x00,0xA6,0x00,0x42,0x00,0x42,0x00,0x42,0x09,0xF1, +0x1B,0x7E,0x1B,0x3C,0x12,0x54,0x09,0xF1,0x12,0x54,0x1B,0x7E,0x1B,0x7E,0x09,0xAF, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xA6, +0x1A,0xFA,0x12,0x54,0x12,0xD8,0x12,0xD8,0x1B,0x7E,0x1B,0x9F,0x1B,0x7E,0x00,0x64, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x64,0x09,0x8D,0x09,0xF1,0x09,0xF1, +0x09,0xF1,0x09,0x8D,0x00,0x64,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x09,0x8D,0x1B,0x7E,0x1B,0x3C,0x1B,0x3C,0x1B,0x3C, +0x12,0xD8,0x1B,0x9F,0x12,0x96,0x12,0x54,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x12,0xD8,0x01,0x09,0x09,0xF1,0x09,0xF1,0x09,0x8D,0x1B,0x9F,0x09,0x4B,0x1A,0xFA, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x09,0xF1,0x00,0x42,0x01,0x09, +0x00,0x42,0x00,0x42,0x09,0x8D,0x00,0x64,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x1B,0x9F,0x00,0x42,0x1B,0x9F,0x00,0x42,0x00,0x42,0x1B,0x3C,0x01,0x09, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x1B,0x9F,0x00,0x42,0x1B,0x9F, +0x12,0xD8,0x12,0xD8,0x1B,0x9F,0x00,0xA6,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x1B,0x9F,0x00,0x42,0x1B,0x9F,0x09,0xF1,0x12,0x54,0x1B,0x9F,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x1B,0x9F,0x00,0x42,0x1B,0x9F, +0x00,0x42,0x01,0x09,0x1A,0xFA,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x09,0xF1, +0x1B,0x9F,0x1B,0x9F,0x1B,0x9F,0x1A,0xFA,0x12,0xD8,0x09,0xF1,0x09,0x4B,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09,0x09,0x8D,0x1B,0x9F,0x01,0x09,0x01,0x09, +0x09,0xF1,0x1A,0xFA,0x1B,0x9F,0x09,0x8D,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x01,0x09, +0x1B,0x9F,0x1B,0x9F,0x00,0x42,0x00,0x42,0x00,0x42,0x09,0x4B,0x1A,0xFA,0x12,0xD8, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, +0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xA6,0x12,0xD8,0x00,0x42,0x00,0x42, +0x00,0x42,0x12,0x96,0x09,0xF1,0x00,0xA6, +}; + const unsigned char gImage_UI0902_TabMode_Sel_36x28[2016] = { /* 36x28 RGB565 BE */ 0x00,0x00,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42, 0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0xA6, diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h index 1b66c0a..e332bec 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Image_UI0902.h @@ -11,6 +11,7 @@ extern const unsigned char gImage_UI0902_TabSetting_Sel_36x28[2016]; extern const unsigned char gImage_UI0902_TabSetting_Not_35x28[1960]; extern const unsigned char gImage_UI0902_TabMixer_Sel_35x27[1890]; extern const unsigned char gImage_UI0902_TabMixer_Not_18x28[1008]; +extern const unsigned char gImage_UI0902_TabMixer_Not_35x28[1960]; extern const unsigned char gImage_UI0902_TabMode_Sel_36x28[2016]; extern const unsigned char gImage_UI0902_TabMode_Not_35x29[2030]; extern const unsigned char gImage_UI0902_TabBack_Sel_35x27[1890]; diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Init.h b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Init.h index 98e7a0e..04562f8 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_Init.h +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_Init.h @@ -101,6 +101,7 @@ extern void LCD_SetWindow(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2); extern void LCD_Init(void); //LCD初始化 extern void LCD_SPI_DMA_Send(const uint8_t *data, uint32_t len); //SPI2 DMA批量发送 extern void LCD_DrawChevron_Right(uint16_t x, uint16_t y, uint8_t size, uint8_t thick, uint16_t color); //向右空心尖括号 +extern void LCD_DrawChevron_Left(uint16_t x, uint16_t y, uint8_t size, uint8_t thick, uint16_t color); //向左空心尖括号 // 渐变背景文字显示(先画垂直渐变底,再叠加文字笔画) extern uint32_t LCD_ShowChinese_AutoAlign_Gradient(uint16_t x1, uint16_t x2, uint16_t y,