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

A27快排版本和A270Y版本更新提交

Browse Source
This commit is contained in:
LiJie
2025-06-11 17:16:43 +08:00
parent 0113a2a2b1
commit 364af82a07
42 changed files with 57337 additions and 59184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MXC_A27-PCB4.5-CANUI/ArkmicroFiles/libcpu-amt630hv100/source/can.c
View File

@ -758,30 +758,15 @@ static void can_rxdemo_thread(void *param)
tlv_data_value[j] = rxmsg[i].Data[j];
}
switch(rxmsg[i].StdId){
// #ifdef UI_VIEW_QUICKLY_ARRANGE
// case 0x100:
// if(abs_speed_flag != 10)
// abs_speed_flag = 10;
// ASB_speed_event_handing(tlv_data_value);
// break;
// #endif
// 快排仪表
case 0x141: //谟绅ABS
if(abs_speed_flag != 10)
abs_speed_flag = 10;
ASB_141_speed_event_handing(tlv_data_value);
break;
// case 0x100: //赛福ABS
// if(abs_speed_flag != 10)
// abs_speed_flag = 10;
// ASB_speed_event_handing(tlv_data_value);
// break;
case 0x101:
if(speed_flag != 10)
speed_flag = 10;
// if(abs_speed_flag != 10)
// abs_speed_flag = 10;
speed_event_handing(tlv_data_value);
break;
case 0x400:

3
MXC_A27-PCB4.5-CANUI/ArkmicroFiles/libcpu-amt630hv100/source/uart_and_can.c
View File

@ -106,7 +106,7 @@ static void protocol_uart_tx_thread(void *param)
//确认仪表完成自检 + 确认仪表收到里程信息 + 确认数据无误(小计总计大小问题)
//确认蓝牙不处于升级 + 确认630不处于升级 + 确认串口收到通讯信息
if(Get_sys_bt_upgrade() == 0 && Get_sys_upgrade_Flag() == 0){//蓝牙升级 不发送数据 630升级 不发送数据
if(Get_sys_bt_upgrade() == 0 && Get_sys_upgrade_Flag() == 0 && Get_sys_power_on_self_test()==100){//蓝牙升级 不发送数据 630升级 不发送数据
#ifndef DATA_CAN
SendDataToBT(heartbeat_data);
iUartWrite(uap, heartbeat_data, 6, pdMS_TO_TICKS(20));
@ -384,6 +384,7 @@ static void protocol_uart_rx_thread(void *param)
Send_ota_state(1);
}else{
printf("enter ota sj.\n");
bt_upgrade_flag = 1;
Set_sys_power_on_self_test(150);
Set_sys_upgrade_Flag(1);//进入ota界面
Send_ota_state(0);

82
MXC_A27-PCB4.5-CANUI/app/moto/protocol/can_protocol.c
View File

@ -23,34 +23,6 @@ void tcsswitch_event_handing(int *buf){
if(tcs_data<=1)
tcs_switch = tcs_data;
}
//101
/*
void speed_event_handing(int *buf){
uint16_t eng_temp = 0;
uint16_t data = 0;
uint8_t state_data = 0;
double buf_value = 0;
*(buf++);
*(buf++);
*(buf++);
*(buf++);
data = *(buf++) &0xFF;
data = (*(buf++)&0xFF) | data<<8;
buf_value = data;
if(buf_value>5280)
buf_value = 255;
else if(buf_value>2730)
buf_value = ((buf_value*0.1)-273);
else
buf_value = 0;
eng_temp = (int)buf_value;
Set_sys_can_temp(eng_temp);
state_data = *(buf++);
Set_sys_can_state(state_data);
}*/
//0xA5
void abs_dtc_event_handing(int *buf){
@ -73,57 +45,3 @@ void ecu_dtc_event_handing2(int *buf){
dtc[0] = *(buf++)&0xFF;
Set_can_abs_dtc(dtc);
}
uint8_t dtc_flag = 0;
void A59_dtc_event_handing(int *buf){
uint32_t sum,sum1,sum2;
sum = 0;
sum1 = *(buf++)&0xFF;
*(buf++)&0xFF;
sum2 = *(buf++)&0xFF;
////低位再前
//sum = sum1 | sum2<<8;
//高位再前
sum = sum1<<8 | sum2;
// if (sum !=0)
Set_sys_now_defect_code(sum);
dtc_flag = *(buf++)&0xFF;
sum = 0;
sum1 = *(buf++)&0xFF;
*(buf++)&0xFF;
sum2 = *(buf++)&0xFF;
sum = sum1<<8 | sum2;
// if (sum !=0)
Set_sys_his_defect_code(sum);
}
//101
void A59_speed_event_handing(int *buf){
uint16_t eng_temp = 0;
uint16_t data = 0;
uint8_t state_data = 0;
double buf_value = 0;
*(buf++);
*(buf++);
*(buf++);
*(buf++);
data = *(buf++) &0xFF;
data = (*(buf++)&0xFF) | data<<8;
buf_value = data;
if(buf_value>5280)
buf_value = 255;
else if(buf_value>2730)
buf_value = ((buf_value*0.1)-273);
else
buf_value = 0;
eng_temp = (int)buf_value;
Set_sys_can_temp(eng_temp);
state_data = *(buf++);
Set_sys_can_state(state_data);
}

BIN
MXC_A27-PCB4.5-CANUI/lib/awtk/awtk-examples/MOTO_A270S/design/default/ui/prompt.bin
View File

Binary file not shown.

16
MXC_A27-PCB4.5-CANUI/lib/awtk/awtk-examples/MOTO_A270S/design/default/ui/prompt.xml
View File

@ -1,4 +1,20 @@
<window name="prompt" style="ui_bg_color_bk">
<progress_bar name="plan_bar" x="c" y="m" w="200" h="20" show_text="true" style:normal:font_name="A27_SYHT_CT" style:normal:text_color="#000000" value="0"/>
<label name="point_text" x="c" y="190" w="160" h="30" style:normal:text_color="#FFFFFF" style:normal:font_name="A27_SYHT_CT" text="升级准备中..."/>
<view name="wifi_view" x="300" y="270" w="490" h="210">
<label name="label1" x="0" y="0" w="490" h="30" style="wifi_label" tr_text="热点:">
<label name="AP" x="100" y="0" w="355" h="30" style="wifi_label"/>
</label>
<label name="label2" x="0" y="40" w="100%" h="30" style="wifi_label" tr_text="密码:">
<label name="PWD" x="100" y="0" w="355" h="30" style="wifi_label"/>
</label>
<label name="label3" x="0" y="80" w="100%" h="30" style="wifi_label" tr_text="状态:">
<label name="state" x="80" y="0" w="355" h="30" style="wifi_label" text="未连接"/>
</label>
<label name="label" x="0" y="110" w="490" h="100" style="wifi_label" line_wrap="true" word_wrap="true" tr_text="当前设备支持wifi升级，可扫码进行连接/搜索输入密码案进行连接"/>
</view>
<view name="countdown_view" x="0" y="0" w="480" h="107">
<label name="countdown" x="10" y="10" w="70" h="79" style="wifi_label" style:normal:font_size="60" text="60"/>
<label name="label4" x="80" y="10" w="382" h="89" style="wifi_label" line_wrap="true" word_wrap="true" tr_text="wifi未连接自动退出倒计时"/>
</view>
</window>

2
MXC_A27-PCB4.5-CANUI/lib/awtk/awtk-examples/MOTO_A270S/manifest.json
View File

File diff suppressed because one or more lines are too long

BIN
MXC_A27-PCB4.5-CANUI/lib/awtk/awtk-examples/MOTO_A270S/res/assets/default/raw/ui/prompt.bin
View File

Binary file not shown.

BIN
MXC_A27-PCB4.5-CANUI/lib/awtk/awtk-examples/MOTO_A270S/res/rom.bin
View File

Binary file not shown.

2
MXC_A27-PCB4.5-CANUI/lib/awtk/awtk-examples/MOTO_A270S/src/common/moto_config.h
View File

@ -49,7 +49,7 @@
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S_KP)
#define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 3
#define SOFT_WARE_ORDER 4
#define HARD_WARE "MXC-A27-S-KP V4.5"
#define KEY_EXCHANGE 1
#define UI_VIEW_QUICKLY_ARRANGE 1//快排功能宏

215
MXC_A27-PCB4.5-CANUI/lib/awtk/awtk-examples/MOTO_A270S/src/common/universal.c
View File

@ -389,213 +389,6 @@ void ASB_141_speed_event_handing(uint8_t *buf){
}
// void ASB_speed_event_handing(uint8_t *buf){
// // cnt=0;
// // printf("=%d.\r\n",cnt);
// uint8_t data = 0;
// uint8_t speed_data = 0;
// uint8_t speed_flag = 0;
// uint16_t speed = 0;
// speed = *(buf++);
// data = *(buf++);
// speed_data = getBit5Value(data,3);
// speed_flag = getBitValue(data,2);
// // printf("frontflag=%d.\r\n",speed_flag);
// //前轮速度有效
// if(!speed_flag){
// speed = speed_data | speed<<5;
// can_speed = speed;//偏移系数
// mile_total +=can_speed;
// (buf++);
// (buf++);
// (buf++);
// (buf++);
// }else{
// speed = getBit2Value(data,0);
// data = *(buf++);
// speed = data | speed<<8;
// data = *(buf++);
// speed_data = getBit3Value(data,5);
// speed_flag = getBitValue(data,4);
// if(!speed_flag){
// speed = speed_data | speed<<3;
// can_speed = speed;//偏移系数
// mile_total +=can_speed;
// }
// (buf++);
// (buf++);
// }
// data = *(buf++);
// livecounter = getBit4Value(data,0);
// avg_can_speed = (uint32_t)((recan_speed+can_speed)/2);
// if(recan_speed){
// if(livecounter!=relivecounter){
// if(livecounter>relivecounter){//最小为1
// diff_livecounter = (livecounter-relivecounter-1);
// while(diff_livecounter){
// diff_livecounter--;
// mile_total +=avg_can_speed;
// }
// }else{
// diff_livecounter = relivecounter-livecounter;
// if(diff_livecounter!=15){//若为15则正常 F->0过度
// mile_total +=((avg_can_speed)*(15-diff_livecounter));
// }
// }
// }else{
// mile_total +=(avg_can_speed*14);
// }
// }
// relivecounter = livecounter;
// recan_speed = can_speed;//保存本次帧的值
// }
// void ASB_speed_event_handing(uint8_t *buf){
// #ifdef UI_VIEW_QUICKLY_ARRANGE
// uint8_t data = 0;
// uint8_t speed_data = 0;
// uint8_t speed_flag = 0;
// uint16_t speed = 0;
// uint32_t trip = 0;
// uint32_t total = 0;
// uint16_t display_speed = 0;
// speed = *(buf++)&0xFF;
// data = *(buf++)&0xFF;
// speed_data = getBit5Value(data,3);
// speed_flag = getBitValue(data,2);
// // printf("frontflag=%d.\r\n",speed_flag);
// //前轮速度有效
// // if(!speed_flag){
// if(0){
// // printf("front>speed_data=%05X,speed=%08X,",speed_data,speed);
// speed = speed_data | speed<<5;
// // printf("rearspeed=%X.\r\n",speed);
// speed = (int)(speed * 0.05625);//偏移系数
// display_speed = speed;//UI显示上浮8%
// // printf("display_speed=%X>%d,",speed,speed);
// speed = (int)(speed * 0.92);
// // printf("mile_speed=%X>%d.\r\n",speed,speed);
// total_mile += calculateTotalDistance(speed);
// if(display_speed>=255)
// display_speed = 255;
// Set_sys_velocity(display_speed);
// trip = flash_trip_mile + total_mile;
// total = flash_total_mile + total_mile;
// if((int)(total_mile)>=1 && (((int)total_mile)%1000 ==0) && total != total_flag){
// save_total_mile = 1;
// total_flag = total;
// }
// Set_sys_trip_mileage(trip);
// Set_sys_total_mileage(total);
// }else{
// speed = getBit2Value(data,0);
// // printf("rear>speed=%X,",speed);
// data = *(buf++)&0xFF;
// // printf("data=%08X,",data);
// speed = data | speed<<8;
// // printf("data2=%X,",speed);
// data = *(buf++)&0xFF;
// speed_data = getBit3Value(data,5);
// // printf("data3=%X.\r\n",speed_data);
// speed_flag = getBitValue(data,4);
// // printf("rearflag=%d.\r\n",speed_flag);
// // if(!speed_flag){
// if(1){
// speed = speed_data | speed<<3;
// // printf("rearspeed=%X.\r\n",speed);
// speed = (int)(speed * 0.05625);//偏移系数
// display_speed = speed * 1.08;//UI显示上浮8%
// // printf("display_speed=%X>%d,",speed,speed);
// speed = (int)(speed);
// // printf("mile_speed=%X>%d.\r\n",speed,speed);
// total_mile += calculateTotalDistance(speed);
// if(display_speed>=255)
// display_speed = 255;
// Set_sys_velocity(display_speed);
// trip = flash_trip_mile + total_mile;
// total = flash_total_mile + total_mile;
// if((int)(total_mile)>=1 && (((int)total_mile)%1000 ==0) && total != total_flag){
// save_total_mile = 1;
// total_flag = total;
// }
// Set_sys_trip_mileage(trip);
// Set_sys_total_mileage(total);
// }
// }
// #endif
// }
// //用于备份
// void ASB_141_speed_event_handing(uint8_t *buf){
// #ifdef UI_VIEW_QUICKLY_ARRANGE
// uint8_t data = 0;
// uint8_t speed_data = 0;
// uint8_t speed_flag = 0;
// uint16_t speed = 0;
// uint32_t trip = 0;
// uint32_t total = 0;
// uint16_t display_speed = 0;
// *(buf++)&0xFF;
// *(buf++)&0xFF;
// *(buf++)&0xFF;
// *(buf++)&0xFF;
// speed = *(buf++)&0xFF;
// data = *(buf++)&0xFF;
// speed_data = getBit5Value(data,3);
// speed = speed_data | speed<<5;
// speed = (int)(speed * 0.05625);//偏移系数
// display_speed = speed;//UI显示上浮8%
// // printf("display_speed=%X>%d,",speed,speed);
// speed = (int)(speed * 0.92);
// // printf("mile_speed=%X>%d.\r\n",speed,speed);
// total_mile += calculateTotalDistance(speed);
// if(display_speed>=255)
// display_speed = 255;
// Set_sys_velocity(display_speed);
// trip = flash_trip_mile + total_mile;
// total = flash_total_mile + total_mile;
// if((int)(total_mile)>=1 && (((int)total_mile)%1000 ==0) && total != total_flag){
// save_total_mile = 1;
// total_flag = total;
// }
// Set_sys_trip_mileage(trip);
// Set_sys_total_mileage(total);
// #endif
// }
extern uint8_t speed_flag;
#define KILOMETER 3600000000 //一万公里
@ -644,13 +437,13 @@ void speed_event_handing(uint8_t *buf){
veer_velocity = *(buf++);
veer_velocity = *(buf++) | veer_velocity<<8;
#if (MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270M_KP && MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270S_KP)
// #if (MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270M_KP && MOTO_WARE_HOSE != MOTO_ICMX_GB518_A270S_KP)
// can_speed = *(buf++);
// mile_total +=can_speed;
display_can_speed = *(buf++);
#else
*(buf++);
#endif
// #else
// *(buf++);
// #endif
*(buf++);
eng_temp = *(buf++);

43753
MXC_A27-PCB4.5-CANUI/proj/amt630hv100.dep
View File

File diff suppressed because it is too large Load Diff

13472
MXC_A27-PCB4.5-CANUI/proj/awtk.dep
View File

File diff suppressed because it is too large Load Diff

30
MXC_A27-PCB4.5-CANUI/proj/settings/amt630hv100.dbgdt
View File

File diff suppressed because one or more lines are too long

5
MXC_A27-PCB4.5-CANUI/proj/settings/amt630hv100.dnx
View File

@ -19,7 +19,7 @@
<LeaveTargetRunning>_ 0</LeaveTargetRunning>
</JLinkDriver>
<DebugChecksum>
<Checksum>3953223197</Checksum>
<Checksum>4277336360</Checksum>
</DebugChecksum>
<Exceptions>
<StopOnUncaught>_ 0</StopOnUncaught>
@ -73,7 +73,8 @@
<Bp20>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\FreeRTOS-Plus\FreeRTOS-Plus-TCP\FreeRTOS_Sockets.c}.373.5" 0 0 1 "" 0 "" 0</Bp20>
<Bp21>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\FreeRTOS-Plus\FreeRTOS-Plus-TCP\FreeRTOS_Sockets.c}.323.9" 0 0 1 "" 0 "" 0</Bp21>
<Bp22>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\lib\lwip\src\api\sockets.c}.1988.5" 0 0 1 "" 0 "" 0</Bp22>
<Count>23</Count>
<Bp23>_ 1 "EMUL_CODE" "{$PROJ_DIR$\..\app\moto\protocol\ota_protocol.c}.114.3" 0 0 1 "" 0 "" 0</Bp23>
<Count>24</Count>
</Breakpoints2>
<Aliases>
<A0>_ "D:\work\amt630h-v100\amt630hV100-sdk-beta\amt630hv100-freertos\lib\awtk\awtk\src\base\bitmap.c" ""</A0>

25
MXC_A27-PCB4.5-CANUI/proj/settings/amt630hv100.wsdt
View File

File diff suppressed because one or more lines are too long