LiJie/MAX_CARLINK_A270S
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增630HV100已出货的量产版本

Browse Source
This commit is contained in:
LiJie
2025-03-07 17:14:31 +08:00
parent 850bc533fb
commit 157c3dabe4
33 changed files with 56650 additions and 56577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -2,6 +2,7 @@
"files.associations": {
"chip.h": "c",
"*.inc": "cpp",
"data_port.h": "c"
"data_port.h": "c",
"can_protocol.h": "c"
}
}

6
MXC_A27-PCB4.5-270S/ArkmicroFiles/libboard-amt630hv100/include/board.h
View File

@ -263,9 +263,9 @@
#ifdef WIFI_SUPPORT
#define CARLINK_EY 0
#define CARLINK_EC 0
#define CARLINK_CP 1
#define CARLINK_AA 1
#define CARLINK_EC 1
#define CARLINK_CP 0
#define CARLINK_AA 0
#if !DEVICE_MXC_A27
#define WIFI_RESET_IO 12

6
MXC_A27-PCB4.5-270S/lib/awtk/awtk-examples/MOTO_A270S/src/common/data_communication_send.c
View File

@ -251,10 +251,10 @@ uint8_t GetWifiName(unsigned char *pBuff)
pBuff[2] = 0x07;
char tmpStr[50] = {0};
#if (MOTO_WARE_HOSE == MOTO_ICMX_A580A)
strcpy(tmpStr, strQrText);
#elif (MOTO_WARE_HOSE == MOTO_ICMX_A590A)
#if (SCREEN_MIRRORING_FUNCTION == TP_WIN_EC)
ap_get_ssid(strQrText, tmpStr);
#else
strcpy(tmpStr, strQrText);
#endif
//获取长度

37
MXC_A27-PCB4.5-270S/lib/awtk/awtk-examples/MOTO_A270S/src/common/moto_config.h
View File

@ -3,58 +3,77 @@
// #define AMT630HV100 1 //控制模拟器和开发板运行 注释掉模拟器可用 打开开发板可用
//投屏功能宏 0-无投屏 1-亿连 2-carplay 3-亿连+carplay 4.carplay+android
#define TP_WIN_NULL 0
#define TP_WIN_EC 1
#define TP_WIN_CP 2
#define TP_WIN_EC_CP 3
#define TP_WIN_CP_AA 4
#define MOTO_ICMX_GB518_A270M 1
#define MOTO_ICMX_GB518_A270M_KP 2
#define MOTO_ICMX_GB518_A270S 3
#define MOTO_ICMX_GB518_A270S_KP 4
#define MOTO_ICMX_GB518_A272M 5
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A270S_KP
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272M
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270M)
#define SOFT_WARE_HOST 1
#define SOFT_WARE_ORDER 17
#define HARD_WARE "MXC-A27-M V4.0"
#define HARD_WARE_LABEL "4.0"
#define KEY_EXCHANGE 1
#define MCU_INFO_LABEL "A270M"
#define SCREEN_MIRRORING_FUNCTION TP_WIN_EC
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270M_KP)
#define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 4
#define HARD_WARE "MXC-A27-M-KP V4.0"
#define HARD_WARE_LABEL "4.0"
#define KEY_EXCHANGE 1
#define UI_VIEW_QUICKLY_ARRANGE 1//快排功能宏
#define SCREEN_MIRRORING_FUNCTION TP_WIN_EC
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S)
#define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 4
#define HARD_WARE "MXC-A27-M V4.5"
#define HARD_WARE_LABEL "4.5"
#define KEY_EXCHANGE 1
#define MCU_INFO_LABEL "A270S"
#define SCREEN_MIRRORING_FUNCTION TP_WIN_CP_AA
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S_KP)
#define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 3
#define HARD_WARE "MXC-A27-S-KP V4.5"
#define HARD_WARE_LABEL "4.5"
#define KEY_EXCHANGE 1
#define UI_VIEW_QUICKLY_ARRANGE 1//快排功能宏
#define MCU_INFO_LABEL "A270S-KP"
#define SCREEN_MIRRORING_FUNCTION TP_WIN_EC
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272M)
#define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 1
#define HARD_WARE "MXC-A272M V4.5"
#define KEY_EXCHANGE 1
#define MCU_INFO_LABEL "A272M"
#define SCREEN_MIRRORING_FUNCTION TP_WIN_EC
#else
#define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 1
#define HARD_WARE "MXC-A27-A V4.0"
#define HARD_WARE_LABEL "4.0"
#define SCREEN_MIRRORING_FUNCTION TP_WIN_NULL
#endif
//#define SOFT_WARE "MXC-A27-A V0.8"
// #define HARD_WARE "MXC-A27-A V4.0"
// #define HARD_WARE_LABEL "4.0"
#define LOW_BRIGHTNESS_MODE 20
//胎压功能宏

8
MXC_A27-PCB4.5-270S/lib/awtk/awtk-examples/MOTO_A270S/src/common/universal.c
View File

