fix(ui): align transpose and tempo controls with the 0924 mockup

Match the card box to the reference, put the value on the same center line as the arrow and plus-minus chips, and use MiSans for the 16px digits.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yuquanjun 2026-09-25 11:16:20 +08:00
parent ea60c1fb62
commit 4063bab4b5
20 changed files with 1464 additions and 1083 deletions

View File

@ -313,13 +313,18 @@ static void app_adc_hp_process(void)
static void app_adc_volume_map_level(uint16_t val)
{
/* 5 格状态栏音量条:0=静音,5=最大 */
if (val <= 5) level = 0;
else if (val <= 35) level = 1;
else if (val <= 65) level = 2;
else if (val <= 95) level = 3;
else if (val <= 115) level = 4;
else level = 5;
/* 8 格状态栏音量条:0=静音,8=最大(K1_UI_0923-05) */
if (val <= 5)
level = 0;
else
{
uint16_t lv = (uint16_t)((val * 8u + 64u) / 128u);
if (lv < 1u)
lv = 1u;
if (lv > 8u)
lv = 8u;
level = (uint8_t)lv;
}
}
void app_adc_sync_volume(uint16_t val)

View File

@ -56,6 +56,8 @@ static void app_log_flash_flush_page(void)
/* 每页 ACK,避免主机打爆 RTT 下行缓冲 */
snprintf(ack, sizeof(ack), "FLASH_ACK %lu\n", (unsigned long)s_flash_addr);
SEGGER_RTT_WriteString(APP_LOG_RTT_CHANNEL, ack);
/* 整包 UI 超过自动关机窗口,刷写时保持开机 */
ResetAutoPowerCount();
}
static void app_log_flash_feed(const uint8_t *data, unsigned len)

View File

