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

This commit is contained in:
2025-03-07 17:14:31 +08:00
parent 850bc533fb
commit 157c3dabe4
33 changed files with 56650 additions and 56577 deletions

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
//获取长度

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
//胎压功能宏

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);

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*/

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();
}

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