@ -445,7 +445,7 @@ void speed_event_handing(int *buf){
veer_velocity = (*(buf++)&0xFF) | veer_velocity<<8;
veer_velocity *= 0.25;
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S)
#if (MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270M_KP && MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270S_KP)
uint8_t speed = 0;
uint32_t trip = 0;
uint32_t total = 0;
@ -467,7 +467,7 @@ void speed_event_handing(int *buf){
veer_velocity = 16384;
Set_sys_veer_velocity(veer_velocity);
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S)
#if (MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270M_KP && MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270S_KP)
total_mile += calculateTotalDistance(speed);
if(display_speed>=255)
display_speed = 255;
@ -1302,11 +1302,11 @@ void information_win_init(widget_t* win){
char* mac_text = Get_device_mac();
child = widget_lookup(win, "mcu", TRUE);
tk_snprintf(tmpStr, sizeof(tmpStr), "%s V%d.%d",Get_device_produce_num(),Get_sys_softwar_host(),Get_sys_softwar_order());
tk_snprintf(tmpStr, sizeof(tmpStr), "%s V%d.%d",MCU_INFO_LABEL,Get_sys_softwar_host(),Get_sys_softwar_order());
widget_set_text_utf8(child,tmpStr);
child = widget_lookup(win, "pcb", TRUE);
tk_snprintf(tmpStr, sizeof(tmpStr), "%s V%d.%d",MCU_INFO_LABEL,Get_device_hardware_version_host(),Get_device_hardware_version_order());
tk_snprintf(tmpStr, sizeof(tmpStr), "%s V%d.%d",Get_device_produce_num(),Get_device_hardware_version_host(),Get_device_hardware_version_order());
widget_set_text_utf8(child,tmpStr);
child = widget_lookup(win, "bt", TRUE);

31
MXC_A27-PCB4.5-270S/lib/awtk/awtk-examples/MOTO_A270S/src/common/user_data.h
View File

@ -193,36 +193,5 @@ void system_flash_to_date_event_handling(void);
void power_on_self_data(void);
#if 0
#define AMT630HV100 1 //控制模拟器和开发板运行 注释掉模拟器可用 打开开发板可用
#define SOFT_WARE "MXC-A27-A V0.1"
#define HARD_WARE "MXC-A27-A V4.0"
#define HARD_WARE_LABEL "4.0"
//胎压温度报警
//前
#define TIRE_PRESSURE_FRONT_UPPER 362+146
#define TIRE_PRESSURE_FRONT_LOWER 268+146
//后
#define TIRE_PRESSURE_REAR_UPPER 362+146
#define TIRE_PRESSURE_REAR_LOWER 275+146
extern Current_fault_code_record_saved_struct* userData_getCurrentFaultRecordSaved(void);
extern Historical_fault_code_record_saved_struct* userData_getHistorFaultRecordSaved(void);
extern daily_data_t custom_data;
daily_data_t* userData_getCustom(void);
void system_date_init(void);
void Simulating_data_changes(void);
void system_flash_to_date_event_handling(void);
#define DEBUG 1
#ifdef DEBUG
#define DEBUG_PRINT(fmt, ...) printf(fmt, ##__VA_ARGS__)
#else
#define DEBUG_PRINT(fmt, ...)
#endif
#endif
#endif /*USER_DATA_H*/

75
MXC_A27-PCB4.5-270S/lib/awtk/awtk-examples/MOTO_A270S/src/pages/new.c
View File

@ -119,7 +119,7 @@ static void tp_init(widget_t *win) {
#endif
#if (MOTO_WARE_HOSE == MOTO_ICMX_A580A || (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S))
#if (SCREEN_MIRRORING_FUNCTION == TP_WIN_CP_AA)
// 关闭对应按钮
widget_t *dis_tab = widget_lookup(win, "ec_tab", TRUE);
widget_set_visible(dis_tab, FALSE);
@ -133,7 +133,7 @@ static void tp_init(widget_t *win) {
widget_set_visible(carplay_view, FALSE);
}
widget_set_visible(p2p_view, FALSE);
#elif (MOTO_WARE_HOSE == MOTO_ICMX_A590A)
#elif (SCREEN_MIRRORING_FUNCTION == TP_WIN_EC_CP)
// 关闭对应按钮
widget_t *dis_tab = widget_lookup(win, "aa_tab", TRUE);
widget_set_visible(dis_tab, FALSE);
@ -166,7 +166,7 @@ static void tp_init(widget_t *win) {
qr_flag = 1;
}
#elif (MOTO_WARE_HOSE == MOTO_ICMX_A591F)
#elif (SCREEN_MIRRORING_FUNCTION == TP_WIN_CP)
// 关闭对应按钮
widget_t *dis_tab = widget_lookup(win, "aa_tab", TRUE);
widget_set_visible(dis_tab, FALSE);
@ -174,34 +174,8 @@ static void tp_init(widget_t *win) {
widget_set_visible(ec_tab, FALSE);
widget_set_visible(carplay_view, TRUE);
widget_set_visible(p2p_view, FALSE);
/*
if (!Get_sys_tp_state()) { // carplay
widget_set_visible(carplay_view, TRUE);
widget_set_visible(p2p_view, FALSE);
} else { // 亿连
widget_set_visible(p2p_view, TRUE);
widget_set_visible(carplay_view, FALSE);
widget_t *bt_name = widget_lookup(win, "bt_name", TRUE);
printf("strQrText=%s.\r\n",strQrText);
widget_t *qr1 = qr_create(qr_view, 40, 81, 200, 200);
qr_set_value(qr1, strQrText);
getTextAfterLastEqual(strQrText, tmpStr);
widget_set_text_utf8(bt_name, tmpStr);
widget_t *uuid = widget_lookup(win, "uuid", TRUE);
tk_snprintf(tmpStr, sizeof(tmpStr), "uuid:%s", UI_uuid);
widget_set_text_utf8(uuid, tmpStr);
ap_get_ssid(strQrText, tmpStr);
printf("wifi_name>%s.\r\n",tmpStr);
ap_get_pwd(strQrText, tmpStr);
printf("wifi_pwd>%s.\r\n",tmpStr);
qr_flag = 1;
}*/
select_tab = widget_lookup(win, "cp_tab", TRUE);
#else
#elif (SCREEN_MIRRORING_FUNCTION == TP_WIN_EC)
// 关闭对应按钮
widget_t *dis_tab = widget_lookup(win, "aa_tab", TRUE);
widget_t *cp_tab = widget_lookup(win, "cp_tab", TRUE);
@ -235,6 +209,40 @@ static void tp_init(widget_t *win) {
qr_flag = 1;
select_tab = widget_lookup(win, "ec_tab", TRUE);
#else
// 关闭对应按钮
widget_t *dis_tab = widget_lookup(win, "aa_tab", TRUE);
widget_t *cp_tab = widget_lookup(win, "cp_tab", TRUE);
widget_t *ec_tab = widget_lookup(win, "ec_tab", TRUE);
widget_set_visible(dis_tab, FALSE);
widget_set_visible(cp_tab, FALSE);
widget_set_visible(ec_tab, TRUE);
widget_set_visible(carplay_view, FALSE);
widget_set_visible(android_view, FALSE);
widget_set_visible(p2p_view, TRUE);
widget_t *bt_name = widget_lookup(win, "bt_name", TRUE);
printf("strQrText=%s.\r\n",strQrText);
widget_t *qr1 = qr_create(qr_view, 40, 81, 200, 200);
// printf("qr1 >>option>> %d.\r\n",widget_index_of(qr1));
qr_set_value(qr1, strQrText);
// getLastNChars(strQrText, 22, tmpStr);
getTextAfterLastEqual(strQrText, tmpStr);
widget_set_text_utf8(bt_name, tmpStr);
widget_t *uuid = widget_lookup(win, "uuid", TRUE);
tk_snprintf(tmpStr, sizeof(tmpStr), "uuid:%s", UI_uuid);
// printf("UI_uuid > %s .\r\n",UI_uuid);
widget_set_text_utf8(uuid, tmpStr);
// printf("tmpStr>%s.\r\n",tmpStr);
ap_get_ssid(strQrText, tmpStr);
printf("wifi_name>%s.\r\n",tmpStr);
ap_get_pwd(strQrText, tmpStr);
printf("wifi_pwd>%s.\r\n",tmpStr);
qr_flag = 1;
select_tab = widget_lookup(win, "ec_tab", TRUE);
#endif
// 加载二维码部分初始化
@ -593,11 +601,7 @@ static ret_t on_new_key_down(void *ctx, event_t *e) {
}
if (evt->key == TK_KEY_w) {
#if (MOTO_WARE_HOSE == MOTO_ICMX_A591F)
return_demo();
#else
#ifdef UI_VIEW_QUICKLY_ARRANGE
#if (SCREEN_MIRRORING_FUNCTION == TP_WIN_EC || SCREEN_MIRRORING_FUNCTION == TP_WIN_CP)
return_demo();
#else
@ -698,7 +702,6 @@ static ret_t on_new_key_down(void *ctx, event_t *e) {
}
#endif
#endif
} else if (evt->key == TK_KEY_q) { // 灯光开关
return_demo();
}

18
MXC_A27-PCB4.5-270S/lib/awtk/awtk-examples/MOTO_A270S/src/window_main.c
View File

@ -201,7 +201,7 @@ void UI_init(void){
#else
#if (MOTO_WARE_HOSE == MOTO_ICMX_A580A || (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S))
#if (SCREEN_MIRRORING_FUNCTION == TP_WIN_CP_AA)
if(!Get_sys_tp_state()){//carplay
printf("awtk init carplay.\r\n");
Set_sys_tp_state(0);
@ -217,10 +217,18 @@ void UI_init(void){
carlink_aa_enable(0);
carlink_ec_enable(0);
}
#elif (MOTO_WARE_HOSE == MOTO_ICMX_A591F)
#elif (SCREEN_MIRRORING_FUNCTION == TP_WIN_CP)
Set_sys_tp_state(0);
carlink_cp_enable(1);
carlink_aa_enable(0);
carlink_ec_enable(0);
#elif (SCREEN_MIRRORING_FUNCTION == TP_WIN_EC)
printf("awtk init .ec\r\n");
Set_sys_tp_state(2);
carlink_cp_enable(0);
carlink_aa_enable(0);
carlink_ec_enable(1);
#else
switch(Get_sys_tp_state()){
case 0://carplay
@ -252,11 +260,7 @@ void UI_init(void){
#else
sleep_ms(10);
#endif
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S)
console_send_atcmd("AT+NAME=A27_MOTO_Phone,1\r\n", strlen("AT+NAME=A27_MOTO_Phone,1\r\n"));//修改蓝牙名
#else
console_send_atcmd("AT+NAME=A59_MOTO_Phone,1\r\n", strlen("AT+NAME=A59_MOTO_Phone,1\r\n"));//修改蓝牙名
#endif
console_send_atcmd("AT+NAME=A27_MOTO_Phone,1\r\n", strlen("AT+NAME=A27_MOTO_Phone,1\r\n"));//修改蓝牙名
#ifdef AMT630HV100
vTaskDelay(10);
#else

42432
MXC_A27-PCB4.5-270S/proj/amt630hv100.dep
View File

File diff suppressed because it is too large Load Diff

14580
MXC_A27-PCB4.5-270S/proj/awtk.dep
View File

File diff suppressed because it is too large Load Diff

4
MXC_A27-PCB4.5-270S/proj/settings/amt630hv100.dbgdt
View File

@ -137,7 +137,7 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>720900008B0001DC00000300000002860000010000005786000001000000268400000300000019800000010000005984000002000000138600002C01000021DE0000010000000880000001000000298100000C00000040E10000010000002CE10000020000007884000003000000048100000500000000DA000001000000158100000300000056840000010000002681000001000000108600000104000045810000010000003184000001000000AF0600000400000016B0000001000000239200000100000007E100000200000029E1000001000000018100000E000000878000000A000000D884000002000000009000000500000002B0000001000000ED800000010000005F8600000700000020810000010000000F8100000200000004E1000002000000A680000001000000EA800000010000001D920000010000000D8000000200000026DE0000020000001D8100000900000001E10000070000003F810000010000000C8100009701000003DC000004000000D185000002000000048600000100000009810000010000001A8F00000100000003840000050000000186000001000000568600000F0000002881000001000000178100000500000000DC00000100000014810000060000007784000002000000558400001800000047810000010000003384000001000000808C0000010000002BE100000B0000000084000003000000118400000100000007B00000020000008386000002000000228100000100000028E100000100000085840000010000008980000001000000EF800000010000000E840000010000000C860000030000000081000001000000098600000100000028DE000003000000978000000100000025E100002C010000EC800000010000005E8600001600000003E100000A0000001A860000030000000E810000010000001F8100005801000000E1000002000000A5800000010000000B8100000E0000008E86000001000000E980000002000000D184000001000000038600000100000027840000010000002B8000000100000069860000010000005886000001000000058400000A00000014860000E000000002DC0000010000001681000001000000198F0000030000002A8F000002000000F4800000010000000086000001000000028400000300000027810000040000005586000002000000058100002000000011860000C4000000028100000100000074860000010000000BDE00000100000017B00000010000002AE1000001000000108400000D00000046810000E80000005184000001000000A486000001000000888000000100000044D50000010000004381000001000000608600004B000000EE8000000100000003B00000010000002181000006000000D684000001000000A186000002000000EB800000010000005D860000070000001E8100000300000035E100000600000002E100000300000008860000020000000D8100001000000024E1000001000000058600000100000007840000010000000A81000002000000E880000001000000</CommandsUsage>
<CommandsUsage>780900008B0040E1000001000000298100000C000000088000000100000021DE000001000000138600002C0100005984000002000000198000000100000026840000030000005786000001000000028600000100000001DC000003000000108600000504000026810000010000005684000001000000158100000300000000DA000001000000048100000500000078840000030000002CE1000002000000018100000E00000029E100000100000007E1000002000000239200000100000016B0000001000000AF060000040000003184000001000000458100000100000004E10000020000000F8100000200000020810000010000005F86000007000000ED8000000100000002B00000010000000090000005000000D884000002000000878000000A0000000C810000970100003F8100000100000001E10000070000001D8100000900000026DE0000020000000D800000020000001D92000001000000EA80000001000000A68000000100000009810000010000000486000001000000D18500000200000003DC00000400000000DC00000100000017810000050000002881000001000000568600000F000000018600000100000003840000050000001A8F00000100000007B0000002000000118400000100000000840000030000002BE100000B000000808C0000010000003384000001000000478100000100000055840000180000007784000002000000148100000600000000810000010000000C860000030000000E84000001000000EF800000010000008980000001000000858400000100000028E1000001000000228100000100000083860000020000001F810000580100000E810000010000001A8600000300000003E100000A0000005E86000016000000EC8000000100000025E100002C010000978000000100000028DE0000030000000986000001000000E9800000020000008E860000010000000B8100000E000000A58000000100000000E100000200000002DC00000100000014860000E0000000058400000A000000588600000100000069860000010000002B8000000100000027840000010000000386000001000000D18400000100000011860000C400000005810000200000005586000002000000278100000400000002840000030000000086000001000000F4800000010000002A8F000002000000198F000003000000168100000100000046810000EA000000108400000D0000002AE100000100000017B00000010000000BDE00000100000074860000010000000281000001000000218100000600000003B0000001000000EE80000001000000608600004B000000438100000100000044D50000010000008880000001000000A486000001000000518400000100000024E10000010000000D81000010000000088600000200000002E100000300000035E10000060000001E810000030000005D86000007000000EB80000001000000A186000002000000D684000001000000E8800000010000000A8100000200000007840000010000000586000001000000</CommandsUsage>
</MFCToolBarParameters>
<CommandManager>
<CommandsWithoutImages>4A0008800000098000000A8000000B8000000C800000158000000A810000FFFFFFFF01E8000012810000D2840000D1850000D78600000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E92000000DC000001DC000002DC000003DC0000748600007784000007840000808C000044D50000838600005886000004DC000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B00000248100002AE10000008200001C8200000182000067860000008800000188000002880000038800000488000005880000</CommandsWithoutImages>
@ -880,7 +880,7 @@
</BasePane-34049>
<MFCToolBar-34050>
<Name>Main</Name>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000063000000FFFEFF000000000000000000000000000100000001000000018001E100000000000064000000FFFEFF000000000000000000000000000100000001000000018003E100000000000066000000FFFEFF0000000000000000000000000001000000010000000180008100000000000047000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000069000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006B000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006A000000FFFEFF000000000000000000000000000100000001000000018025E10000000000006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040070000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005A000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006C000000FFFEFF000000000000000000000000000100000001000000018028E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018029E10000000000006F000000FFFEFF0000000000000000000000000001000000010000000180028100000000000049000000FFFEFF000000000000000000000000000100000001000000018029810000000000005E000000FFFEFF000000000000000000000000000100000001000000018027810000000000005C000000FFFEFF000000000000000000000000000100000001000000018028810000000000005D000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000056000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040057000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000004D000000FFFEFF00000000000000000000000000010000000100000001800C810000000000004E000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000062000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F8100000000000058000000FFFEFF0000000000000000000000000001000000010000000180208100000000000059000000FFFEFF0000000000000000000000000001000000010000000180468100000000020060000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000064000000FFFEFF000000000000000000000000000100000001000000018001E100000000000065000000FFFEFF000000000000000000000000000100000001000000018003E100000000000067000000FFFEFF0000000000000000000000000001000000010000000180008100000000000048000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006C000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006B000000FFFEFF000000000000000000000000000100000001000000018025E10000000000006E000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040071000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040072000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005B000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006D000000FFFEFF000000000000000000000000000100000001000000018028E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018029E100000000000070000000FFFEFF000000000000000000000000000100000001000000018002810000000000004A000000FFFEFF000000000000000000000000000100000001000000018029810000000000005F000000FFFEFF000000000000000000000000000100000001000000018027810000000000005D000000FFFEFF000000000000000000000000000100000001000000018028810000000000005E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040057000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040058000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000004E000000FFFEFF00000000000000000000000000010000000100000001800C810000000000004F000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000063000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F8100000000000059000000FFFEFF000000000000000000000000000100000001000000018020810000000000005A000000FFFEFF0000000000000000000000000001000000010000000180468100000000020061000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>
</MFCToolBar-34050>
<Pane-34050>
<ID>34050</ID>

2
MXC_A27-PCB4.5-270S/proj/settings/amt630hv100.dnx
View File

@ -19,7 +19,7 @@
<LeaveTargetRunning>_ 0</LeaveTargetRunning>
</JLinkDriver>
<DebugChecksum>
<Checksum>3396642005</Checksum>
<Checksum>2214748751</Checksum>
</DebugChecksum>
<Exceptions>
<StopOnUncaught>_ 0</StopOnUncaught>

8
MXC_A27-PCB4.5-270S/proj/settings/amt630hv100.wsdt
View File

File diff suppressed because one or more lines are too long

BIN
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/design/default/ui/set_list.bin
View File

Binary file not shown.

5
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/design/default/ui/set_list.xml
View File

@ -8,7 +8,10 @@
<tab_button name="tab_button3" load_ui="settingview3" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" with_focus_state="false" tr_text="蓝牙设置"/>
<tab_button name="tab_button4" load_ui="settingview4" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:bg_image="" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" with_focus_state="false" tr_text="其他设置"/>
<tab_button name="tab_button5" load_ui="settingview5" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" with_focus_state="false" tr_text="车辆信息"/>
<tab_button name="tab_button6" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" style:pressed:text_align_h="center" style:pressed:icon="" style:over:text_align_h="left" style:over:icon="return" style:disable:text_align_h="left" style:disable:icon="return" style:focused:text_align_h="center" style:focused:icon="" style:normal_of_active:text_align_h="center" style:normal_of_active:icon="" style:pressed_of_active:text_align_h="center" style:pressed_of_active:icon="" style:over_of_active:text_align_h="center" style:over_of_active:icon="" style:disable_of_active:text_align_h="center">
<tab_button name="tab_button6" load_ui="settingview6" style:normal:font_name="default" style:normal:font_size="36" style:normal:border_color="#00000000" style="list_btn" style:normal:icon="" style:normal:icon_at="left" style:normal:text_align_h="center" focusable="true" style:pressed:text_align_h="center" style:pressed:icon="" style:over:text_align_h="left" style:over:icon="return" style:disable:text_align_h="left" style:disable:icon="return" style:focused:text_align_h="center" style:focused:icon="" style:normal_of_active:text_align_h="center" style:normal_of_active:icon="" style:pressed_of_active:text_align_h="center" style:pressed_of_active:icon="" style:over_of_active:text_align_h="center" style:over_of_active:icon="">
<property name="style:disable_of_active:text_align_h">
<![CDATA[center]]>
</property>
<property name="style:focused_of_active:text_align_h">
<![CDATA[center]]>
</property>

BIN
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/design/default/ui/settingview6.bin Normal file
View File

Binary file not shown.

4
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/design/default/ui/settingview6.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml parent="{&quot;x&quot;:&quot;0&quot;,&quot;y&quot;:&quot;0&quot;,&quot;w&quot;:&quot;100%&quot;,&quot;h&quot;:&quot;100%&quot;,&quot;name&quot;:&quot;settingview6&quot;,&quot;style:normal:bg_color&quot;:&quot;#00B050&quot;}"?>
<view w="100%" h="100%" x="0" y="0">
<view name="view" x="c" y="m" w="90%" h="90%"/>
</view>

2
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/manifest.json
View File

File diff suppressed because one or more lines are too long

2
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/res/assets/__assets_dark.inc
View File

@ -9,6 +9,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview2[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview3[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview4[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview5[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_settingview6[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_set_list[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_set_theme[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_set_theme_bg[]);
@ -119,6 +120,7 @@ ret_t assets_init_dark(void) {
assets_manager_add(am, ui_settingview3);
assets_manager_add(am, ui_settingview4);
assets_manager_add(am, ui_settingview5);
assets_manager_add(am, ui_settingview6);
assets_manager_add(am, ui_set_list);
assets_manager_add(am, ui_set_theme);
assets_manager_add(am, ui_set_theme_bg);

2
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/res/assets/__assets_default.inc
View File

@ -9,6 +9,7 @@
#include "default/inc/ui/settingview3.data"
#include "default/inc/ui/settingview4.data"
#include "default/inc/ui/settingview5.data"
#include "default/inc/ui/settingview6.data"
#include "default/inc/ui/set_list.data"
#include "default/inc/ui/set_theme.data"
#include "default/inc/ui/set_theme_bg.data"
@ -119,6 +120,7 @@ ret_t assets_init_default(void) {
assets_manager_add(am, ui_settingview3);
assets_manager_add(am, ui_settingview4);
assets_manager_add(am, ui_settingview5);
assets_manager_add(am, ui_settingview6);
assets_manager_add(am, ui_set_list);
assets_manager_add(am, ui_set_theme);
assets_manager_add(am, ui_set_theme_bg);

BIN
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/res/assets/default/raw/ui/set_list.bin
View File

Binary file not shown.

BIN
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/res/assets/default/raw/ui/settingview6.bin Normal file
View File

Binary file not shown.

2
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/res/assets_dark.inc
View File

@ -9,6 +9,7 @@
#include "assets/default/inc/ui/settingview3.data"
#include "assets/default/inc/ui/settingview4.data"
#include "assets/default/inc/ui/settingview5.data"
#include "assets/default/inc/ui/settingview6.data"
#include "assets/default/inc/ui/set_list.data"
#include "assets/default/inc/ui/set_theme.data"
#include "assets/default/inc/ui/set_theme_bg.data"
@ -120,6 +121,7 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_settingview3);
assets_manager_add(am, ui_settingview4);
assets_manager_add(am, ui_settingview5);
assets_manager_add(am, ui_settingview6);
assets_manager_add(am, ui_set_list);
assets_manager_add(am, ui_set_theme);
assets_manager_add(am, ui_set_theme_bg);

2
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/res/assets_default.inc
View File

@ -9,6 +9,7 @@
#include "assets/default/inc/ui/settingview3.data"
#include "assets/default/inc/ui/settingview4.data"
#include "assets/default/inc/ui/settingview5.data"
#include "assets/default/inc/ui/settingview6.data"
#include "assets/default/inc/ui/set_list.data"
#include "assets/default/inc/ui/set_theme.data"
#include "assets/default/inc/ui/set_theme_bg.data"
@ -120,6 +121,7 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_settingview3);
assets_manager_add(am, ui_settingview4);
assets_manager_add(am, ui_settingview5);
assets_manager_add(am, ui_settingview6);
assets_manager_add(am, ui_set_list);
assets_manager_add(am, ui_set_theme);
assets_manager_add(am, ui_set_theme_bg);

BIN
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/res/rom.bin
View File

Binary file not shown.

7
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/src/common/moto_config.h
View File

@ -14,7 +14,7 @@
#define MOTO_ICMX_GB518_A272O 2
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A270T
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272O
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270T)
@ -24,7 +24,6 @@
#define TP_VERSION OVERSEAS_VERSION_2
#define HARD_WARE "MXC-A270T V4.5"
#define HARD_WARE_LABEL "4.5"
#define MCU_INFO_LABEL "A270T"
#define UI_TEMP_CLOSE 1
@ -38,7 +37,6 @@
#define TP_VERSION DOMESTIC_VERSION_1
#define HARD_WARE "MXC-A272O V4.5"
#define HARD_WARE_LABEL "4.5"
#define MCU_INFO_LABEL "A272O"
//胎压功能宏
@ -53,7 +51,6 @@
//#define SOFT_WARE "MXC-A27-A V0.8"
#define HARD_WARE "MXC-A27-A V4.3"
#define HARD_WARE_LABEL "4.3"
#endif
@ -117,7 +114,7 @@
#define LOW_BRIGHTNESS_MODE 20
// 打印
// #define DEBUG 1
#define DEBUG 1
#ifdef DEBUG
#define DEBUG_PRINT(fmt, ...) printf(fmt, ##__VA_ARGS__)
#else

5
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/src/pages/new.c
View File

@ -174,8 +174,9 @@ static void tp_init(widget_t *win) {
// 关闭对应按钮
widget_t *dis_tab = widget_lookup(win, "aa_tab", TRUE);
widget_set_visible(dis_tab, FALSE);
widget_t *ec_tab = widget_lookup(win, "cp_tab", TRUE);
widget_set_visible(ec_tab, FALSE);
widget_t *cp_tab = widget_lookup(win, "cp_tab", TRUE);
widget_set_visible(cp_tab, FALSE);
select_tab = widget_lookup(win, "ec_tab", TRUE);
widget_set_visible(p2p_view, TRUE);
widget_set_visible(carplay_view, FALSE);

33
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/src/pages/settingview11.c
View File

@ -9,25 +9,33 @@ void theme_list_init(widget_t* win){
widget_t* child =NULL;
widget_t* widget =NULL;
uint8_t count = 0 ;
if(win != NULL && strcmp(win->name,"set_list")==0){
const char* language = locale_info()->language;
//if(win != NULL && strcmp(win->name,"set_list")==0){
/*
widget = widget_lookup(win,"theme",TRUE);
if(widget!=NULL){
widget_set_visible(widget,FALSE);
widget_set_enable(widget,FALSE);
}
child = widget_get_child(widget,0);
count = Get_sys_theme();
const char* language = locale_info()->language;
/*
#if 0
if(count == 0)
widget_set_text_utf8(child,"ui_demo1");
else if(count == 1)
widget_set_text_utf8(child,"demo2");
else if(count == 2 )
widget_set_text_utf8(child,"demo3");*/
widget_set_text_utf8(child,"demo3");
#endif
if (tk_str_eq(language, "en")) {//英文
widget_set_text_utf8(child,"Improving...");
}else{
widget_set_text_utf8(child,"完善中...");
}
}*/
widget = widget_lookup(win,"theme_bg",TRUE);
child = widget_get_child(widget,0);
@ -35,19 +43,22 @@ void theme_list_init(widget_t* win){
if (tk_str_eq(language, "en")) {//英文
if(count == 0)
widget_set_text_utf8(child,"Night");
else if(count == 1)
else if(count == 1)
widget_set_text_utf8(child,"Daytime");
else if(count == 2 )
else if(count == 2 )
widget_set_text_utf8(child,"Adaptive");
}else{
if(count == 0)
widget_set_text_utf8(child,"黑夜");
else if(count == 1)
else if(count == 1)
widget_set_text_utf8(child,"白天");
else if(count == 2 )
else if(count == 2 )
widget_set_text_utf8(child,"自适应");
}
}
//}
}
@ -61,7 +72,6 @@ static ret_t visit_init_child(void* ctx, const void* iter) {
// 初始化指定名称的控件（设置属性或注册事件），请保证控件名称在窗口上唯一
if (name != NULL && *name != '\0') {
printf("*******************init2 *****************\r\n");
}
return RET_OK;
@ -76,7 +86,6 @@ ret_t settingview11_init(widget_t* component, void* ctx) {
widget_foreach(component, visit_init_child, component);
printf("*******************init *****************\r\n");
return RET_OK;
}

30
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/src/pages/settingview6.c Normal file
View File

@ -0,0 +1,30 @@
#include "awtk.h"
#include "../common/navigator.h"
/**
* 初始化窗口的子控件
*/
static ret_t visit_init_child(void* ctx, const void* iter) {
//widget_t* component = WIDGET(ctx);
widget_t* widget = WIDGET(iter);
const char* name = widget->name;
// 初始化指定名称的控件（设置属性或注册事件），请保证控件名称在窗口上唯一
if (name != NULL && *name != '\0') {
}
return RET_OK;
}
/**
* 初始化窗口
*/
ret_t settingview6_init(widget_t* component, void* ctx) {
(void)ctx;
return_value_if_fail(component != NULL, RET_BAD_PARAMS);
widget_foreach(component, visit_init_child, component);
return RET_OK;
}

2
MXC_A27-PCB4.5-270T/lib/awtk/awtk-examples/MOTO_A270T/src/window_main.c
View File

@ -230,12 +230,14 @@ void UI_init(void){
#elif (CARLINK_TP_CP)
printf("only tp init cp.\r\n");
Set_sys_tp_state(0);
carlink_cp_enable(1);
carlink_aa_enable(0);
carlink_ec_enable(0);
#elif (CARLINK_TP_EC)
printf("only tp init cp.\r\n");
Set_sys_tp_state(1);
carlink_cp_enable(0);
carlink_aa_enable(0);
carlink_ec_enable(1);

39683
MXC_A27-PCB4.5-270T/proj/amt630hv100.dep
View File

File diff suppressed because it is too large Load Diff

16232
MXC_A27-PCB4.5-270T/proj/awtk.dep
View File

File diff suppressed because it is too large Load Diff

6
MXC_A27-PCB4.5-270T/proj/settings/amt630hv100.wsdt
View File

@ -100,11 +100,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>C20400008B0001DC00000100000002860000010000005786000001000000268400000300000019800000010000005984000002000000138600000500000021DE0000010000000880000001000000298100000C00000040E10000010000002CE10000020000007884000003000000048100000500000000DA000001000000158100000300000056840000010000002681000001000000108600000100000045810000010000003184000001000000AF0600000400000016B0000001000000239200000100000007E100000200000029E1000001000000018100000E000000878000000A000000D884000002000000009000000500000002B0000001000000ED800000010000005F8600000900000020810000010000000F8100000200000004E1000002000000A680000001000000EA800000010000001D920000010000000D8000000200000026DE0000020000001D8100000900000001E10000070000003F810000010000000C8100001A04000003DC000001000000D185000002000000048600000100000009810000010000001A8F0000010000000384000005000000018600000100000056860000020000002881000001000000178100000500000000DC00000100000014810000090000007784000002000000558400001800000047810000050000003384000001000000808C0000010000002BE100000B0000000084000003000000118400000100000007B00000020000008386000002000000228100000100000028E100000100000085840000010000008980000001000000EF800000010000000E840000020000000C860000020000000081000001000000098600000100000028DE000003000000978000000100000025E100002C010000EC800000010000005E8600000100000003E100000A0000001A860000010000000E810000560100001F8100000100000000E1000002000000A5800000010000000B810000400000008E86000001000000E980000003000000D184000001000000038600000100000027840000010000002B8000000100000069860000010000005886000001000000058400006A000000148600000100000002DC0000010000001681000001000000198F0000030000002A8F000002000000F480000001000000008600000100000002840000030000002781000004000000558600000100000005810000210000001186000001000000028100000100000074860000010000000BDE00000100000017B00000010000002AE1000001000000108400000F00000046810000010000005184000001000000A486000001000000888000000100000044D500000100000043810000010000006086000017000000EE8000000100000003B00000010000002181000006000000D684000001000000A186000002000000EB800000010000005D860000010000001E8100000300000035E100000600000002E100000300000008860000010000000D8100005900000024E1000001000000058600000100000007840000010000000A81000002000000E880000001000000</CommandsUsage>
<CommandsUsage>C40400008B0040E1000001000000298100000C000000088000000100000021DE00000100000013860000050000005984000002000000198000000100000026840000030000005786000001000000028600000100000001DC000001000000108600000100000026810000010000005684000001000000158100000300000000DA000001000000048100000500000078840000030000002CE1000002000000018100000E00000029E100000100000007E1000002000000239200000100000016B0000001000000AF060000040000003184000001000000458100000100000004E10000020000000F8100000200000020810000010000005F86000009000000ED8000000100000002B00000010000000090000005000000D884000002000000878000000A0000000C8100001C0400003F8100000100000001E10000070000001D8100000900000026DE0000020000000D800000020000001D92000001000000EA80000001000000A68000000100000009810000010000000486000001000000D18500000200000003DC00000100000000DC000001000000178100000500000028810000010000005686000002000000018600000100000003840000050000001A8F00000100000007B0000002000000118400000100000000840000030000002BE100000B000000808C0000010000003384000001000000478100000500000055840000180000007784000002000000148100000900000000810000010000000C860000020000000E84000002000000EF800000010000008980000001000000858400000100000028E1000001000000228100000100000083860000020000001F810000010000000E810000560100001A8600000100000003E100000A0000005E86000001000000EC8000000100000025E100002C010000978000000100000028DE0000030000000986000001000000E9800000030000008E860000010000000B81000040000000A58000000100000000E100000200000002DC0000010000001486000001000000058400006A000000588600000100000069860000010000002B8000000100000027840000010000000386000001000000D184000001000000118600000100000005810000210000005586000001000000278100000400000002840000030000000086000001000000F4800000010000002A8F000002000000198F00000300000016810000010000004681000001000000108400000F0000002AE100000100000017B00000010000000BDE00000100000074860000010000000281000001000000218100000600000003B0000001000000EE800000010000006086000017000000438100000100000044D50000010000008880000001000000A486000001000000518400000100000024E10000010000000D81000059000000088600000100000002E100000300000035E10000060000001E810000030000005D86000001000000EB80000001000000A186000002000000D684000001000000E8800000010000000A8100000200000007840000010000000586000001000000</CommandsUsage>
</MFCToolBarParameters>
<CommandManager>
<CommandsWithoutImages>48000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F00007784000007840000808C000044D50000008200001C820000018200006786000051840000E88000005384000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D92000020F1000010F0000000F0000020F0000030F0000060F0000023D5000024D5000025D5000026D5000027D50000498100004A8100002F8200001682000018820000198200000C840000338400007884000011840000</CommandsWithoutImages>
<MenuUserImages>2F00048400004C0000002CE100003F00000015810000210000000481000018000000239200000000000007E100003700000031840000530000000F81000023000000208100002B0000005F8600003000000004E10000350000000C8100002000000023E10000390000000D8000001300000001E1000032000000068400004E0000001781000023000000038400004B000000008400000B0000002BE100003E000000148100002000000030840000520000000E84000050000000008100001500000044920000100000000E810000220000001F8100002A00000025E100003B00000003E10000340000001F9200000D00000022E100003C0000000B8100001F00000000E10000310000002D9200000F000000D18400000C00000041E1000041000000058400004D00000016810000220000000581000019000000028400004A0000003284000054000000108400005100000005E10000360000000D8100002100000002E10000330000000A8400004F0000002C9200000E000000</MenuUserImages>
<MenuUserImages>2F00048400004C000000048100001800000015810000210000002CE100003F000000318400005300000007E1000037000000239200000000000004E10000350000005F86000030000000208100002B0000000F8100002300000001E10000320000000D8000001300000023E10000390000000C81000020000000068400004E000000038400004B000000178100002300000014810000200000002BE100003E000000008400000B000000449200001000000000810000150000000E8400005000000030840000520000001F9200000D00000003E100003400000025E100003B0000001F8100002A0000000E810000220000002D9200000F00000000E10000310000000B8100001F00000022E100003C000000058400004D00000041E1000041000000D18400000C000000028400004A000000058100001900000016810000220000001084000051000000328400005400000005E10000360000000A8400004F00000002E10000330000000D810000210000002C9200000E000000</MenuUserImages>
</CommandManager>
<Pane-59393>
<ID>0</ID>
@ -406,7 +406,7 @@
</BasePane-34049>
<MFCToolBar-34050>
<Name>Main</Name>
<Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000400FFFEFF12730074006100720074005F00690070006500720066005F0063006C00690065006E007400FFFEFF0B75006300490050004100640064007200650073007300FFFEFF166700650074005F006C007700690070005F006E00650074005F0069006E007400650072006600610063006500FFFEFF10610072006B005F006E006500740077006F0072006B005F0069006E006900740000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
<Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000040038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000400FFFEFF12730074006100720074005F00690070006500720066005F0063006C00690065006E007400FFFEFF0B75006300490050004100640064007200650073007300FFFEFF166700650074005F006C007700690070005F006E00650074005F0069006E007400650072006600610063006500FFFEFF10610072006B005F006E006500740077006F0072006B005F0069006E006900740000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000040041000000FFFEFF000000000000000000000000000100000001000000018002810000000004001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000040030000000FFFEFF000000000000000000000000000100000001000000018027810000000004002E000000FFFEFF000000000000000000000000000100000001000000018028810000000004002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
</MFCToolBar-34050>
<Pane-34050>
<ID>34050</ID>