@ -34,10 +34,10 @@ GUI_SWITCH ParamGuiData[] =
const LEBEL_UI UI_Label[] = {
/* 0819:移调/速度 标签11、主值16 */
{UI0902_MARGIN_X, UI0902_CARD_W, UI0902_CARD_Y, UI0902_CARD_H,
{UI0902_CARD_X, UI0902_CARD_W, UI0902_CARD_Y, UI0902_CARD_H,
(const uint8_t*)"\xD2\xC6\xB5\xF7", LCD_ALIGN_CENTER, WHITE,BLACK,UI0902_FONT_LABEL,
LCD_ALIGN_CENTER,WHITE,BLACK,UI0902_FONT_HERO, GUI_TRANSPOSE},
{UI0902_MARGIN_X + UI0902_CARD_W + UI0902_CARD_GAP, UI0902_CARD_W, UI0902_CARD_Y, UI0902_CARD_H,
{UI0902_CARD_X + UI0902_CARD_W + UI0902_CARD_GAP, UI0902_CARD_W, UI0902_CARD_Y, UI0902_CARD_H,
(const uint8_t*)"\xCB\xD9\xB6\xC8", LCD_ALIGN_CENTER, WHITE,BLACK,UI0902_FONT_LABEL,
LCD_ALIGN_CENTER,WHITE,BLACK,UI0902_FONT_HERO, GUI_SPEED},
/* 0819:TAB/行标题11、曲目正文13 */
@ -71,11 +71,17 @@ const Touch_AreaTypeDef Touch_Areas[] =
0, 0, GUI_BL_SW, NULL },
/* Xmin,Xmax,Ymin,Ymax, Flag, Value, ID, action — 与 UI_Label 网格同步 */
{ 12, 64, UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, -1, 0, GUI_TRANSPOSE, NULL },
{ 65, 116, UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, 1, 0, GUI_TRANSPOSE, NULL },
{ UI0902_CARD_X, (uint16_t)(UI0902_CARD_X + UI0902_CARD_W / 2 - 1),
UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, -1, 0, GUI_TRANSPOSE, NULL },
{ (uint16_t)(UI0902_CARD_X + UI0902_CARD_W / 2), (uint16_t)(UI0902_CARD_X + UI0902_CARD_W - 1),
UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, 1, 0, GUI_TRANSPOSE, NULL },
{ 125, 176, UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, -1, 0, GUI_SPEED, NULL },
{ 177, 228, UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, 1, 0, GUI_SPEED, NULL },
{ (uint16_t)(UI0902_CARD_X + UI0902_CARD_W + UI0902_CARD_GAP),
(uint16_t)(UI0902_CARD_X + UI0902_CARD_W + UI0902_CARD_GAP + UI0902_CARD_W / 2 - 1),
UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, -1, 0, GUI_SPEED, NULL },
{ (uint16_t)(UI0902_CARD_X + UI0902_CARD_W + UI0902_CARD_GAP + UI0902_CARD_W / 2),
(uint16_t)(UI0902_CARD_X + UI0902_CARD_W * 2 + UI0902_CARD_GAP - 1),
UI0902_CARD_Y, UI0902_CARD_Y + UI0902_CARD_H - 1, 1, 0, GUI_SPEED, NULL },
/* 节奏类型 / 本地曲目 TAB(0902:12-66 / 72-127) */
{ 12, 66, UI0902_MODE_Y, UI0902_MODE_Y + UI0902_TAB_H - 1, 0, 0, GUI_AUTOBAND_SW, NULL },

View File

@ -27,11 +27,11 @@ void UI_BootLedShow(void)
extern bool InModeFlag;
/* 0902-01:行高88、行距92;顶边与模式主页移调/速度(CARD_Y=48)对齐,分割线居中 */
/* 模式选择三行与演奏页移调卡不再共用 Y:演奏页按 0923-04 上移后仍保持本页 48/140/232 */
#define UI0902_MODE_ROW_X 9
#define UI0902_MODE_ROW_W 222
#define UI0902_MODE_ROW_H 88
#define UI0902_MODE_ROW_Y0 UI0902_CARD_Y /* 48,与移调/速度顶对齐 */
#define UI0902_MODE_ROW_Y0 48
#define UI0902_MODE_ROW_DY 92 /* 48 / 140 / 232 */
/* 模式页不显示焦点:三行均用未选中资源;单击直接进入 */

View File

@ -670,9 +670,8 @@ void Refresh_Transpose(const LEBEL_UI *UI, GUI_SWITCH * Group)
{
uint16_t c_top, c_bot;
uint16_t cx = (UI->Id == GUI_SPEED) ? UI0902_CARD_TEXT_CX_R : UI0902_CARD_TEXT_CX_L;
uint16_t value_y, value_y0, sub_y, x1, x2, content_w, clear_w, clear_h;
uint16_t value_y, value_y0, x1, x2, content_w, clear_w, clear_h;
char Textstr1[20] = {0,};
const uint8_t *sub_txt = (UI->Id == GUI_SPEED) ? (const uint8_t *)"BPM" : (const uint8_t *)"KEY";
UI_GetFocusGrad(UI->Id, &c_top, &c_bot);
GET_Num_Str(Group->Current,0,Textstr1,Group->Id);
content_w = (uint16_t)(strlen(Textstr1) * UI0902_ASCII_W(UI0902_CARD_VALUE_SIZE));
@ -682,44 +681,25 @@ void Refresh_Transpose(const LEBEL_UI *UI, GUI_SWITCH * Group)
clear_w = content_w;
if (clear_w < UI0902_CARD_VALUE_W)
clear_w = UI0902_CARD_VALUE_W;
value_y0 = UI_CardTextDrawY(UI0902_CARD_VALUE_Y, UI0902_CARD_VALUE_H,
UI0902_CARD_VALUE_LH, UI0902_CARD_VALUE_SIZE);
value_y = (uint16_t)((int16_t)value_y0 + UI0902_CARD_VALUE_OY);
/* 清区高度保证主值完整;不得侵入 KEY/BPM 行 */
value_y0 = (uint16_t)(UI0902_CARD_CTRL_CY - UI0902_CARD_VALUE_SIZE / 2);
value_y = value_y0;
clear_h = (uint16_t)(UI0902_CARD_VALUE_H + 1);
if (clear_h < (uint16_t)(UI0902_CARD_VALUE_SIZE + 1))
clear_h = (uint16_t)(UI0902_CARD_VALUE_SIZE + 1);
if (value_y + clear_h > UI0902_CARD_SUB_Y)
clear_h = (uint16_t)(UI0902_CARD_SUB_Y - value_y);
x1 = (uint16_t)(UI_CardTextBoxX1(cx, clear_w, clear_w) + UI0902_CARD_VALUE_OX);
x2 = (uint16_t)(UI_CardTextBoxX2(cx, clear_w, clear_w) + UI0902_CARD_VALUE_OX);
x1 = UI_CardTextBoxX1(cx, clear_w, clear_w);
x2 = UI_CardTextBoxX2(cx, clear_w, clear_w);
LCD_FillRoundRectGradient(
x1, value_y,
(uint16_t)(x2 - x1 + 1),
clear_h,
0, c_top, c_bot);
x1 = (uint16_t)(UI_CardTextBoxX1(cx, UI0902_CARD_VALUE_W, content_w) + UI0902_CARD_VALUE_OX);
x2 = (uint16_t)(UI_CardTextBoxX2(cx, UI0902_CARD_VALUE_W, content_w) + UI0902_CARD_VALUE_OX);
x1 = UI_CardTextBoxX1(cx, UI0902_CARD_VALUE_W, content_w);
x2 = UI_CardTextBoxX2(cx, UI0902_CARD_VALUE_W, content_w);
LCD_ShowString_AutoAlign_Gradient(
x1, x2, value_y,
(const uint8_t*)Textstr1,
LCD_ALIGN_CENTER, UI->Text_fc, c_top, c_bot,
UI0902_CARD_VALUE_SIZE);
/* 主值刷新后必须重画 KEY/BPM,避免残影或被清区边缘吃掉 */
sub_y = UI_CardTextDrawY(UI0902_CARD_SUB_Y, UI0902_CARD_SUB_H,
UI0902_CARD_SUB_LH, UI0902_CARD_SUB_SIZE);
x1 = UI_CardTextBoxX1(cx, UI0902_CARD_SUB_W, UI0902_CARD_SUB_W);
x2 = UI_CardTextBoxX2(cx, UI0902_CARD_SUB_W, UI0902_CARD_SUB_W);
LCD_FillRoundRectGradient(
x1, sub_y,
(uint16_t)(x2 - x1 + 1),
UI0902_CARD_SUB_SIZE + 1,
0, c_top, c_bot);
LCD_ShowString_AutoAlign_Gradient(
x1, x2, sub_y, sub_txt,
LCD_ALIGN_CENTER, UI->Text_fc, c_top, c_bot,
UI0902_CARD_SUB_SIZE);
}
@ -788,7 +768,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 cx = UI0902_CARD_TEXT_CX_L;
uint16_t label_y, value_y, sub_y, chev_cy;
uint16_t label_y, value_y, chev_cy;
uint16_t x1, x2, content_w;
UI_GetFocusGrad(UI->Id, &c_top, &c_bot);
@ -807,35 +787,17 @@ void label_Tranzpose_ui(const LEBEL_UI *UI,GUI_SWITCH * Group)
GET_Num_Str(mGuiData[UI->Id].Current, 0, (char*)Textstr, UI->Id);
content_w = (uint16_t)(strlen((char*)Textstr) * UI0902_ASCII_W(UI0902_CARD_VALUE_SIZE));
/* 主值基准位:三角仍按此中线;字母单独右移/上移 */
value_y = UI_CardTextDrawY(UI0902_CARD_VALUE_Y, UI0902_CARD_VALUE_H,
UI0902_CARD_VALUE_LH, UI0902_CARD_VALUE_SIZE);
/* 主值、左右三角色块共用稿面中线 y=74 */
value_y = (uint16_t)(UI0902_CARD_CTRL_CY - UI0902_CARD_VALUE_SIZE / 2);
x1 = UI_CardTextBoxX1(cx, UI0902_CARD_VALUE_W, content_w);
x2 = UI_CardTextBoxX2(cx, UI0902_CARD_VALUE_W, content_w);
/* mode.png:三角中心低于主值中线约 3px(≈y81) */
chev_cy = (uint16_t)(value_y + UI0902_CARD_VALUE_SIZE / 2 + 3);
chev_cy = UI0902_CARD_CTRL_CY;
UI_DrawTriLeft(UI->x + 5, chev_cy);
UI_DrawTriRight((uint16_t)(UI->x + UI->w - 5 - UI0902_TRI_R_W), chev_cy);
LCD_ShowString_AutoAlign_Gradient(
(uint16_t)(x1 + UI0902_CARD_VALUE_OX),
(uint16_t)(x2 + UI0902_CARD_VALUE_OX),
(uint16_t)((int16_t)value_y + UI0902_CARD_VALUE_OY),
x1, x2, value_y,
Textstr,
LCD_ALIGN_CENTER, UI->Text_fc, c_top, c_bot, UI0902_CARD_VALUE_SIZE);
/* KEY:独立行;先清底再画,保证不被主值残影叠住 */
sub_y = UI_CardTextDrawY(UI0902_CARD_SUB_Y, UI0902_CARD_SUB_H,
UI0902_CARD_SUB_LH, UI0902_CARD_SUB_SIZE);
x1 = UI_CardTextBoxX1(cx, UI0902_CARD_SUB_W, UI0902_CARD_SUB_W);
x2 = UI_CardTextBoxX2(cx, UI0902_CARD_SUB_W, UI0902_CARD_SUB_W);
LCD_FillRoundRectGradient(
x1, sub_y,
(uint16_t)(x2 - x1 + 1),
UI0902_CARD_SUB_SIZE + 1,
0, c_top, c_bot);
LCD_ShowString_AutoAlign_Gradient(
x1, x2, sub_y, (const uint8_t*)"KEY",
LCD_ALIGN_CENTER, UI->Text_fc, c_top, c_bot, UI0902_CARD_SUB_SIZE);
}
void label_Speed_ui(const LEBEL_UI *UI,GUI_SWITCH * Group)
@ -843,7 +805,7 @@ void label_Speed_ui(const LEBEL_UI *UI,GUI_SWITCH * Group)
uint8_t Textstr[20] = {0};
uint16_t c_top, c_bot;
uint16_t cx = UI0902_CARD_TEXT_CX_R;
uint16_t label_y, value_y, sub_y;
uint16_t label_y, value_y;
uint16_t x1, x2, content_w;
int16_t btn_y;
UI_GetFocusGrad(UI->Id, &c_top, &c_bot);
@ -862,13 +824,12 @@ void label_Speed_ui(const LEBEL_UI *UI,GUI_SWITCH * Group)
GET_Num_Str(mGuiData[UI->Id].Current, 0, (char*)Textstr, UI->Id);
content_w = (uint16_t)(strlen((char*)Textstr) * UI0902_ASCII_W(UI0902_CARD_VALUE_SIZE));
value_y = UI_CardTextDrawY(UI0902_CARD_VALUE_Y, UI0902_CARD_VALUE_H,
UI0902_CARD_VALUE_LH, UI0902_CARD_VALUE_SIZE);
value_y = (uint16_t)(UI0902_CARD_CTRL_CY - UI0902_CARD_VALUE_SIZE / 2);
x1 = UI_CardTextBoxX1(cx, UI0902_CARD_VALUE_W, content_w);
x2 = UI_CardTextBoxX2(cx, UI0902_CARD_VALUE_W, content_w);
/* ± 低于主值中线(与三角同偏移);完整绘制,KEY 行后画会盖住透明底边 */
btn_y = (int16_t)value_y + ((int16_t)UI0902_CARD_VALUE_SIZE - (int16_t)UI0902_BTN_MINUS_H) / 2 + 3;
/* ± 色块与主值同一水平中线 */
btn_y = (int16_t)UI0902_CARD_CTRL_CY - (int16_t)UI0902_BTN_MINUS_H / 2;
if (btn_y < (int16_t)UI->y + 2) btn_y = (int16_t)UI->y + 2;
LCD_WR_PIC_Trans(UI->x + 5, (uint16_t)btn_y,
UI0902_BTN_MINUS_W, UI0902_BTN_MINUS_H,
@ -878,24 +839,9 @@ void label_Speed_ui(const LEBEL_UI *UI,GUI_SWITCH * Group)
gImage_UI0902_BtnPlus_23x22, BLACK);
LCD_ShowString_AutoAlign_Gradient(
(uint16_t)(x1 + UI0902_CARD_VALUE_OX),
(uint16_t)(x2 + UI0902_CARD_VALUE_OX),
(uint16_t)((int16_t)value_y + UI0902_CARD_VALUE_OY),
x1, x2, value_y,
Textstr,
LCD_ALIGN_CENTER, UI->Text_fc, c_top, c_bot, UI0902_CARD_VALUE_SIZE);
sub_y = UI_CardTextDrawY(UI0902_CARD_SUB_Y, UI0902_CARD_SUB_H,
UI0902_CARD_SUB_LH, UI0902_CARD_SUB_SIZE);
x1 = UI_CardTextBoxX1(cx, UI0902_CARD_SUB_W, UI0902_CARD_SUB_W);
x2 = UI_CardTextBoxX2(cx, UI0902_CARD_SUB_W, UI0902_CARD_SUB_W);
LCD_FillRoundRectGradient(
x1, sub_y,
(uint16_t)(x2 - x1 + 1),
UI0902_CARD_SUB_SIZE + 1,
0, c_top, c_bot);
LCD_ShowString_AutoAlign_Gradient(
x1, x2, sub_y, (const uint8_t*)"BPM",
LCD_ALIGN_CENTER, UI->Text_fc, c_top, c_bot, UI0902_CARD_SUB_SIZE);
}
// 万能:和弦走向;普通/专业:节奏类型 | 本地曲目
void label_ModeSelece_ui(const LEBEL_UI *UI,GUI_SWITCH * Group)
@ -1029,12 +975,10 @@ void UI_DrawSubPageHeader(const uint8_t *title_gbk)
void Draw_Bottom_Bar(uint8_t sel, uint8_t first_back)
{
/* 四键合成图(图标+原稿文字);统一 32 高,文字底边对齐 */
/* 0924 完整图底栏:图标+两字合成图,左上角对齐图稿 */
const uint8_t *icons[4];
uint8_t ws[4];
const uint16_t cx[4] = { 40, 100, 160, 210 };
const uint8_t icon_h = 32;
const uint16_t icon_y = 282;
const uint16_t xs[4] = { 23, 76, 130, 183 };
const uint8_t ws[4] = { 33, 34, 33, 34 };
uint8_t i;
(void)first_back;
@ -1045,13 +989,10 @@ void Draw_Bottom_Bar(uint8_t sel, uint8_t first_back)
icons[1] = (sel == UI0902_NAV_NORMAL) ? gImage_Nav_Normal_Sel : gImage_Nav_Normal_Not;
icons[2] = (sel == UI0902_NAV_EXPERT) ? gImage_Nav_Expert_Sel : gImage_Nav_Expert_Not;
icons[3] = (sel == UI0902_NAV_SETTING) ? gImage_Nav_Setting_Sel : gImage_Nav_Setting_Not;
ws[0] = ws[1] = ws[2] = 40;
ws[3] = 22;
for (i = 0; i < 4; i++)
{
LCD_WR_PIC_Trans((uint16_t)(cx[i] - ws[i] / 2), icon_y,
ws[i], icon_h, icons[i], BLACK);
LCD_WR_PIC_Trans(xs[i], UI0902_NAV_ICON_Y, ws[i], UI0902_NAV_ICON_H, icons[i], BLACK);
}
}
@ -1325,9 +1266,13 @@ void Draw_System_Item_List(const LEBEL_UI *UI, GUI_SWITCH *Group)
LCD_FillRoundRect(UI->x, UI->y, row_w, UI->h, UI0902_RADIUS_CARD, UI0902_ROW_BG);
}
/* 0924 系统设置行:无左侧图标,标签靠左 */
LCD_ShowChinese_AutoAlign_Gradient(UI->x + 12, UI->x + row_w, text_y, UI->p,
LCD_ALIGN_LEFT, WHITE, c_top, c_bot, label_sz);
/* 0924 系统设置行:无左侧图标。含 ASCII(USB模式)时走混排,中文绘制会丢掉字母 */
if (UI->p && strchr((const char *)UI->p, 'U'))
LCD_ShowMixedString(UI->x + 12, UI->x + row_w, text_y, (uint8_t *)UI->p,
LCD_ALIGN_LEFT, WHITE, c_top, label_sz, 0);
else
LCD_ShowChinese_AutoAlign_Gradient(UI->x + 12, UI->x + row_w, text_y, UI->p,
LCD_ALIGN_LEFT, WHITE, c_top, c_bot, label_sz);
switch(Group->Id)
{
@ -1345,13 +1290,13 @@ void Draw_System_Item_List(const LEBEL_UI *UI, GUI_SWITCH *Group)
case GUI_USB_MODE:
UI_DrawTriLeft(val_x1, chev_cy);
if (Group->Current)
LCD_ShowChinese_AutoAlign_Gradient(val_x1 + UI0902_TRI_L_W, val_x2 - UI0902_TRI_R_W, text_y,
(const uint8_t *)"USB\xB8\xFC\xD0\xC2",
LCD_ALIGN_CENTER, WHITE, c_top, c_bot, value_sz);
LCD_ShowMixedString(val_x1 + UI0902_TRI_L_W, val_x2 - UI0902_TRI_R_W, text_y,
(uint8_t *)"USB\xB8\xFC\xD0\xC2",
LCD_ALIGN_CENTER, WHITE, c_top, value_sz, 0);
else
LCD_ShowString_AutoAlign_Gradient(val_x1 + UI0902_TRI_L_W, val_x2 - UI0902_TRI_R_W, text_y,
(const uint8_t *)"USB MIDI",
LCD_ALIGN_CENTER, WHITE, c_top, c_bot, value_sz);
LCD_ShowMixedString(val_x1 + UI0902_TRI_L_W, val_x2 - UI0902_TRI_R_W, text_y,
(uint8_t *)"USB MIDI",
LCD_ALIGN_CENTER, WHITE, c_top, value_sz, 0);
UI_DrawTriRight((uint16_t)(val_x2 - UI0902_TRI_R_W), chev_cy);
break;
case GUI_AUTOCLOSE:

View File

@ -42,21 +42,25 @@ void CallUI_UsbConfirm(void);
#define UI0902_BG_COLOR 0x0042 /* #000813 页面背景 */
#define UI0902_ROW_BG 0x2147 /* #242B3A 列表行背景 */
/* 0902-04 普通模式实测(240×320):
* 双卡 y48 h55 w105 gap8;和弦行 y130 h31;音色 y180 h30;段落钮 y229 h34 */
/* K1_UI_0923-04(240×320):
* 状态栏底约 y29,移调/速度 y39–94;TAB y98;曲目行 y120–151;
* 音色行 y172–203;段落钮 y224–258;底栏图标 y264。 */
#define UI0902_MARGIN_X 12
#define UI0902_CONTENT_W 216
#define UI0902_CARD_GAP_TOP 22
#define UI0902_CARD_Y (UI_STATUS_BAR_H + UI0902_CARD_GAP_TOP) /* 48 */
#define UI0902_CARD_GAP_TOP 13
/* K1_UI_0923-05:移调卡 x11–115 y39–93;速度卡紧随其后,三角色块中线 y74 */
#define UI0902_CARD_X 11
#define UI0902_CARD_Y 39
#define UI0902_CARD_H 55
#define UI0902_CARD_W 105
#define UI0902_CARD_GAP 8
#define UI0902_MODE_Y (UI0902_CARD_Y + UI0902_CARD_H + 5) /* 108:TAB 顶 */
#define UI0902_MODE_H 53 /* TAB18 + 间隙4 + 曲目行31 */
#define UI0902_TIMBRE_Y 180
#define UI0902_TIMBRE_H 30
#define UI0902_SECTION_Y 231 /* 0904:段落钮顶 ≈231 */
#define UI0902_SECTION_H 34
#define UI0902_CARD_GAP 7
#define UI0902_CARD_CTRL_CY 74
#define UI0902_MODE_Y 98 /* 节奏类型 / 本地曲目 顶 */
#define UI0902_MODE_H 54 /* TAB18 + 间隙4 + 曲目行32(顶 y120) */
#define UI0902_TIMBRE_Y 172
#define UI0902_TIMBRE_H 32
#define UI0902_SECTION_Y 224
#define UI0902_SECTION_H 35
#define UI0902_FONT_LABEL 11 /* 标注:移调/速度 Medium 11 */
#define UI0902_FONT_BODY 13 /* 曲目/音色正文、演奏段落 */
#define UI0902_FONT_HERO 16 /* 主值 C/88 与稿面大号一致 */
@ -71,31 +75,29 @@ void CallUI_UsbConfirm(void);
(sz) == 13 || (sz) == 15 ? 11 : \
(sz) == 16 ? 13 : ((sz) / 2 + 1))
/* 移调卡文字(主值加宽+下移 KEY,防 Cb/101 底/右裁切) */
#define UI0902_CARD_TEXT_CX_L (UI0902_MARGIN_X + UI0902_CARD_W / 2) /* 64 */
#define UI0902_CARD_TEXT_CX_R (UI0902_MARGIN_X + UI0902_CARD_W + UI0902_CARD_GAP + UI0902_CARD_W / 2) /* 176 */
#define UI0902_CARD_TEXT_CX_L (UI0902_CARD_X + UI0902_CARD_W / 2)
#define UI0902_CARD_TEXT_CX_R (UI0902_CARD_X + UI0902_CARD_W + UI0902_CARD_GAP + UI0902_CARD_W / 2)
#define UI0902_CARD_LABEL_SIZE UI0902_FONT_LABEL /* 11 */
#define UI0902_CARD_LABEL_LH 13
#define UI0902_CARD_LABEL_W 22
#define UI0902_CARD_LABEL_H 11
#define UI0902_CARD_LABEL_Y 54
#define UI0902_CARD_LABEL_Y 46
#define UI0902_CARD_VALUE_SIZE UI0902_FONT_HERO /* 16 */
#define UI0902_CARD_VALUE_LH 16
#define UI0902_CARD_VALUE_W 42 /* 3×13:101/Cb 完整 */
#define UI0902_CARD_VALUE_H 17
/* mode.png:主值≈y71–85,KEY/BPM≈y89;加大与「移调/速度」间距、收紧与 KEY/BPM */
#define UI0902_CARD_VALUE_Y 73
/* 仅主值字母/数字:相对基准右移、上移(三角/±/KEY/BPM 不动) */
#define UI0902_CARD_VALUE_OX 3
#define UI0902_CARD_VALUE_OY (-3)
/* 主值顶 = CTRL_CY - 字高/2,与左右三角、± 同一水平中线 */
#define UI0902_CARD_VALUE_Y (UI0902_CARD_CTRL_CY - UI0902_CARD_VALUE_SIZE / 2)
#define UI0902_CARD_VALUE_OX 0
#define UI0902_CARD_VALUE_OY 0
#define UI0902_CARD_SUB_SIZE UI0902_FONT_SUB /* 9 */
#define UI0902_CARD_SUB_LH 9
#define UI0902_CARD_SUB_W 32
#define UI0902_CARD_SUB_H 9
#define UI0902_CARD_SUB_Y 89
#define UI0902_CARD_SUB_Y 80
/* 段落钮与底栏分隔线(mode.png ≈ y274);颜色与顶栏共用 UI0902_SEP_LINE_COLOR */
#define UI0902_SEP_LINE_Y 274
@ -108,7 +110,7 @@ void CallUI_UsbConfirm(void);
#define UI0902_TAB_W 55
#define UI0902_TAB_GAP 6
#define UI0902_ROW_H 31
#define UI0902_SECTION_BTN_H 34
#define UI0902_SECTION_BTN_H 35
#define UI0902_SECTION_BTN_W 47
#define UI0902_SECTION_PITCH 57
#define UI0902_RADIUS_CARD 10
@ -218,15 +220,17 @@ void CallUI_UsbConfirm(void);
#define UI0902_NAV_MIXER UI0902_NAV_NORMAL
#define UI0902_NAV_MODE UI0902_NAV_EXPERT
/* 底部图标:0909 加大图标 + 原稿文字条(合成图);生成脚本曾误命名 Setting/Mixer/Mode */
#define gImage_Nav_Universal_Not gImage_UI0902_TabSetting_Sel_40x32 /* 底部-10 白 */
#define gImage_Nav_Universal_Sel gImage_UI0902_TabMode_Sel_40x32 /* 底部-14 蓝 */
#define gImage_Nav_Normal_Not gImage_UI0902_TabSetting_Not_40x32 /* 底部-11 白 */
#define gImage_Nav_Normal_Sel gImage_UI0902_TabMode_Not_40x32 /* 底部-15 蓝 */
#define gImage_Nav_Expert_Not gImage_UI0902_TabMixer_Sel_40x32 /* 底部-12 白 */
#define gImage_Nav_Expert_Sel gImage_UI0902_TabBack_Sel_40x32 /* 底部-16 蓝 */
#define gImage_Nav_Setting_Not gImage_UI0902_TabMixer_Not_22x32 /* 底部-13 白 */
#define gImage_Nav_Setting_Sel gImage_UI0902_TabBack_Not_22x32 /* 底部-17 蓝 */
/* 0924 底栏:从图 K1_UI_0924-03/04/05 切出的放大图标+两字(万能/普通/专业/设置) */
#define gImage_Nav_Universal_Sel gImage_Nav0924_Universal_Sel_33x46
#define gImage_Nav_Universal_Not gImage_Nav0924_Universal_Not_33x46
#define gImage_Nav_Normal_Sel gImage_Nav0924_Normal_Sel_34x46
#define gImage_Nav_Normal_Not gImage_Nav0924_Normal_Not_34x46
#define gImage_Nav_Expert_Sel gImage_Nav0924_Expert_Sel_33x46
#define gImage_Nav_Expert_Not gImage_Nav0924_Expert_Not_33x46
#define gImage_Nav_Setting_Sel gImage_Nav0924_Setting_Sel_34x46
#define gImage_Nav_Setting_Not gImage_Nav0924_Setting_Not_34x46
#define UI0902_NAV_ICON_Y 264
#define UI0902_NAV_ICON_H 46
/* 旧几何电池(Draw_Battery_Icon)最左起点;0902 图电池用 Draw_Status_Battery_Icon */
#define UI_STATUS_BATTERY_X 150
#define UI_STATUS_BATTERY_H 11

View File

@ -1831,19 +1831,19 @@ static uint16_t LCD_BlendColor565(uint16_t c0, uint16_t c1, uint8_t num, uint8_t
}
/**
* @brief 绘制音量条(5格实心,从左到右亮度递增,对齐需求图)
* @param volume_level: 音量等级(0-5,0=静音,5=最大)
* @note 强度为 N 时显示前 N 格实心条;最右点亮格最亮(白),向左依次变暗
* @brief 绘制音量条(8格,左低右高,对齐 K1_UI_0923-05)
* @param volume_level: 音量等级(0-8,0=静音,8=最大)
* @note 强度为 N 时显示前 N 格;最右点亮格最亮(白),向左依次变暗
*/
void Draw_Volume_Bar(uint16_t x, uint16_t y, uint8_t volume_level,uint8_t scale,uint16_t color_on, uint16_t color_off)
{
uint8_t i;
uint8_t bar_count = 5;
uint8_t bar_count = 8;
uint8_t w = 3 * scale;
uint8_t gap = 2 * scale;
uint8_t radius = 1 * scale;
uint8_t height[5] = {6, 9, 12, 15, 18};
uint8_t max_h = height[4];
static const uint8_t height[8] = {5, 7, 9, 11, 12, 14, 16, 18};
uint8_t max_h = height[7];
uint16_t clear_w;
uint16_t dim_color = color_off;
uint16_t bar_x;
@ -1852,9 +1852,9 @@ void Draw_Volume_Bar(uint16_t x, uint16_t y, uint8_t volume_level,uint8_t scale,
(void)color_on;
if(volume_level > 5)
if(volume_level > 8)
{
volume_level = 5;
volume_level = 8;
}
bar_x = (uint16_t)(x + spk_w + 2);

View File

@ -455,6 +455,8 @@ const char CHS13Table[][2] = {
{0xBF,0xD5}, // 空
{0xB1,0xD5}, // 闭
{0xD3,0xEF}, // 语
{0xD1,0xD4}, // 言
};
@ -845,6 +847,8 @@ const char CHS16Table[][2] = {
{0xBF,0xD5}, // 空
{0xB1,0xD5}, // 闭
{0xD3,0xEF}, // 语
{0xD1,0xD4}, // 言
};
@ -1333,6 +1337,9 @@ const unsigned char Chinese_font_13[][26] = {
{0x7F,0xE0,0x04,0x00,0x04,0x00,0x04,0x00,0xFF,0xF0,0x04,0x00,0x0A,0x00,0x0A,0x00,0x11,0x00,0x10,0x80,0x20,0x40,0xC0,0x30,0x00,0x00},/*"天",187*/
{0x04,0x00,0xFF,0xE0,0x80,0x20,0x91,0x20,0x20,0x80,0xC0,0x40,0x3F,0x80,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0xFF,0xE0,0x00,0x00},/*"空",188*/
{0x4F,0xE0,0x20,0x20,0x42,0x20,0x42,0x20,0x7F,0xA0,0x42,0x20,0x46,0x20,0x4A,0x20,0x52,0x20,0x62,0x20,0x46,0x20,0x40,0x60,0x00,0x00},/*"闭",189*/
{0x00,0x00,0x27,0xE0,0x37,0xE0,0x13,0x00,0x07,0xE0,0x73,0x60,0x3F,0xF0,0x33,0xC0,0x37,0xE0,0x3C,0x20,0x37,0xE0,0x27,0xE0,0x00,0x00},/*"语",190*/
{0x00,0x00,0x02,0x00,0x7F,0xF0,0x7F,0xF0,0x3F,0xE0,0x1F,0xC0,0x3F,0xE0,0x1F,0xC0,0x3F,0xE0,0x30,0x60,0x3F,0xE0,0x30,0x60,0x00,0x00},/*"言",191*/
};
@ -1722,6 +1729,9 @@ const unsigned char Chinese_font_16[][32] = {
{0x00,0x00,0x3F,0xF8,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xFF,0xFE,0x01,0x00,0x02,0x80,0x02,0x80,0x04,0x40,0x04,0x40,0x08,0x20,0x10,0x10,0x20,0x08,0xC0,0x06},/*"天",188*/
{0x02,0x00,0x01,0x00,0x7F,0xFE,0x40,0x02,0x88,0x24,0x10,0x10,0x20,0x08,0x00,0x00,0x1F,0xF0,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x7F,0xFC,0x00,0x00},/*"空",189*/
{0x20,0x00,0x17,0xFC,0x00,0x04,0x40,0x84,0x40,0x84,0x5F,0xF4,0x40,0x84,0x41,0x84,0x42,0x84,0x44,0x84,0x48,0x84,0x50,0x84,0x42,0x84,0x41,0x04,0x40,0x14,0x40,0x08},/*"闭",190*/
{0x67,0xFE,0x77,0xFE,0x30,0xC0,0x13,0xFC,0x07,0xFC,0xE1,0x8C,0xE1,0x8C,0x2F,0xFF,0x27,0xFF,0x20,0x00,0x23,0xFE,0x2B,0x06,0x3F,0x06,0x7B,0xFE,0x73,0xFE,0x03,0x06},/*"语",191*/
{0x01,0x80,0x01,0xC0,0xFF,0xFF,0x00,0x00,0x3F,0xFC,0x3F,0xFC,0x00,0x00,0x3F,0xFC,0x3F,0xFC,0x00,0x00,0x3F,0xFC,0x3F,0xFC,0x20,0x04,0x34,0x2C,0x3F,0xFC,0x30,0x0C},/*"言",192*/
};
const unsigned char Chinese_font_24[][72] = {

View File

@ -104,101 +104,101 @@ const unsigned char ascii_1306[][13]={
const unsigned char ascii_1608[][32]={
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",0*/
{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"!",1*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x48,0x00,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*""",2*/
{0x00,0x00,0x00,0x00,0x88,0x00,0x88,0x00,0x88,0x00,0xFF,0x01,0x44,0x00,0x44,0x00,0x44,0x00,0xFF,0x01,0x22,0x00,0x22,0x00,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"#",3*/
{0x00,0x00,0x10,0x00,0x7C,0x00,0x96,0x00,0x12,0x00,0x12,0x00,0x14,0x00,0x38,0x00,0x50,0x00,0x90,0x00,0x90,0x00,0x92,0x00,0x7C,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"$",4*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x8E,0x00,0x89,0x00,0x49,0x00,0x29,0x00,0x96,0x01,0x50,0x02,0x48,0x02,0x44,0x02,0xC4,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"%",5*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x44,0x00,0x24,0x00,0x14,0x00,0x8A,0x00,0x91,0x00,0x51,0x00,0x61,0x00,0x61,0x00,0x9E,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"&",6*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/
{0x40,0x00,0x20,0x00,0x10,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x10,0x00,0x20,0x00,0x40,0x00,0x00,0x00},/*"(",8*/
{0x08,0x00,0x10,0x00,0x20,0x00,0x20,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x08,0x00,0x00,0x00},/*")",9*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x7C,0x00,0x10,0x00,0x28,0x00,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"*",10*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0xFE,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"+",11*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"-",13*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*".",14*/
{0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00},/*"/",15*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"0",16*/
{0x00,0x00,0x00,0x00,0x18,0x00,0x14,0x00,0x12,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"1",17*/
{0x00,0x00,0x00,0x00,0x3C,0x00,0x42,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x18,0x00,0x04,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"2",18*/
{0x00,0x00,0x00,0x00,0x3C,0x00,0x42,0x00,0x80,0x00,0x80,0x00,0x40,0x00,0x30,0x00,0x40,0x00,0x80,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"3",19*/
{0x00,0x00,0x00,0x00,0x40,0x00,0x60,0x00,0x50,0x00,0x48,0x00,0x48,0x00,0x44,0x00,0x42,0x00,0xFE,0x01,0x40,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"4",20*/
{0x00,0x00,0x00,0x00,0xFE,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x3A,0x00,0x46,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"5",21*/
{0x00,0x00,0x00,0x00,0x78,0x00,0x84,0x00,0x02,0x00,0x02,0x00,0x3A,0x00,0x46,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"6",22*/
{0x00,0x00,0x00,0x00,0xFE,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"7",23*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"8",24*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x80,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"9",25*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*":",26*/
{0x00,0x00,0x00,0x00,0x20,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*";",27*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x70,0x00,0x0C,0x00,0x02,0x00,0x0E,0x00,0x70,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"<",28*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"=",29*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x1C,0x00,0x60,0x00,0x80,0x00,0x60,0x00,0x1C,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*">",30*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x80,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"?",31*/
{0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x00,0x04,0x01,0xB2,0x02,0xC9,0x02,0x45,0x02,0x45,0x02,0x65,0x02,0x99,0x01,0x02,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"@",32*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x48,0x00,0x48,0x00,0x84,0x00,0xFC,0x00,0x02,0x01,0x02,0x01,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00},/*"A",33*/
{0x00,0x00,0x00,0x00,0xFF,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0xFF,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"B",34*/
{0x00,0x00,0x00,0x00,0xF8,0x00,0x06,0x01,0x02,0x02,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x02,0x02,0x06,0x01,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"C",35*/
{0x00,0x00,0x00,0x00,0x7F,0x00,0x81,0x01,0x01,0x01,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x01,0x81,0x01,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"D",36*/
{0x00,0x00,0x00,0x00,0xFF,0x01,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xFF,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"E",37*/
{0x00,0x00,0x00,0x00,0xFE,0x01,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0xFE,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"F",38*/
{0x00,0x00,0x00,0x00,0xF8,0x00,0x06,0x01,0x02,0x02,0x01,0x00,0x01,0x00,0x01,0x00,0xC1,0x03,0x01,0x02,0x02,0x02,0x06,0x03,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"G",39*/
{0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0xFF,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"H",40*/
{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"I",41*/
{0x00,0x00,0x00,0x00,0xE0,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x84,0x00,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"J",42*/
{0x00,0x00,0x00,0x00,0x81,0x00,0x41,0x00,0x21,0x00,0x11,0x00,0x09,0x00,0x17,0x00,0x21,0x00,0x41,0x00,0x81,0x00,0x01,0x01,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00},/*"K",43*/
{0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"L",44*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x03,0x03,0x03,0x03,0x85,0x02,0x85,0x02,0x49,0x02,0x49,0x02,0x31,0x02,0x31,0x02,0x31,0x02,0x00,0x00,0x00,0x00,0x00,0x00},/*"M",45*/
{0x00,0x00,0x00,0x00,0x01,0x01,0x03,0x01,0x05,0x01,0x09,0x01,0x09,0x01,0x11,0x01,0x21,0x01,0x21,0x01,0x41,0x01,0x81,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"N",46*/
{0x00,0x00,0x00,0x00,0x78,0x00,0x86,0x01,0x02,0x01,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x02,0x01,0x86,0x01,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"O",47*/
{0x00,0x00,0x00,0x00,0x7F,0x00,0x81,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0xFF,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"P",48*/
{0x00,0x00,0x78,0x00,0x86,0x01,0x02,0x01,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x02,0x01,0x86,0x01,0x78,0x00,0x20,0x00,0x40,0x00,0x80,0x01,0x00,0x00},/*"Q",49*/
{0x00,0x00,0x00,0x00,0xFF,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0xFF,0x00,0x11,0x00,0x21,0x00,0x41,0x00,0x81,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"R",50*/
{0x00,0x00,0x00,0x00,0x7C,0x00,0x82,0x00,0x01,0x01,0x01,0x00,0x06,0x00,0x78,0x00,0x80,0x00,0x00,0x01,0x01,0x01,0x82,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"S",51*/
{0x00,0x00,0x00,0x00,0xFF,0x01,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"T",52*/
{0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x82,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"U",53*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x02,0x01,0x02,0x01,0x84,0x00,0x84,0x00,0x48,0x00,0x48,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"V",54*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x31,0x02,0x00,0x00,0x48,0x00,0x86,0x01,0x86,0x01,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"W",55*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x02,0x01,0x84,0x00,0x48,0x00,0x30,0x00,0x30,0x00,0x48,0x00,0x84,0x00,0x02,0x01,0x01,0x02,0x00,0x00,0x00,0x00,0x00,0x00},/*"X",56*/
{0x00,0x00,0x00,0x00,0x01,0x01,0x82,0x00,0x44,0x00,0x44,0x00,0x28,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"Y",57*/
{0x00,0x00,0x00,0x00,0xFE,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"Z",58*/
{0x38,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x38,0x00,0x00,0x00},/*"[",59*/
{0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0x00,0x00},/*"\",60*/
{0x38,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x38,0x00,0x00,0x00},/*"]",61*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x28,0x00,0x28,0x00,0x44,0x00,0x44,0x00,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"^",62*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"_",63*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x10,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",64*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xC2,0x00,0x80,0x00,0x80,0x00,0xFC,0x00,0x82,0x00,0x82,0x00,0xC2,0x00,0x3C,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"a",65*/
{0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x3A,0x00,0x46,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x46,0x00,0x3A,0x00,0x00,0x00,0x00,0x00},/*"b",66*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x88,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x88,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"c",67*/
{0x00,0x00,0x00,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0xB8,0x00,0xC4,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x00,0x00,0x00,0x00},/*"d",68*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0xFE,0x00,0x02,0x00,0x02,0x00,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"e",69*/
{0x00,0x00,0x00,0x00,0x60,0x00,0x10,0x00,0x10,0x00,0x78,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"f",70*/
{0x00,0x00,0x00,0x00,0xB8,0x00,0xC4,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00},/*"g",71*/
{0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x74,0x00,0x8C,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x00,0x00,0x00,0x00},/*"h",72*/
{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"i",73*/
{0x20,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x00,0x00},/*"j",74*/
{0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x42,0x00,0x22,0x00,0x12,0x00,0x0A,0x00,0x0E,0x00,0x12,0x00,0x22,0x00,0x42,0x00,0x82,0x00,0x00,0x00,0x00,0x00},/*"k",75*/
{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"l",76*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xDD,0x01,0x33,0x02,0x31,0x02,0x31,0x02,0x31,0x02,0x31,0x02,0x31,0x02,0x31,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"m",77*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x00,0x8C,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"n",78*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"o",79*/
{0x00,0x00,0x00,0x00,0x3A,0x00,0x46,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x46,0x00,0x3A,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00},/*"p",80*/
{0x00,0x00,0x00,0x00,0xB8,0x00,0xC4,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x00,0x00,0x00,0x00},/*"q",81*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x00,0x18,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"r",82*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x84,0x00,0x04,0x00,0x04,0x00,0x78,0x00,0x80,0x00,0x80,0x00,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"s",83*/
{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x78,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"t",84*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0xC4,0x00,0xB8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"u",85*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x44,0x00,0x44,0x00,0x28,0x00,0x28,0x00,0x28,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"v",86*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x01,0x11,0x01,0x29,0x01,0xAA,0x00,0xAA,0x00,0xAA,0x00,0xAA,0x00,0x44,0x00,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"w",87*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x00,0x44,0x00,0x44,0x00,0x28,0x00,0x10,0x00,0x28,0x00,0x4C,0x00,0x44,0x00,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"x",88*/
{0x00,0x00,0x00,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x44,0x00,0x44,0x00,0x28,0x00,0x28,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x08,0x00,0x06,0x00,0x00,0x00,0x00,0x00},/*"y",89*/
{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x10,0x00,0x08,0x00,0x04,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"z",90*/
{0x60,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x0C,0x00,0x18,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x60,0x00,0x00,0x00},/*"{",91*/
{0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00},/*"|",92*/
{0x0C,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x60,0x00,0x30,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x0C,0x00,0x00,0x00},/*"}",93*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x92,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"~",94*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*0*/
{0x00,0x00,0x00,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x30,0x00},/*1*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xEF,0x01,0xEF,0x01,0xEF,0x01,0xEF,0x01,0xE7,0x01,0xC7,0x01,0xC7,0x01,0xC6,0x00,0xC6,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*2*/
{0x00,0x00,0x00,0x00,0x00,0x00,0xD8,0x00,0xC8,0x00,0xC8,0x00,0xFF,0x01,0x6C,0x00,0x44,0x00,0x6C,0x00,0xFF,0x01,0x26,0x00,0x26,0x00,0x36,0x00,0x00,0x00,0x00,0x00},/*3*/
{0x00,0x00,0x00,0x00,0x30,0x00,0x70,0x00,0xFC,0x00,0xB6,0x01,0x36,0x00,0x36,0x00,0x3C,0x00,0xF0,0x00,0xB0,0x01,0xB0,0x01,0xB6,0x01,0xFC,0x00,0x78,0x00,0x30,0x00},/*4*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC6,0x00,0x49,0x00,0x29,0x00,0x36,0x00,0xD8,0x00,0x28,0x01,0x24,0x01,0xC6,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*5*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x3C,0x00,0x66,0x00,0x26,0x00,0x3C,0x00,0x1E,0x00,0x9B,0x00,0xF3,0x00,0x63,0x00,0xF7,0x00,0x9E,0x01,0x00,0x00,0x00,0x00},/*6*/
{0x00,0x00,0x00,0x00,0xFC,0x00,0xFC,0x00,0xFC,0x00,0xFC,0x00,0xF8,0x00,0xFC,0x00,0xF8,0x00,0x78,0x00,0x78,0x00,0x78,0x00,0x78,0x00,0x78,0x00,0x78,0x00,0x78,0x00},/*7*/
{0x00,0x00,0x00,0x00,0x60,0x00,0x30,0x00,0x30,0x00,0x10,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x10,0x00,0x30,0x00,0x30,0x00,0x60,0x00},/*8*/
{0x00,0x00,0x00,0x00,0x18,0x00,0x30,0x00,0x30,0x00,0x20,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x20,0x00,0x30,0x00,0x30,0x00,0x18,0x00},/*9*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x18,0x00,0xFF,0x01,0xFF,0x01,0x7C,0x00,0xFF,0x01,0xFF,0x01,0x18,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*10*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0xFE,0x00,0xFF,0x01,0xFE,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*11*/
{0x00,0x00,0x00,0x00,0xFC,0x00,0xFC,0x00,0xFC,0x00,0xFC,0x00,0xFC,0x00,0xFC,0x00,0xE0,0x00,0xE0,0x00,0xE0,0x00,0x70,0x00,0x78,0x00,0x3E,0x00,0x1E,0x00,0x0C,0x00},/*12*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*13*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0xFF,0x01,0xFF,0x01,0xFF,0x01,0xFF,0x01,0xFF,0x01,0xFF,0x01,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*14*/
{0x00,0x00,0x00,0x00,0xC0,0x00,0xC0,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x10,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x0C,0x00,0x0C,0x00},/*15*/
{0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0xC6,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC6,0x00,0xFE,0x00,0x7C,0x00,0x00,0x00},/*16*/
{0x00,0x00,0x00,0x00,0x70,0x00,0x78,0x00,0x7C,0x00,0x64,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00},/*17*/
{0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0xC7,0x01,0x82,0x01,0x80,0x01,0xC0,0x00,0xE0,0x00,0x60,0x00,0x30,0x00,0x18,0x00,0x1C,0x00,0x0E,0x00,0xFF,0x01,0xFF,0x01},/*18*/
{0x00,0x00,0x00,0x00,0xFF,0x00,0xFE,0x00,0x60,0x00,0x70,0x00,0x38,0x00,0x1C,0x00,0xFC,0x00,0xC0,0x00,0x80,0x01,0x80,0x01,0x82,0x01,0xC7,0x01,0xFE,0x00,0x7C,0x00},/*19*/
{0x00,0x00,0x00,0x00,0x60,0x00,0x70,0x00,0x78,0x00,0x58,0x00,0x4C,0x00,0x4C,0x00,0x46,0x00,0x46,0x00,0xFF,0x01,0xFF,0x01,0xE0,0x00,0x40,0x00,0x40,0x00,0x00,0x00},/*20*/
{0x00,0x00,0x00,0x00,0xFE,0x00,0xFE,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x7E,0x00,0xFF,0x00,0xC7,0x01,0x80,0x01,0x80,0x01,0x82,0x01,0xC7,0x01,0xFE,0x00,0x7C,0x00},/*21*/
{0x00,0x00,0x00,0x00,0x30,0x00,0x38,0x00,0x18,0x00,0x0C,0x00,0x0C,0x00,0x7E,0x00,0xFE,0x00,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC7,0x01,0xFE,0x00,0x7C,0x00},/*22*/
{0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0xC0,0x01,0xC0,0x00,0xE0,0x00,0x60,0x00,0x70,0x00,0x30,0x00,0x30,0x00,0x18,0x00,0x18,0x00,0x1C,0x00,0x0C,0x00,0x0E,0x00},/*23*/
{0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0xC6,0x00,0x83,0x01,0xC6,0x00,0x7C,0x00,0x7C,0x00,0xC6,0x00,0x83,0x01,0x83,0x01,0xC7,0x01,0xFE,0x00,0x7C,0x00,0x00,0x00},/*24*/
{0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xE6,0x01,0xFE,0x00,0xE0,0x00,0x60,0x00,0x30,0x00,0x30,0x00,0x18,0x00,0x00,0x00},/*25*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x38,0x00,0x38,0x00},/*26*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x38,0x00,0x30,0x00,0x20,0x00,0x10,0x00,0x18,0x00},/*27*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xC0,0x01,0xF0,0x00,0x3C,0x00,0x0F,0x00,0x07,0x00,0x0F,0x00,0x3C,0x00,0xF0,0x00,0xC0,0x01,0x00,0x01,0x00,0x00,0x00,0x00},/*28*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*29*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x07,0x00,0x1E,0x00,0x78,0x00,0xE0,0x01,0xC0,0x01,0xE0,0x01,0x78,0x00,0x1E,0x00,0x07,0x00,0x01,0x00,0x00,0x00,0x00,0x00},/*30*/
{0x00,0x00,0x00,0x00,0x78,0x00,0xFC,0x00,0x8E,0x01,0x80,0x01,0x80,0x01,0xC0,0x00,0x60,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x30,0x00},/*31*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x86,0x00,0x9B,0x01,0x6D,0x01,0x45,0x01,0xED,0x01,0x93,0x00,0x06,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*32*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x38,0x00,0x38,0x00,0x6C,0x00,0x6C,0x00,0x6C,0x00,0xFE,0x00,0xC6,0x00,0x82,0x01,0x83,0x01,0x00,0x00,0x00,0x00},/*33*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0xFF,0x00,0xC3,0x00,0x83,0x00,0xC3,0x00,0x7F,0x00,0xFF,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0xFF,0x00,0x7F,0x00,0x00,0x00},/*34*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0xFE,0x01,0x86,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x86,0x00,0xFC,0x01,0x78,0x00,0x00,0x00,0x00,0x00},/*35*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0xFF,0x00,0xC3,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC3,0x00,0xFF,0x00,0x3F,0x00,0x00,0x00,0x00,0x00},/*36*/
{0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0xFF,0x00,0xFF,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0xFF,0x01,0xFF,0x01},/*37*/
{0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0xFF,0x00,0xFF,0x01,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00},/*38*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0xFE,0x01,0x86,0x00,0x03,0x00,0x03,0x00,0xE3,0x01,0x83,0x01,0x83,0x01,0x86,0x01,0xFE,0x01,0x78,0x00,0x00,0x00,0x00,0x00},/*39*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xFF,0x01,0xFF,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x00,0x00},/*40*/
{0x00,0x00,0x00,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00},/*41*/
{0x00,0x00,0x00,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xE6,0x00,0x7C,0x00,0x38,0x00},/*42*/
{0x00,0x00,0x00,0x00,0x00,0x00,0xC3,0x00,0x63,0x00,0x33,0x00,0x1B,0x00,0x0F,0x00,0x0F,0x00,0x1B,0x00,0x33,0x00,0x63,0x00,0xC3,0x00,0xC3,0x01,0x00,0x00,0x00,0x00},/*43*/
{0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0xFF,0x01,0xFF,0x01},/*44*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0x83,0x01,0xC7,0x01,0x6D,0x01,0x29,0x01,0x39,0x01,0x11,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*45*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0x87,0x01,0x87,0x01,0x8F,0x01,0x9B,0x01,0x93,0x01,0xB3,0x01,0xE3,0x01,0xC3,0x01,0xC3,0x01,0x83,0x01,0x00,0x00,0x00,0x00},/*46*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xEE,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x82,0x01,0xEE,0x00,0x7C,0x00,0x00,0x00,0x00,0x00},/*47*/
{0x00,0x00,0x00,0x00,0x7F,0x00,0xFF,0x00,0xC3,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xFF,0x00,0x7F,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x00,0x00},/*48*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xEE,0x00,0x83,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xE3,0x01,0xEE,0x00,0xFC,0x01,0x80,0x01,0x00,0x00,0x00,0x00},/*49*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0xFF,0x00,0xC3,0x00,0x83,0x01,0xC3,0x00,0xE3,0x00,0x7F,0x00,0x33,0x00,0x63,0x00,0x63,0x00,0xC3,0x00,0x83,0x01,0x00,0x00},/*50*/
{0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0x87,0x01,0x03,0x00,0x07,0x00,0x0E,0x00,0x7C,0x00,0xE0,0x00,0x80,0x01,0x80,0x01,0x83,0x01,0xFE,0x00,0x7C,0x00,0x00,0x00},/*51*/
{0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00},/*52*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC7,0x01,0xFE,0x00,0x7C,0x00,0x00,0x00},/*53*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0x83,0x00,0xC6,0x00,0xC6,0x00,0x44,0x00,0x6C,0x00,0x6C,0x00,0x38,0x00,0x38,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*54*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x01,0x93,0x01,0xBA,0x00,0xAA,0x00,0xEE,0x00,0x46,0x00,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*55*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x00,0xC6,0x00,0x6C,0x00,0x7C,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x6C,0x00,0x44,0x00,0xC6,0x00,0x83,0x01,0x00,0x00,0x00,0x00},/*56*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0xC6,0x00,0xC6,0x00,0x6C,0x00,0x6C,0x00,0x38,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*57*/
{0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0xC0,0x00,0x60,0x00,0x70,0x00,0x30,0x00,0x18,0x00,0x0C,0x00,0x0E,0x00,0x06,0x00,0xFF,0x01,0xFF,0x01,0x00,0x00},/*58*/
{0x00,0x00,0x00,0x00,0x78,0x00,0x78,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x78,0x00,0x78,0x00},/*59*/
{0x00,0x00,0x00,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0xC0,0x00,0xC0,0x00},/*60*/
{0x00,0x00,0x00,0x00,0x78,0x00,0x78,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x78,0x00,0x78,0x00},/*61*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x7C,0x00,0x6C,0x00,0xEE,0x00,0xC6,0x00,0x83,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*62*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*63*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x1C,0x00,0x1E,0x00,0x3F,0x00,0x7E,0x00,0x7C,0x00,0xF8,0x00,0xF0,0x01,0xE0,0x00,0x40,0x00,0x00,0x00,0x00,0x00},/*64*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0xC6,0x01,0x80,0x01,0x80,0x01,0xFC,0x01,0xFE,0x01,0x87,0x01,0x83,0x01,0xC7,0x01,0xFE,0x01,0x9C,0x01,0x00,0x00},/*65*/
{0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x7B,0x00,0xFF,0x00,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC7,0x00,0xFF,0x00,0x7B,0x00},/*66*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0xFE,0x00,0xC6,0x01,0x07,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x07,0x00,0xC6,0x01,0xFE,0x00,0x78,0x00,0x00,0x00,0x00,0x00},/*67*/
{0x00,0x00,0x00,0x00,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0xBC,0x01,0xFE,0x01,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC6,0x01,0xFE,0x01,0xBC,0x01},/*68*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0x86,0x01,0x83,0x01,0xFF,0x01,0xFF,0x01,0x03,0x00,0x86,0x00,0xFE,0x00,0x78,0x00,0x00,0x00,0x00,0x00},/*69*/
{0x00,0x00,0x00,0x00,0xE0,0x00,0xF0,0x00,0x38,0x00,0x18,0x00,0xFC,0x00,0xFC,0x00,0x38,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00},/*70*/
{0x00,0x00,0x00,0x00,0xBC,0x01,0xFE,0x01,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC6,0x01,0xFE,0x01,0xB8,0x01,0x80,0x01,0xC2,0x01,0xFE,0x00,0x7C,0x00},/*71*/
{0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0xFB,0x00,0xFF,0x01,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01},/*72*/
{0x00,0x00,0x00,0x00,0x38,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00},/*73*/
{0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x70,0x00,0x38,0x00},/*74*/
{0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0xE3,0x00,0x73,0x00,0x3B,0x00,0x1F,0x00,0x1F,0x00,0x1F,0x00,0x33,0x00,0x73,0x00,0xE3,0x00,0xC3,0x01},/*75*/
{0x00,0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x38,0x00,0x30,0x00},/*76*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xEF,0x00,0xBB,0x01,0x11,0x01,0x11,0x01,0x11,0x01,0x11,0x01,0x11,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*77*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x00,0xFF,0x00,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x00,0x00,0x00,0x00},/*78*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC6,0x01,0xFE,0x00,0x7C,0x00,0x00,0x00,0x00,0x00},/*79*/
{0x00,0x00,0x00,0x00,0x7B,0x00,0xFF,0x00,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC7,0x01,0xFF,0x00,0x7B,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x03,0x00},/*80*/
{0x00,0x00,0x00,0x00,0xBC,0x01,0xFE,0x01,0xC7,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC6,0x01,0xFE,0x01,0xBC,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x01},/*81*/
{0x00,0x00,0x00,0x00,0xCE,0x01,0xEE,0x01,0xFE,0x01,0x3E,0x00,0x1E,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00},/*82*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xFE,0x00,0xC7,0x01,0x07,0x00,0x0F,0x00,0x7E,0x00,0xF8,0x00,0xC0,0x01,0x82,0x01,0xC7,0x01,0xFE,0x00,0x7C,0x00,0x00,0x00},/*83*/
{0x00,0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0xFE,0x00,0xFE,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0xF8,0x00,0xF0,0x00},/*84*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0x83,0x01,0xC7,0x01,0xFE,0x01,0x9C,0x01,0x00,0x00,0x00,0x00},/*85*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x01,0xC6,0x00,0xC6,0x00,0xC6,0x00,0x6C,0x00,0x6C,0x00,0x3C,0x00,0x38,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*86*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x91,0x01,0xBB,0x01,0xBA,0x00,0xEE,0x00,0xEE,0x00,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*87*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC7,0x01,0xC6,0x00,0x6C,0x00,0x7C,0x00,0x38,0x00,0x38,0x00,0x7C,0x00,0x6C,0x00,0xC6,0x00,0xC7,0x01,0x00,0x00,0x00,0x00},/*88*/
{0x00,0x00,0x00,0x00,0x83,0x01,0xC6,0x00,0xC6,0x00,0xC6,0x00,0x6C,0x00,0x6C,0x00,0x3C,0x00,0x38,0x00,0x38,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x0C,0x00,0x00,0x00},/*89*/
{0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x01,0xFF,0x01,0xE0,0x00,0x60,0x00,0x70,0x00,0x38,0x00,0x1C,0x00,0x0E,0x00,0x0E,0x00,0xFF,0x01,0xFF,0x01,0x00,0x00,0x00,0x00},/*90*/
{0x00,0x00,0x00,0x00,0x60,0x00,0x70,0x00,0x30,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x1C,0x00,0x1C,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x30,0x00,0x70,0x00,0x60,0x00},/*91*/
{0x00,0x00,0x00,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00},/*92*/
{0x00,0x00,0x00,0x00,0x0C,0x00,0x1C,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x70,0x00,0x70,0x00,0x30,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x1C,0x00,0x0C,0x00},/*93*/
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8E,0x01,0xFF,0x01,0xF3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*94*/
};
const unsigned char ascii_2412[][48]={

File diff suppressed because it is too large Load Diff

View File

@ -10,14 +10,14 @@ extern const unsigned char gImage_UI0902_Speaker_10x15[300];
extern const unsigned char gImage_UI0902_Bluetooth_On_13x20[520];
extern const unsigned char gImage_UI0902_Bluetooth_Off_19x20[760];
extern const unsigned char gImage_UI0902_BatteryCharging_40x13[1040];
extern const unsigned char gImage_UI0902_TabSetting_Sel_40x32[2560];
extern const unsigned char gImage_UI0902_TabSetting_Not_40x32[2560];
extern const unsigned char gImage_UI0902_TabMixer_Sel_40x32[2560];
extern const unsigned char gImage_UI0902_TabMixer_Not_22x32[1408];
extern const unsigned char gImage_UI0902_TabMode_Sel_40x32[2560];
extern const unsigned char gImage_UI0902_TabMode_Not_40x32[2560];
extern const unsigned char gImage_UI0902_TabBack_Sel_40x32[2560];
extern const unsigned char gImage_UI0902_TabBack_Not_22x32[1408];
extern const unsigned char gImage_Nav0924_Universal_Sel_33x46[3036];
extern const unsigned char gImage_Nav0924_Universal_Not_33x46[3036];
extern const unsigned char gImage_Nav0924_Normal_Sel_34x46[3128];
extern const unsigned char gImage_Nav0924_Normal_Not_34x46[3128];
extern const unsigned char gImage_Nav0924_Expert_Sel_33x46[3036];
extern const unsigned char gImage_Nav0924_Expert_Not_33x46[3036];
extern const unsigned char gImage_Nav0924_Setting_Sel_34x46[3128];
extern const unsigned char gImage_Nav0924_Setting_Not_34x46[3128];
extern const unsigned char gImage_UI0902_BtnMinus_23x22[1012];
extern const unsigned char gImage_UI0902_BtnPlus_23x22[1012];

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -140,14 +140,14 @@ INTERNAL = [
("gImage_UI0902_Bluetooth_Off_19x20", "02_顶部图标/蓝牙图标-未开启-0923.png"),
("gImage_UI0902_BatteryCharging_40x13", "02_顶部图标/电池图标-充电状态-0924.png"), # 0924 充电闪电电池 40x13
# BatteryFill generated by make_battery_fill() — not from mockup PNG
("gImage_UI0902_TabSetting_Sel_40x32", "03_底部图标/底部图标-10.png"), # 万能白
("gImage_UI0902_TabSetting_Not_40x32", "03_底部图标/底部图标-11.png"), # 普通白
("gImage_UI0902_TabMixer_Sel_40x32", "03_底部图标/底部图标-12.png"), # 专业白
("gImage_UI0902_TabMixer_Not_22x32", "03_底部图标/底部图标-13.png"), # 设置白
("gImage_UI0902_TabMode_Sel_40x32", "03_底部图标/底部图标-14.png"), # 万能蓝
("gImage_UI0902_TabMode_Not_40x32", "03_底部图标/底部图标-15.png"), # 普通蓝
("gImage_UI0902_TabBack_Sel_40x32", "03_底部图标/底部图标-16.png"), # 专业蓝
("gImage_UI0902_TabBack_Not_22x32", "03_底部图标/底部图标-17.png"), # 设置蓝
("gImage_Nav0924_Universal_Sel_33x46", "03_底部图标/底栏0924-universal-sel.png"),
("gImage_Nav0924_Universal_Not_33x46", "03_底部图标/底栏0924-universal-not.png"),
("gImage_Nav0924_Normal_Sel_34x46", "03_底部图标/底栏0924-normal-sel.png"),
("gImage_Nav0924_Normal_Not_34x46", "03_底部图标/底栏0924-normal-not.png"),
("gImage_Nav0924_Expert_Sel_33x46", "03_底部图标/底栏0924-expert-sel.png"),
("gImage_Nav0924_Expert_Not_33x46", "03_底部图标/底栏0924-expert-not.png"),
("gImage_Nav0924_Setting_Sel_34x46", "03_底部图标/底栏0924-setting-sel.png"),
("gImage_Nav0924_Setting_Not_34x46", "03_底部图标/底栏0924-setting-not.png"),
]
# ---------------- external flash (big images / text strips) ----------------