A270S版本路测100km差1.2km-V0.10版本

This commit is contained in:
2025-03-26 08:32:48 +08:00
parent 157c3dabe4
commit 497f8eb1e1
31 changed files with 58890 additions and 56625 deletions

10
.vscode/settings.json vendored
View File

@ -3,6 +3,14 @@
"chip.h": "c", "chip.h": "c",
"*.inc": "cpp", "*.inc": "cpp",
"data_port.h": "c", "data_port.h": "c",
"can_protocol.h": "c" "can_protocol.h": "c",
"mmcsd_core.h": "c",
"universal.h": "c",
"user_protocol.h": "c",
"navigator.h": "c",
"board.h": "c",
"moto_adc.h": "c",
"moto_config.h": "c",
"awtk.h": "c"
} }
} }

View File

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

View File

@ -745,7 +745,7 @@ uint8_t mile_flag = 0;
static void can_rxdemo_thread(void *param) static void can_rxdemo_thread(void *param)
{ {
CanPort_t *cap = param; CanPort_t *cap = param;
int tlv_data_value[8] = {0}; uint8_t tlv_data_value[8] = {0};
for (;;) { for (;;) {
CanMsg rxmsg[8] = {0}; CanMsg rxmsg[8] = {0};
@ -820,14 +820,23 @@ static void can_rxdemo_thread(void *param)
// ASB_speed_event_handing(tlv_data_value); // ASB_speed_event_handing(tlv_data_value);
// break; // break;
// #endif // #endif
case 0x141:
// 快排仪表
case 0x141: //谟绅ABS
if(abs_speed_flag != 10) if(abs_speed_flag != 10)
abs_speed_flag = 10; abs_speed_flag = 10;
ASB_141_speed_event_handing(tlv_data_value); ASB_141_speed_event_handing(tlv_data_value);
break; break;
// case 0x100: //赛福ABS
// if(abs_speed_flag != 10)
// abs_speed_flag = 10;
// ASB_speed_event_handing(tlv_data_value);
// break;
case 0x101: case 0x101:
if(speed_flag != 10) if(speed_flag != 10)
speed_flag = 10; speed_flag = 10;
// if(abs_speed_flag != 10)
// abs_speed_flag = 10;
speed_event_handing(tlv_data_value); speed_event_handing(tlv_data_value);
break; break;
case 0x400: case 0x400:
@ -873,7 +882,7 @@ int can_demo(void)
/* Create a task to test read can msg */ /* Create a task to test read can msg */
if (xTaskCreate(can_rxdemo_thread, "canrx", configMINIMAL_STACK_SIZE, cap, if (xTaskCreate(can_rxdemo_thread, "canrx", configMINIMAL_STACK_SIZE, cap,
configMAX_PRIORITIES / 3, NULL) != pdPASS) { configMAX_PRIORITIES / 2, NULL) != pdPASS) {
printf("create can rxdemo task fail.\n"); printf("create can rxdemo task fail.\n");
return -1; return -1;
} }

View File

@ -1071,7 +1071,7 @@ static void uart_rx_demo_thread(void *param)
} }
printf("\r\n"); printf("\r\n");
if((0x01 == len) && (0x00 == uartrx[0])) break; if((0x01 == len) && (0x00 == uartrx[0])) continue;
memcpy((cmdstr+cmdlen), uartrx, len); memcpy((cmdstr+cmdlen), uartrx, len);
cmdlen += len; cmdlen += len;

View File

@ -2080,6 +2080,8 @@ void vTaskStartScheduler( void )
* FreeRTOSConfig.h file. */ * FreeRTOSConfig.h file. */
portCONFIGURE_TIMER_FOR_RUN_TIME_STATS(); portCONFIGURE_TIMER_FOR_RUN_TIME_STATS();
portCONFIGURE_TIMER2_FOR_RUN_TIME_STATS();
traceTASK_SWITCHED_IN(); traceTASK_SWITCHED_IN();
/* Setting up the timer tick is hardware specific and thus in the /* Setting up the timer tick is hardware specific and thus in the

View File

@ -160,6 +160,7 @@ used. */
#define configGENERATE_RUN_TIME_STATS 1 #define configGENERATE_RUN_TIME_STATS 1
extern void vInitialiseTimerForRunTimeState(); extern void vInitialiseTimerForRunTimeState();
#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vInitialiseTimerForRunTimeState(); #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vInitialiseTimerForRunTimeState();
#define portCONFIGURE_TIMER2_FOR_RUN_TIME_STATS() Moto_speed_timer();
extern volatile uint32_t ulHighFrequencyTimerCounts; extern volatile uint32_t ulHighFrequencyTimerCounts;
#define portGET_RUN_TIME_COUNTER_VALUE() ulHighFrequencyTimerCounts #define portGET_RUN_TIME_COUNTER_VALUE() ulHighFrequencyTimerCounts

View File

@ -726,6 +726,7 @@ extern int get_usb_mode();
extern int ark_network_init(void); extern int ark_network_init(void);
#endif #endif
extern void Moto_speed_timer(void);
void awtk_thread(void *data) void awtk_thread(void *data)
{ {
printf("awtk thread start.\n"); printf("awtk thread start.\n");
@ -861,6 +862,8 @@ void awtk_thread(void *data)
// static float cell_value = 0; // static float cell_value = 0;
// static uint8_t cell_count = 0; // static uint8_t cell_count = 0;
// Moto_speed_timer();
while(1) { while(1) {
#ifdef TASK_STATUS_MONITOR #ifdef TASK_STATUS_MONITOR
@ -881,6 +884,11 @@ void awtk_thread(void *data)
idletick = xTaskGetTickCount(); idletick = xTaskGetTickCount();
} }
#endif #endif
// static uint32_t idletick_500ms = 0;
// if (xTaskGetTickCount() - idletick_500ms > 500) {
// speed_convert_mile_calculation();
// idletick_500ms = xTaskGetTickCount();
// }
vTaskDelay(pdMS_TO_TICKS(10)); /*Just to let the system breath*/ vTaskDelay(pdMS_TO_TICKS(10)); /*Just to let the system breath*/
} }
} }

View File

@ -29,7 +29,8 @@ void grade_key(void){
#ifdef UI_VIEW_QUICKLY_ARRANGE #ifdef UI_VIEW_QUICKLY_ARRANGE
static uint8_t Gear_value = 7; static uint8_t Gear_value = 7;
#else #else
uint8_t Gear_value = 7; // uint8_t Gear_value = 7;
static uint8_t Gear_value = 7;
#endif #endif
static uint8_t cnt =0; static uint8_t cnt =0;
//数据顺序 N 1 2 3 4 5 6 ABS TCS FAN ENG YG R L RMT //数据顺序 N 1 2 3 4 5 6 ABS TCS FAN ENG YG R L RMT
@ -137,4 +138,102 @@ void Moto_gpio_timer(void) {
} }
} }
TimerHandle_t xspeedTimer;
static uint8_t speed_count = 0;
static uint32_t current_timer = 0;
static uint32_t past_timer = 0;
uint8_t time_diff=0;
uint16_t speed_diff=0;
extern uint16_t can_speed;
extern uint16_t diff_can_speed;
extern uint32_t mile_total;
// void can_loss_data_restore(void){
// past_timer = 0;
// }
// void past_timer_refresh(void){
// if(!past_timer){
// past_timer = current_timer;
// return;
// }
// printf("time_diff = %d.\r\n",time_diff);
// time_diff = current_timer-past_timer;
// if(time_diff==1){//相差为1未漏帧
// past_timer = current_timer;
// return;
// }else{
// time_diff-1;
// }
// speed_diff = (uint8_t)((can_speed+diff_can_speed)/2);
// mile_total+= (speed_diff*time_diff);
// past_timer = current_timer;
// }
// extern uint8_t abs_speed_flag;
// volatile uint8_t cnt = 0;
void vTimerSpeedback(TimerHandle_t xTimer) {
// printf("cnt=%d,mile_total=%d,can_speed=%d.\r\n",cnt,mile_total,can_speed);
// if(cnt>=2){
// can_speed =0;
// }else{
// cnt++;
// }
// if(abs_speed_flag){
// mile_total +=can_speed;
// }
// speed_count++;
// if(speed_count>=10){
speed_convert_mile_calculation();
// speed_count = 0;
// }
}
// volatile uint32_t ulHighFrequencyTimerCounts3 = 0;
// static void prvRunTimer_Handler( void *para )
// {
// vTimerClrInt((uint32_t)para);
// // ulHighFrequencyTimerCounts3++;
// // printf("=%d.\r\n",ulHighFrequencyTimerCounts3);
// // printf("cnt=%d,mile_total=%d,can_speed=%d.\r\n",cnt,mile_total,can_speed);
// if(cnt>=2){
// can_speed =0;
// }else{
// cnt++;
// }
// // if(abs_speed_flag){
// mile_total +=can_speed;
// // }
// speed_count++;
// if(speed_count>=10){
// speed_convert_mile_calculation();
// speed_count = 0;
// }
// }
void Moto_speed_timer(void){
xspeedTimer = xTimerCreate("MyspeeSTimer", // 定时器名称
pdMS_TO_TICKS(100), // 定时器周期1000毫秒
pdTRUE, // 自动重载定时器
(void *)0, // 定时器 ID
vTimerSpeedback); // 回调函数
// 启动定时器
if (xTimerStart(xspeedTimer, 0) != pdPASS) {
// 启动定时器失败的处理
printf("xTimer error!!!!!!!!!!!!!!!!!.\r\n");
}
// vTimerInit(TIMER_ID3, 1, 1, pdMS_TO_TICKS(100));
// request_irq(TIMER2_IRQn, 1, prvRunTimer_Handler, (void*)TIMER_ID3);
// vTimerEnable(TIMER_ID3);
}

View File

@ -11,6 +11,8 @@
#include "moto_adc.h" #include "moto_adc.h"
extern int mile_total;
extern uint8_t mile_kilometer;
extern double total_mile; extern double total_mile;
extern uint32_t flash_trip_mile; extern uint32_t flash_trip_mile;
extern uint32_t flash_total_mile; extern uint32_t flash_total_mile;
@ -267,6 +269,8 @@ void device_data_analysis(uint8_t *buf){
flash_flag=0; flash_flag=0;
data_error_flag = 0; data_error_flag = 0;
flash_flag=0; flash_flag=0;
mile_total = 0;
mile_kilometer = 0;
send_flag = 0; send_flag = 0;
} }
int test_light = 0; int test_light = 0;

View File

@ -169,9 +169,7 @@ uint8_t Get_sys_display_theme(void)
void Set_sys_display_theme(uint8_t value)//光感控制主题 void Set_sys_display_theme(uint8_t value)//光感控制主题
{ {
if(value == NULL ){ if(value != custom_data.display_theme){
custom_data.display_theme = 0;
}else if(value != custom_data.display_theme){
custom_data.display_theme = value; custom_data.display_theme = value;
} }
} }
@ -201,9 +199,7 @@ uint8_t Get_sys_bt_connect_state(void)
void Set_sys_bt_connect_state(uint8_t value) void Set_sys_bt_connect_state(uint8_t value)
{ {
// printf("Get_sys_bt_connect_state = %d .\r\n",value); // printf("Get_sys_bt_connect_state = %d .\r\n",value);
if(value == NULL ){ if(value != custom_data.bt_connect_state){
custom_data.bt_connect_state = 0;
}else if(value != custom_data.bt_connect_state){
custom_data.bt_connect_state = value; custom_data.bt_connect_state = value;
} }
//gpio_direction_output(46,1); //gpio_direction_output(46,1);
@ -217,9 +213,7 @@ uint8_t Get_sys_trip_unit(void)
} }
void Set_sys_trip_unit(uint8_t value) void Set_sys_trip_unit(uint8_t value)
{ {
if(value == NULL ){ if(value != custom_data.user_data.trip_unit){
custom_data.user_data.trip_unit = 0;
}else if(value != custom_data.user_data.trip_unit){
custom_data.user_data.trip_unit = value; custom_data.user_data.trip_unit = value;
} }
} }
@ -230,9 +224,7 @@ uint8_t Get_sys_wireless(void)
} }
void Set_sys_wireless(uint8_t value) void Set_sys_wireless(uint8_t value)
{ {
if(value == NULL ){ if(value != custom_data.wireless){
custom_data.wireless = 0;
}else if(value != custom_data.wireless){
custom_data.wireless = value; custom_data.wireless = value;
} }
} }
@ -257,10 +249,7 @@ uint16_t Get_sys_velocity(void)//速度
} }
void Set_sys_velocity(uint16_t value) void Set_sys_velocity(uint16_t value)
{ {
if(value == NULL ){ if(value != custom_data.velocity){
custom_data.velocity = 0;
custom_data.display_velocity = 0;
}else if(value != custom_data.velocity){
custom_data.velocity = value; custom_data.velocity = value;
custom_data.display_velocity = value; custom_data.display_velocity = value;
} }
@ -272,9 +261,7 @@ uint16_t Get_sys_display_velocity(void)//速度
} }
void Set_sys_display_velocity(uint16_t value) void Set_sys_display_velocity(uint16_t value)
{ {
if(value == NULL ){ if(value != custom_data.display_velocity){
custom_data.display_velocity = 0;
}else if(value != custom_data.display_velocity){
custom_data.display_velocity = value; custom_data.display_velocity = value;
} }
} }
@ -298,11 +285,9 @@ uint16_t Get_sys_veer_velocity(void)//转速
} }
void Set_sys_veer_velocity(uint16_t value) void Set_sys_veer_velocity(uint16_t value)
{ {
// if(value == NULL ){ if(value != custom_data.veer_velocity){
// custom_data.veer_velocity = 0;
// }else if(value != custom_data.veer_velocity){
custom_data.veer_velocity = value; custom_data.veer_velocity = value;
// } }
} }
uint16_t Get_sys_temp(void)//温度 uint16_t Get_sys_temp(void)//温度
@ -333,19 +318,8 @@ uint16_t Get_sys_can_temp(void)//温度
} }
void Set_sys_can_temp(uint16_t value) void Set_sys_can_temp(uint16_t value)
{ {
if(value == NULL ){ if(value != custom_data.eng_temp){
custom_data.eng_temp = 0;
}else if(value != custom_data.eng_temp){
/*if(value < custom_data.temp){
if(custom_data.temp - value > THRESHOLD)
custom_data.temp = value;
}else{
if( (value - custom_data.temp) > THRESHOLD)
custom_data.temp = value;
}*/
custom_data.eng_temp = value; custom_data.eng_temp = value;
//custom_data.temp = value;
// DEBUG_PRINT("temp=%d ,",value);
} }
} }

View File

@ -17,7 +17,7 @@
#define MOTO_ICMX_GB518_A270S_KP 4 #define MOTO_ICMX_GB518_A270S_KP 4
#define MOTO_ICMX_GB518_A272M 5 #define MOTO_ICMX_GB518_A272M 5
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272M #define MOTO_WARE_HOSE MOTO_ICMX_GB518_A270S
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270M) #if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270M)
#define SOFT_WARE_HOST 1 #define SOFT_WARE_HOST 1
@ -38,7 +38,7 @@
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S) #elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270S)
#define SOFT_WARE_HOST 0 #define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 4 #define SOFT_WARE_ORDER 10
#define HARD_WARE "MXC-A27-M V4.5" #define HARD_WARE "MXC-A27-M V4.5"
#define KEY_EXCHANGE 1 #define KEY_EXCHANGE 1
#define MCU_INFO_LABEL "A270S" #define MCU_INFO_LABEL "A270S"

View File

@ -15,6 +15,17 @@
double total_mile = 0; double total_mile = 0;
double test_data = 0; double test_data = 0;
uint32_t test_total = 0;
uint32_t mile_total = 0;
uint8_t mile_kilometer = 0;
static uint16_t veer_velocity = 0;
static uint16_t eng_temp = 0;
volatile double can_speed = 0;
volatile double avg_can_speed = 0;//保存上一帧的速度值
volatile double recan_speed = 0;//保存上一帧的速度值
uint16_t diff_can_speed = 0;
static uint16_t display_can_speed = 0;
static uint16_t display_speed = 0;
uint32_t flash_trip_mile = 0; uint32_t flash_trip_mile = 0;
uint32_t flash_total_mile = 0; uint32_t flash_total_mile = 0;
@ -119,9 +130,6 @@ void Unified_brightness_processing(uint8_t data,uint8_t type){
switch(type){ switch(type){
case 0: case 0:
duty_ns = LIGHTVALUEDATAONE(data); duty_ns = LIGHTVALUEDATAONE(data);
/*if(Get_sys_veer_velocity() <1000){
duty_ns = duty_ns/LOW_BRIGHTNESS_MODE;
}*/
Set_sys_light(LIGHTCALUEDATA(data)); Set_sys_light(LIGHTCALUEDATA(data));
break; break;
case 1: case 1:
@ -245,7 +253,7 @@ ret_t on_key_test_theme(void* ctx, event_t* e){
} }
#endif #endif
void defect_code_event_handing(int *buf){ void defect_code_event_handing(uint8_t *buf){
uint32_t sum,sum1,sum2; uint32_t sum,sum1,sum2;
uint8_t data; uint8_t data;
uint8_t result = 0; uint8_t result = 0;
@ -278,6 +286,8 @@ void defect_code_event_handing(int *buf){
// 假设时间间隔为10毫秒0.01秒) // 假设时间间隔为10毫秒0.01秒)
#define TIME_INTERVAL 0.01 #define TIME_INTERVAL 0.01
// 假设时间间隔为500毫秒0.01秒)
#define TIME_INTERVAL2 0.5
uint8_t save_total_mile = 0; uint8_t save_total_mile = 0;
uint32_t total_flag = 0; uint32_t total_flag = 0;
@ -297,200 +307,344 @@ double calculateTotalDistance(uint8_t count)
return distance; return distance;
} }
// 计算总计里程
double calculateTotalDistance2(uint8_t count)
{
// 将速度数据转换为米每秒的速度值
double speed_mps = count * 1000.0 / 3600.0;
void ASB_speed_event_handing(int *buf){ // 计算每次速度更新所行驶的距离
#ifdef UI_VIEW_QUICKLY_ARRANGE double distance = speed_mps * TIME_INTERVAL2;
// 返回每次行驶的距离,可以在主程序中累加得到总计里程
return distance;
}
// extern volatile uint8_t cnt;
static uint8_t livecounter=0;
static int8_t relivecounter=-1;
static uint8_t diff_livecounter = 0;
void ASB_speed_event_handing(uint8_t *buf){
// cnt=0;
// printf("=%d.\r\n",cnt);
uint8_t data = 0; uint8_t data = 0;
uint8_t speed_data = 0; uint8_t speed_data = 0;
uint8_t speed_flag = 0; uint8_t speed_flag = 0;
uint16_t speed = 0; uint16_t speed = 0;
uint32_t trip = 0;
uint32_t total = 0;
uint16_t display_speed = 0;
speed = *(buf++)&0xFF; speed = *(buf++);
data = *(buf++)&0xFF; data = *(buf++);
speed_data = getBit5Value(data,3); speed_data = getBit5Value(data,3);
speed_flag = getBitValue(data,2); speed_flag = getBitValue(data,2);
// printf("frontflag=%d.\r\n",speed_flag); // printf("frontflag=%d.\r\n",speed_flag);
//前轮速度有效 //前轮速度有效
// if(!speed_flag){ if(!speed_flag){
if(0){
// printf("front>speed_data=%05X,speed=%08X,",speed_data,speed);
speed = speed_data | speed<<5; speed = speed_data | speed<<5;
// printf("rearspeed=%X.\r\n",speed); can_speed = (speed * 0.05625);//偏移系数
speed = (int)(speed * 0.05625);//偏移系数 mile_total += (uint32_t)can_speed;
display_speed = speed;//UI显示上浮8% (buf++);
// printf("display_speed=%X>%d,",speed,speed); (buf++);
speed = (int)(speed * 0.92); (buf++);
// printf("mile_speed=%X>%d.\r\n",speed,speed); (buf++);
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{ }else{
speed = getBit2Value(data,0); speed = getBit2Value(data,0);
// printf("rear>speed=%X,",speed); data = *(buf++);
data = *(buf++)&0xFF;
// printf("data=%08X,",data);
speed = data | speed<<8; speed = data | speed<<8;
// printf("data2=%X,",speed);
data = *(buf++)&0xFF; data = *(buf++);
speed_data = getBit3Value(data,5); speed_data = getBit3Value(data,5);
// printf("data3=%X.\r\n",speed_data);
speed_flag = getBitValue(data,4); speed_flag = getBitValue(data,4);
// printf("rearflag=%d.\r\n",speed_flag); if(!speed_flag){
// if(!speed_flag){
if(1){
speed = speed_data | speed<<3; speed = speed_data | speed<<3;
// printf("rearspeed=%X.\r\n",speed); can_speed = (speed * 0.05625);//偏移系数
mile_total +=(uint32_t)can_speed;
speed = (int)(speed * 0.05625);//偏移系数 }
(buf++);
display_speed = speed * 1.08;//UI显示上浮8% (buf++);
// printf("display_speed=%X>%d,",speed,speed); }
speed = (int)(speed); data = *(buf++);
// printf("mile_speed=%X>%d.\r\n",speed,speed); livecounter = getBit4Value(data,0);
avg_can_speed = (uint16_t)((recan_speed+can_speed)/2);
total_mile += calculateTotalDistance(speed); if(recan_speed){
if(display_speed>=255) if(livecounter!=relivecounter){
display_speed = 255; if(livecounter>relivecounter){//最小为1
Set_sys_velocity(display_speed); diff_livecounter = (livecounter-relivecounter-1);
trip = flash_trip_mile + total_mile; while(diff_livecounter){
total = flash_total_mile + total_mile; diff_livecounter--;
mile_total +=avg_can_speed;
if((int)(total_mile)>=1 && (((int)total_mile)%1000 ==0) && total != total_flag){ }
save_total_mile = 1; }else{
total_flag = total; diff_livecounter = relivecounter-livecounter;
if(diff_livecounter!=15){//若为15则正常 F->0过度
mile_total +=((avg_can_speed)*(15-diff_livecounter));
}
} }
}else{
Set_sys_trip_mileage(trip); mile_total +=(avg_can_speed*14);
Set_sys_total_mileage(total);
} }
} }
relivecounter = livecounter;
recan_speed = can_speed;//保存本次帧的值
#endif
} }
// 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;
void ASB_141_speed_event_handing(int *buf){ // speed = *(buf++)&0xFF;
#ifdef UI_VIEW_QUICKLY_ARRANGE // 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){
uint8_t data = 0; uint8_t data = 0;
uint8_t speed_data = 0; uint8_t speed_data = 0;
uint8_t speed_flag = 0; uint8_t speed_flag = 0;
uint16_t speed = 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 * 0.05625);//偏移系数
mile_total += (uint32_t)can_speed;
(buf++);
(buf++);
(buf++);
(buf++);
}else{
(buf++);
(buf++);
speed = *(buf++);
data = *(buf++);
speed_data = getBit5Value(data,3);
speed_flag = getBitValue(data,2);
if(!speed_flag){
speed = speed_data | speed<<5;
can_speed = (speed * 0.05625);//偏移系数
mile_total += (uint32_t)can_speed;
}
}
data = *(buf++);
livecounter = getBit4Value(data,0);
avg_can_speed = (uint16_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_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 //一万公里
void speed_convert_mile_calculation(void){
uint32_t trip = 0; uint32_t trip = 0;
uint32_t total = 0; uint32_t total = 0;
uint16_t display_speed = 0; // printf("%d.\r\n",mile_total);
*(buf++)&0xFF; if(mile_total>KILOMETER){//一万公里
*(buf++)&0xFF; mile_kilometer++;
*(buf++)&0xFF; mile_total-=KILOMETER;
*(buf++)&0xFF; flash_total_mile+=KILOMETER;
flash_trip_mile+=KILOMETER;
}
speed = *(buf++)&0xFF; total = flash_total_mile + (uint32_t)(mile_total/360);
data = *(buf++)&0xFF; trip = flash_trip_mile + (uint32_t)(mile_total/360);
speed_data = getBit5Value(data,3); Set_sys_trip_mileage(trip);
speed = speed_data | speed<<5; Set_sys_total_mileage(total);
speed = (int)(speed * 0.05625);//偏移系数 if(speed_flag){
display_speed = (uint32_t)(display_can_speed*1.08);//UI显示上浮8%
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) if(display_speed>=255)
display_speed = 255; display_speed = 255;
Set_sys_velocity(display_speed); Set_sys_velocity(display_speed);
trip = flash_trip_mile + total_mile; veer_velocity *= 0.25;
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 speed_event_handing(int *buf){
uint16_t veer_velocity = 0;
uint16_t eng_temp = 0;
// uint8_t eng_flag = 0;
veer_velocity = *(buf++) &0xFF;
veer_velocity = (*(buf++)&0xFF) | veer_velocity<<8;
veer_velocity *= 0.25;
#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;
uint16_t display_speed = 0;
speed = *(buf++)&0xFF;
display_speed = speed;//UI显示上浮8%
speed = (int)(speed * 0.92);
#else
*(buf++)&0xFF;
#endif
*(buf++);
eng_temp = *(buf++) &0xFF;
eng_temp = (*(buf++)&0xFF) | eng_temp<<8;
// *(buf++);
#if SPEED_DATA_CAN
if(veer_velocity>16384) if(veer_velocity>16384)
veer_velocity = 16384; veer_velocity = 16384;
Set_sys_veer_velocity(veer_velocity); Set_sys_veer_velocity(veer_velocity);
#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;
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
Set_sys_can_temp(eng_temp); Set_sys_can_temp(eng_temp);
#endif }
} }
void tcs_control_event_handing(int *buf){ 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)
// can_speed = *(buf++);
// mile_total +=can_speed;
display_can_speed = *(buf++);
#else
*(buf++);
#endif
*(buf++);
eng_temp = *(buf++);
eng_temp = *(buf++) | eng_temp<<8;
}
void tcs_control_event_handing(uint8_t *buf){
/*uint8_t data = 0 ; /*uint8_t data = 0 ;
uint8_t tcs_flag = 0; uint8_t tcs_flag = 0;
@ -504,7 +658,7 @@ void tcs_control_event_handing(int *buf){
*/ */
} }
void mil_control_event_handing(int *buf){ void mil_control_event_handing(uint8_t *buf){
uint8_t data = 0 ; uint8_t data = 0 ;
uint8_t mil_flag = 0; uint8_t mil_flag = 0;
@ -521,7 +675,7 @@ void mil_control_event_handing(int *buf){
} }
void kp_control_event_handing(int *buf){ void kp_control_event_handing(uint8_t *buf){
uint8_t data = 0; uint8_t data = 0;
*(buf++); *(buf++);

View File

@ -37,10 +37,10 @@ void return_demo(void);
void new_refreshes(widget_t* child); void new_refreshes(widget_t* child);
void list_win_init(widget_t* child); void list_win_init(widget_t* child);
void refresh_animate(widget_t* child); void refresh_animate(widget_t* child);
void defect_code_event_handing(int *buf); void defect_code_event_handing(uint8_t *buf);
// void speed_event_handing(int *buf); // void speed_event_handing(uint8_t *buf);
void tcs_control_event_handing(int *buf); void tcs_control_event_handing(uint8_t *buf);
void mil_control_event_handing(int *buf); void mil_control_event_handing(uint8_t *buf);
ret_t long_key_event_handling(uint8_t key); ret_t long_key_event_handling(uint8_t key);
@ -76,7 +76,7 @@ void list_theme_button1_init(void);
void list_theme_button2_init(void); void list_theme_button2_init(void);
void list_theme_button4_init(void); void list_theme_button4_init(void);
void speed_event_handing(int *buf); void speed_event_handing(uint8_t *buf);
void ASB_141_speed_event_handing(int *buf); void ASB_141_speed_event_handing(uint8_t *buf);
#endif #endif

View File

@ -29,6 +29,9 @@ extern uint8_t power_on_flag;
static uint32_t idletick = 0; static uint32_t idletick = 0;
static uint32_t refresh500ms_idletick = 0; static uint32_t refresh500ms_idletick = 0;
uint8_t refresh500ms_flag = 0; uint8_t refresh500ms_flag = 0;
extern uint32_t mile_total;
extern uint32_t test_total;
/** /**
* 注册自定义控件 * 注册自定义控件
@ -361,6 +364,11 @@ static ret_t on_timer(const idle_info_t* idle){
speed --; speed --;
Set_sys_velocity(speed); Set_sys_velocity(speed);
} }
// speed_buffer[speed_count]=speed;
// speed_count++;
// if(speed_count>=10){//满足存储大小 计算均值
// speed_count=0;
// }
} }
if(mile_flag){ if(mile_flag){
@ -496,6 +504,8 @@ static ret_t on_timer(const idle_info_t* idle){
dh = 0; dh = 0;
} }
printf("test_total=%d,mile_total=%d.\r\n",test_total,mile_total);
idletick = xTaskGetTickCount(); idletick = xTaskGetTickCount();
} }
if(xTaskGetTickCount() - refresh500ms_idletick > 500){ if(xTaskGetTickCount() - refresh500ms_idletick > 500){

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -137,11 +137,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus> <RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows> <MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay> <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>780900008B0040E1000001000000298100000C000000088000000100000021DE000001000000138600002C0100005984000002000000198000000100000026840000030000005786000001000000028600000100000001DC000003000000108600000504000026810000010000005684000001000000158100000300000000DA000001000000048100000500000078840000030000002CE1000002000000018100000E00000029E100000100000007E1000002000000239200000100000016B0000001000000AF060000040000003184000001000000458100000100000004E10000020000000F8100000200000020810000010000005F86000007000000ED8000000100000002B00000010000000090000005000000D884000002000000878000000A0000000C810000970100003F8100000100000001E10000070000001D8100000900000026DE0000020000000D800000020000001D92000001000000EA80000001000000A68000000100000009810000010000000486000001000000D18500000200000003DC00000400000000DC00000100000017810000050000002881000001000000568600000F000000018600000100000003840000050000001A8F00000100000007B0000002000000118400000100000000840000030000002BE100000B000000808C0000010000003384000001000000478100000100000055840000180000007784000002000000148100000600000000810000010000000C860000030000000E84000001000000EF800000010000008980000001000000858400000100000028E1000001000000228100000100000083860000020000001F810000580100000E810000010000001A8600000300000003E100000A0000005E86000016000000EC8000000100000025E100002C010000978000000100000028DE0000030000000986000001000000E9800000020000008E860000010000000B8100000E000000A58000000100000000E100000200000002DC00000100000014860000E0000000058400000A000000588600000100000069860000010000002B8000000100000027840000010000000386000001000000D18400000100000011860000C400000005810000200000005586000002000000278100000400000002840000030000000086000001000000F4800000010000002A8F000002000000198F000003000000168100000100000046810000EA000000108400000D0000002AE100000100000017B00000010000000BDE00000100000074860000010000000281000001000000218100000600000003B0000001000000EE80000001000000608600004B000000438100000100000044D50000010000008880000001000000A486000001000000518400000100000024E10000010000000D81000010000000088600000200000002E100000300000035E10000060000001E810000030000005D86000007000000EB80000001000000A186000002000000D684000001000000E8800000010000000A8100000200000007840000010000000586000001000000</CommandsUsage> <CommandsUsage>DF0A00008C0001DC0000030000000286000001000000578600000100000026840000030000001980000001000000598400000200000013860000AB01000021DE0000010000000880000001000000298100000C00000040E10000010000002CE10000020000007884000003000000048100000500000000DA000001000000158100000300000056840000010000002681000001000000108600007904000045810000010000003184000001000000AF0600000400000016B0000001000000239200000100000007E100000200000029E1000001000000018100000E000000878000000A000000D884000002000000009000000500000002B0000001000000ED800000010000005F8600000700000020810000010000000F8100000200000004E1000002000000A680000001000000EA800000010000001D920000010000000D8000000200000026DE0000020000001D8100000900000001E10000070000003F810000010000000C8100009701000003DC000004000000D185000002000000048600000100000009810000010000001A8F0000010000000384000005000000018600000100000056860000100000002881000002000000178100000500000000DC00000100000014810000060000007784000002000000558400001800000047810000010000003384000001000000808C0000010000002BE100000B0000000084000003000000118400000100000007B00000020000008386000002000000228100000100000028E100000100000085840000010000008980000001000000EF800000010000000E840000010000000C860000030000000081000001000000ECFFFFFF01000000098600000100000028DE000003000000978000000100000025E100002C010000EC800000010000005E8600001900000003E100000A0000001A860000030000000E810000010000001F8100008C01000000E1000002000000A5800000010000000B8100000E0000008E86000001000000E980000002000000D184000001000000038600000100000027840000010000002B8000000100000069860000010000005886000001000000058400000A00000014860000F700000002DC0000010000001681000001000000198F0000030000002A8F000002000000F4800000010000000086000001000000028400000300000027810000040000005586000002000000058100002000000011860000D6000000028100000100000074860000010000000BDE00000100000017B00000010000002AE1000001000000108400000D00000046810000F70000005184000001000000A486000001000000888000000100000044D50000010000004381000001000000608600004B000000EE8000000100000003B00000010000002181000006000000D684000001000000A186000002000000EB800000010000005D8600000B0000001E8100000300000035E100000600000002E100000300000008860000020000000D8100001000000024E1000001000000058600000100000007840000010000000A81000002000000E880000001000000</CommandsUsage>
</MFCToolBarParameters> </MFCToolBarParameters>
<CommandManager> <CommandManager>
<CommandsWithoutImages>4A0008800000098000000A8000000B8000000C800000158000000A810000FFFFFFFF01E8000012810000D2840000D1850000D78600000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E92000000DC000001DC000002DC000003DC0000748600007784000007840000808C000044D50000838600005886000004DC000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B00000248100002AE10000008200001C8200000182000067860000008800000188000002880000038800000488000005880000</CommandsWithoutImages> <CommandsWithoutImages>4C0008800000098000000A8000000B8000000C800000158000000A810000FFFFFFFF01E8000012810000D2840000D1850000D78600000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E92000000DC000001DC000002DC000003DC0000748600007784000007840000808C000044D50000838600005886000004DC000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B00000248100002AE10000008200001C82000001820000678600000088000001880000028800000388000004880000058800004881000001000000</CommandsWithoutImages>
<MenuUserImages>5E00138600002E000000048400007B00000057860000190000000286000010000000048100004B000000108600002C00000076860000380000001581000054000000268100005C0000002CE10000720000008486000039000000318400008200000023920000000000000D8600001600000007E100006A000000D98600000D0000000F81000052000000208100005A00000004E10000680000005F860000630000000A8600002A0000001D920000120000000C8100004F000000008D00001D0000000D8000004600000001E100006500000023E100006C000000098100004D000000068400007D00000019820000440000005686000032000000038400007A0000009A8600001700000017810000560000004A810000760000001682000042000000018600000F000000008400007700000014810000530000002BE1000071000000449200002100000030840000810000000E8400007F0000000C860000150000000081000048000000D88600000C0000001F9200001E0000005E860000340000000E810000510000001F810000590000001A8600003100000003E100006700000025E100006E0000002F8200004500000009860000290000002D920000200000000B8100004E0000008E8600003A00000000E100006400000022E100006B000000148600002F000000058400007C000000D18400001C000000698600003700000041E100007400000018820000430000000386000011000000058100004C000000118600002D0000000284000079000000558600000700000016810000550000004981000075000000008600000E0000004681000061000000328400008300000010840000800000000E86000018000000DA860000050000006086000036000000518400008500000005E10000690000000B8600002B00000002E100006600000035E10000730000005D860000330000000D810000500000000A8400007E000000A18600003B000000C38600000300000008860000280000002C9200001F000000C08600000B0000001686000030000000</MenuUserImages> <MenuUserImages>5E0002860000100000005786000019000000048400007B000000138600002E0000002CE1000072000000268100005C00000015810000540000007686000038000000108600002C000000048100004B000000D98600000D00000007E100006A0000000D860000160000002392000000000000318400008200000084860000390000000A8600002A0000005F8600006300000004E1000068000000208100005A0000000F8100005200000023E100006C00000001E10000650000000D80000046000000008D00001D0000000C8100004F0000001D920000120000001982000044000000068400007D000000098100004D000000018600000F00000016820000420000004A8100007600000017810000560000009A86000017000000038400007A00000056860000320000002BE100007100000014810000530000000084000077000000D88600000C00000000810000480000000C860000150000000E8400007F0000003084000081000000449200002100000009860000290000002F8200004500000025E100006E00000003E10000670000001A860000310000001F810000590000000E810000510000005E860000340000001F9200001E00000022E100006B00000000E10000640000008E8600003A0000000B8100004E0000002D920000200000000386000011000000188200004300000041E10000740000006986000037000000D18400001C000000058400007C000000148600002F000000008600000E0000004981000075000000168100005500000055860000070000000284000079000000118600002D000000058100004C000000DA860000050000000E860000180000001084000080000000328400008300000046810000610000000B8600002B00000005E1000069000000518400008500000060860000360000000886000028000000C386000003000000A18600003B0000000A8400007E0000000D810000500000005D8600003300000035E100007300000002E10000660000001686000030000000C08600000B0000002C9200001F000000</MenuUserImages>
</CommandManager> </CommandManager>
<Pane-59393> <Pane-59393>
<ID>0</ID> <ID>0</ID>
@ -863,7 +863,7 @@
</BasePane-34048> </BasePane-34048>
<MFCToolBar-34049> <MFCToolBar-34049>
<Name>Debug</Name> <Name>Debug</Name>
<Buttons>00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000040032000000FFFEFF000000000000000000000000000100000001000000018013860000000004002E000000FFFEFF00000000000000000000000000010000000100000001805E8600000000040034000000FFFEFF0000000000000000000000000001000000010000000180608600000000040036000000FFFEFF00000000000000000000000000010000000100000001805D8600000000040033000000FFFEFF000000000000000000000000000100000001000000018010860000000004002C000000FFFEFF000000000000000000000000000100000001000000018011860000000000002D000000FFFEFF000000000000000000000000000100000001000000018014860000000004002F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0544006500620075006700B9000000</Buttons> <Buttons>00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000040032000000FFFEFF000000000000000000000000000100000001000000018013860000000004002E000000FFFEFF00000000000000000000000000010000000100000001805E8600000000040034000000FFFEFF0000000000000000000000000001000000010000000180608600000000040036000000FFFEFF00000000000000000000000000010000000100000001805D8600000000040033000000FFFEFF000000000000000000000000000100000001000000018010860000000004002C000000FFFEFF000000000000000000000000000100000001000000018011860000000000002D000000FFFEFF000000000000000000000000000100000001000000018014860000000004002F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF05440065006200750067005D000000</Buttons>
</MFCToolBar-34049> </MFCToolBar-34049>
<Pane-34049> <Pane-34049>
<ID>34049</ID> <ID>34049</ID>
@ -872,7 +872,7 @@
<RecentFrameAlignment>8192</RecentFrameAlignment> <RecentFrameAlignment>8192</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex> <RecentRowIndex>0</RecentRowIndex>
<IsFloating>0</IsFloating> <IsFloating>0</IsFloating>
<MRUWidth>185</MRUWidth> <MRUWidth>93</MRUWidth>
<PinState>0</PinState> <PinState>0</PinState>
</Pane-34049> </Pane-34049>
<BasePane-34049> <BasePane-34049>
@ -880,7 +880,7 @@
</BasePane-34049> </BasePane-34049>
<MFCToolBar-34050> <MFCToolBar-34050>
<Name>Main</Name> <Name>Main</Name>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000064000000FFFEFF000000000000000000000000000100000001000000018001E100000000000065000000FFFEFF000000000000000000000000000100000001000000018003E100000000000067000000FFFEFF0000000000000000000000000001000000010000000180008100000000000048000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006C000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006B000000FFFEFF000000000000000000000000000100000001000000018025E10000000000006E000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040071000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040072000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005B000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006D000000FFFEFF000000000000000000000000000100000001000000018028E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018029E100000000000070000000FFFEFF000000000000000000000000000100000001000000018002810000000000004A000000FFFEFF000000000000000000000000000100000001000000018029810000000000005F000000FFFEFF000000000000000000000000000100000001000000018027810000000000005D000000FFFEFF000000000000000000000000000100000001000000018028810000000000005E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040057000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040058000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000004E000000FFFEFF00000000000000000000000000010000000100000001800C810000000000004F000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000063000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F8100000000000059000000FFFEFF000000000000000000000000000100000001000000018020810000000000005A000000FFFEFF0000000000000000000000000001000000010000000180468100000000020061000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons> <Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000063000000FFFEFF000000000000000000000000000100000001000000018001E100000000000064000000FFFEFF000000000000000000000000000100000001000000018003E100000000000066000000FFFEFF0000000000000000000000000001000000010000000180008100000000000047000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000069000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006B000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006A000000FFFEFF000000000000000000000000000100000001000000018025E10000000000006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040070000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005A000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006C000000FFFEFF000000000000000000000000000100000001000000018028E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018029E10000000000006F000000FFFEFF0000000000000000000000000001000000010000000180028100000000000049000000FFFEFF000000000000000000000000000100000001000000018029810000000000005E000000FFFEFF000000000000000000000000000100000001000000018027810000000000005C000000FFFEFF000000000000000000000000000100000001000000018028810000000000005D000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040056000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040057000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000004D000000FFFEFF00000000000000000000000000010000000100000001800C810000000000004E000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000062000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F8100000000000058000000FFFEFF0000000000000000000000000001000000010000000180208100000000000059000000FFFEFF0000000000000000000000000001000000010000000180468100000000020060000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>
</MFCToolBar-34050> </MFCToolBar-34050>
<Pane-34050> <Pane-34050>
<ID>34050</ID> <ID>34050</ID>

View File

@ -19,7 +19,7 @@
<LeaveTargetRunning>_ 0</LeaveTargetRunning> <LeaveTargetRunning>_ 0</LeaveTargetRunning>
</JLinkDriver> </JLinkDriver>
<DebugChecksum> <DebugChecksum>
<Checksum>2214748751</Checksum> <Checksum>1441669355</Checksum>
</DebugChecksum> </DebugChecksum>
<Exceptions> <Exceptions>
<StopOnUncaught>_ 0</StopOnUncaught> <StopOnUncaught>_ 0</StopOnUncaught>
@ -87,9 +87,10 @@
<A8>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\VG_DRIVER_FREERTOS_10_4_3\software\VIVANTE_GAL_OpenVG_Src_drv\hal\os\freertos\user\XM_Os.c" ""</A8> <A8>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\VG_DRIVER_FREERTOS_10_4_3\software\VIVANTE_GAL_OpenVG_Src_drv\hal\os\freertos\user\XM_Os.c" ""</A8>
<A9>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\VG_DRIVER_FREERTOS_10_4_3\software\VIVANTE_GAL_OpenVG_Src_drv\hal\user\gcBuffer.c" ""</A9> <A9>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\VG_DRIVER_FREERTOS_10_4_3\software\VIVANTE_GAL_OpenVG_Src_drv\hal\user\gcBuffer.c" ""</A9>
<A10>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\VG_DRIVER_FREERTOS_10_4_3\software\VIVANTE_GAL_OpenVG_Src_drv\hal\user\gcHeap.c" ""</A10> <A10>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\VG_DRIVER_FREERTOS_10_4_3\software\VIVANTE_GAL_OpenVG_Src_drv\hal\user\gcHeap.c" ""</A10>
<A11>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\nanovg\fontstash.h" ""</A11> <A11>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\VG_DRIVER_FREERTOS_10_4_3\software\VIVANTE_GAL_OpenVG_Src_drv\hal\user\gcVG.c" ""</A11>
<A12>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\nanovg\nanovg.c" ""</A12> <A12>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\nanovg\fontstash.h" ""</A12>
<Count>13</Count> <A13>_ "E:\proj\HMI\SW\HMI_AWTK_SDK\nanovg\nanovg.c" ""</A13>
<Count>14</Count>
<SuppressDialog>1</SuppressDialog> <SuppressDialog>1</SuppressDialog>
</Aliases> </Aliases>
</settings> </settings>

File diff suppressed because one or more lines are too long

View File

@ -263,9 +263,9 @@
#ifdef WIFI_SUPPORT #ifdef WIFI_SUPPORT
#define CARLINK_EY 0 #define CARLINK_EY 0
#define CARLINK_EC 1 #define CARLINK_EC 0
#define CARLINK_CP 0 #define CARLINK_CP 1
#define CARLINK_AA 0 #define CARLINK_AA 1
#if !DEVICE_MXC_A27 #if !DEVICE_MXC_A27
#define WIFI_RESET_IO 12 #define WIFI_RESET_IO 12
@ -387,7 +387,7 @@
#define ANIMATION_NONE 0 #define ANIMATION_NONE 0
#define ANIMATION_USE_SMALL_MEM 1 #define ANIMATION_USE_SMALL_MEM 1
#define ANIMATION_NORMAL 2 #define ANIMATION_NORMAL 2
#define ANIMATION_POLICY ANIMATION_NORMAL #define ANIMATION_POLICY ANIMATION_NONE//ANIMATION_NORMAL
/*********************************************/ /*********************************************/
/************ flash type configuration ************/ /************ flash type configuration ************/

View File

@ -298,7 +298,7 @@ void mipi_disp_test(void)
#ifdef PLAY_SHUTDOWN_ANIMATION #ifdef PLAY_SHUTDOWN_ANIMATION
static int shutdown_anim = 0; static int shutdown_anim = 0;
#endif #endif
uint8_t power=1;
static void animation_thread(void *param) static void animation_thread(void *param)
{ {
MFCHandle *mfc_handle = NULL; MFCHandle *mfc_handle = NULL;
@ -309,7 +309,7 @@ static void animation_thread(void *param)
uint32_t stick, etick, delaytick; uint32_t stick, etick, delaytick;
uint32_t display_addr; uint32_t display_addr;
uint32_t *tmp_addr = NULL; uint32_t *tmp_addr = NULL;
uint8_t power=1;
anioffset = GetUpFileOffset(MKTAG('B', 'A', 'N', 'I')); anioffset = GetUpFileOffset(MKTAG('B', 'A', 'N', 'I'));
anisize = GetUpFileSize(MKTAG('B', 'A', 'N', 'I')); anisize = GetUpFileSize(MKTAG('B', 'A', 'N', 'I'));
@ -651,3 +651,12 @@ int get_animation_status(void)
{ {
return ani_playing; return ani_playing;
} }
void anim_close_lcd_open(void){
if(!power)
return;
ark_lcd_osd_enable(LCD_VIDEO_LAYER, 0);
ark_lcd_osd_enable(LCD_UI_LAYER, 1);
power=0;
}

View File

@ -460,9 +460,9 @@ int rtc_init(void)
alarm_irq_enable(0); alarm_irq_enable(0);
rtc_read_time(&tm); rtc_read_time(&tm);
if (tm.tm_year == 70) { // if (tm.tm_year == 70) {
rtc_set_time(&default_tm); // rtc_set_time(&default_tm);
} // }
return 0; return 0;
} }

View File

@ -1071,7 +1071,7 @@ static void uart_rx_demo_thread(void *param)
} }
printf("\r\n"); printf("\r\n");
if((0x01 == len) && (0x00 == uartrx[0])) break; if((0x01 == len) && (0x00 == uartrx[0])) continue;
memcpy((cmdstr+cmdlen), uartrx, len); memcpy((cmdstr+cmdlen), uartrx, len);
cmdlen += len; cmdlen += len;

View File

@ -155,16 +155,16 @@ uint8_t Get_sys_bt_on_off(void)
} }
void Set_sys_bt_on_off(uint8_t value) void Set_sys_bt_on_off(uint8_t value)
{ {
printf("Set_bt switch ===%d.\r\n",value); // printf("Set_bt switch ===%d.\r\n",value);
if(value == NULL ){ if(value == NULL ){
custom_data.user_data.bt_on_off = 0; custom_data.user_data.bt_on_off = 0;
custom_data.bt_connect_state = 0; custom_data.bt_connect_state = 0;
custom_data.call.call_state = 0; custom_data.call.call_state = 0;
SaveDataToFlash(custom_data.user_data);//保存数据 SaveDataToFlash(custom_data.user_data);//保存数据
printf("bw121 >>>>>>>>>>>>>>>0.\r\n"); // printf("bw121 >>>>>>>>>>>>>>>0.\r\n");
}else if(value != custom_data.user_data.bt_on_off){ }else if(value != custom_data.user_data.bt_on_off){
custom_data.user_data.bt_on_off = value; custom_data.user_data.bt_on_off = value;
printf("bw121 >>>>>>>>>>>>>>>1.\r\n"); // printf("bw121 >>>>>>>>>>>>>>>1.\r\n");
SaveDataToFlash(custom_data.user_data);//保存数据 SaveDataToFlash(custom_data.user_data);//保存数据
} }
//gpio_direction_output(46,1); //gpio_direction_output(46,1);

View File

@ -12,9 +12,10 @@
#define MOTO_ICMX_GB518_A270T 1 #define MOTO_ICMX_GB518_A270T 1
#define MOTO_ICMX_GB518_A272O 2 #define MOTO_ICMX_GB518_A272O 2
#define MOTO_ICMX_GB518_A272U 3
#define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272O #define MOTO_WARE_HOSE MOTO_ICMX_GB518_A272U
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270T) #if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270T)
@ -45,6 +46,23 @@
// #define UI_TEMP_CLOSE 1 // #define UI_TEMP_CLOSE 1
// #define UI_FAN_CLOSE 1 // #define UI_FAN_CLOSE 1
#elif (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A272U)
#define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 1
#define TP_VERSION OVERSEAS_VERSION_2
#define HARD_WARE "MXC-A272U V4.5"
#define MCU_INFO_LABEL "A272U"
//胎压功能宏
#define UI_VIEW_TIRE_PRESSURE 0
#define UI_TCS_CLOSE 1
// #define UI_FAN_CLOSE 1
#define ANIMO_CLOSE 1
#else #else
#define SOFT_WARE_HOST 0 #define SOFT_WARE_HOST 0
#define SOFT_WARE_ORDER 1 #define SOFT_WARE_ORDER 1

View File

@ -83,17 +83,6 @@ extern uint8_t bt_communication_heartbeat;
extern uint8_t flash_bt_state; extern uint8_t flash_bt_state;
void A27_BT_init(void){ void A27_BT_init(void){
#if 0
//蓝牙初始化
printf("enter A27_BT_init state = %d .\r\n",Get_sys_bt_on_off());
if(Get_sys_bt_on_off()==0){
DEBUG_PRINT("BT_SWITCH close .\r\n");
BT2_Switch(0);
}else{
DEBUG_PRINT("BT_SWITCH open .\r\n");
}
#else
//蓝牙初始化 //蓝牙初始化
printf("enter A27_BT_init state = %d ,flash_bt_state=%d.\r\n",Get_sys_bt_on_off(),flash_bt_state); printf("enter A27_BT_init state = %d ,flash_bt_state=%d.\r\n",Get_sys_bt_on_off(),flash_bt_state);
@ -119,7 +108,6 @@ void A27_BT_init(void){
}else }else
DEBUG_PRINT("BT_SWITCH open .\r\n"); DEBUG_PRINT("BT_SWITCH open .\r\n");
#endif #endif
#endif
} }
uint8_t velocity_light_flag = 0; uint8_t velocity_light_flag = 0;
@ -180,20 +168,12 @@ extern uint8_t bt2_state_now_flag;
uint8_t bw_121_time = 0; uint8_t bw_121_time = 0;
void UI_init(void){ void UI_init(void){
#if 0
Set_sys_power_on_self_test(DEMO_UI_SELF_FINISH);//自检完成
animo_time = 511;
if(bt2_switch_time)
bt2_switch_time = 0;
#else
printf("UI_init ...........................................\r\n"); printf("UI_init ...........................................\r\n");
Set_sys_power_on_self_test(DEMO_UI_SELF_FINISH);//自检完成 Set_sys_power_on_self_test(DEMO_UI_SELF_FINISH);//自检完成
animo_time = 511; animo_time = 511;
if(bt2_switch_time) if(bt2_switch_time)
bt2_switch_time = 0; bt2_switch_time = 0;
// Send_software_version();
#ifdef AMT630HV100 #ifdef AMT630HV100
@ -236,8 +216,8 @@ void UI_init(void){
carlink_ec_enable(0); carlink_ec_enable(0);
#elif (CARLINK_TP_EC) #elif (CARLINK_TP_EC)
printf("only tp init cp.\r\n"); printf("only tp init EC.\r\n");
Set_sys_tp_state(1); Set_sys_tp_state(2);
carlink_cp_enable(0); carlink_cp_enable(0);
carlink_aa_enable(0); carlink_aa_enable(0);
carlink_ec_enable(1); carlink_ec_enable(1);
@ -247,21 +227,21 @@ void UI_init(void){
#endif #endif
// console_send_atcmd("AT+ADDR\r\n", strlen("AT+ADDR\r\n"));//开蓝牙 // console_send_atcmd("AT+ADDR\r\n", strlen("AT+ADDR\r\n"));//开蓝牙
#ifdef AMT630HV100 // #ifdef AMT630HV100
vTaskDelay(10); // vTaskDelay(10);
#else // #else
sleep_ms(10); // sleep_ms(10);
#endif // #endif
#if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270T) // #if (MOTO_WARE_HOSE == MOTO_ICMX_GB518_A270T)
console_send_atcmd("AT+NAME=A27_MOTO_Phone,1\r\n", strlen("AT+NAME=A27_MOTO_Phone,1\r\n"));//修改蓝牙名 // console_send_atcmd("AT+NAME=A27_MOTO_Phone,1\r\n", strlen("AT+NAME=A27_MOTO_Phone,1\r\n"));//修改蓝牙名
#else // #else
console_send_atcmd("AT+NAME=A59_MOTO_Phone,1\r\n", strlen("AT+NAME=A59_MOTO_Phone,1\r\n"));//修改蓝牙名 // console_send_atcmd("AT+NAME=A59_MOTO_Phone,1\r\n", strlen("AT+NAME=A59_MOTO_Phone,1\r\n"));//修改蓝牙名
#endif // #endif
#ifdef AMT630HV100 // #ifdef AMT630HV100
vTaskDelay(10); // vTaskDelay(10);
#else // #else
sleep_ms(10); // sleep_ms(10);
#endif // #endif
console_send_atcmd("AT+NAME\r\n", strlen("AT+NAME\r\n"));//查询蓝牙名 console_send_atcmd("AT+NAME\r\n", strlen("AT+NAME\r\n"));//查询蓝牙名
A27_BT_init(); A27_BT_init();
@ -294,7 +274,6 @@ void UI_init(void){
//允许AP连接 //允许AP连接
cp_wlan_start(); cp_wlan_start();
#endif
} }
static ret_t on_timer(const idle_info_t* idle){ static ret_t on_timer(const idle_info_t* idle){
@ -477,6 +456,18 @@ void* test_timer_queue(void *args){
#ifndef AMT630HV100 #ifndef AMT630HV100
Set_sys_power_on_self_test(DEMO_UI_SELF_START); Set_sys_power_on_self_test(DEMO_UI_SELF_START);
#endif #endif
#ifdef ANIMO_CLOSE
if(animo_time>110){
BrightnessPowerOnSetting();
pwm_enable(2);
pwm_enable(3);
extern void anim_close_lcd_open(void);
anim_close_lcd_open();
}
if(animo_time>=130)
Set_sys_power_on_self_test(DEMO_UI_SELF_START);
#endif
}else if(Get_sys_power_on_self_test()==DEMO_UI_SELF_START){ }else if(Get_sys_power_on_self_test()==DEMO_UI_SELF_START){
#ifdef AMT630HV100 #ifdef AMT630HV100
@ -492,7 +483,7 @@ void* test_timer_queue(void *args){
Set_sys_power_on_self_test(DEMO_UI_SELF_CHECKING);//设置为自检中 Set_sys_power_on_self_test(DEMO_UI_SELF_CHECKING);//设置为自检中
console_send_atcmd("AT+NAME=A27_MOTO_Phone,1\r\n", strlen("AT+NAME=A27_MOTO_Phone,1\r\n"));//修改蓝牙名 console_send_atcmd("AT+NAME=A27_MOTO_Phone,1\r\n", strlen("AT+NAME=A27_MOTO_Phone,1\r\n"));//修改蓝牙名
#ifdef AMT630HV100 #ifdef AMT630HV100
vTaskDelay(500); vTaskDelay(1000);
#else #else
sleep_ms(200); sleep_ms(200);
#endif #endif
@ -502,7 +493,12 @@ void* test_timer_queue(void *args){
#ifdef AMT630HV100 #ifdef AMT630HV100
}else if(Get_sys_power_on_self_test()==DEMO_UI_SELF_CHECKING){ }else if(Get_sys_power_on_self_test()==DEMO_UI_SELF_CHECKING){
if(xTaskGetTickCount() - idletick > configTICK_RATE_HZ * 3){ if(xTaskGetTickCount() - idletick > configTICK_RATE_HZ * 3.5){
#ifdef AMT630HV100
vTaskDelay(100);
#else
sleep_ms(100);
#endif
UI_init(); UI_init();
} }
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -137,11 +137,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus> <RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows> <MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay> <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>EA0800008B0040E1000001000000298100000C000000088000000100000021DE00000100000013860000130100005984000002000000198000000100000026840000030000005786000001000000028600000100000001DC00000300000010860000C803000026810000010000005684000001000000158100000300000000DA000001000000048100000500000078840000030000002CE1000002000000018100000E00000029E100000100000007E1000002000000239200000100000016B0000001000000AF060000040000003184000001000000458100000100000004E10000020000000F8100000200000020810000010000005F86000007000000ED8000000100000002B00000010000000090000005000000D884000002000000878000000A0000000C810000970100003F8100000100000001E10000070000001D8100000900000026DE0000020000000D800000020000001D92000001000000EA80000001000000A68000000100000009810000010000000486000001000000D18500000200000003DC00000400000000DC00000100000017810000050000002881000001000000568600000F000000018600000100000003840000050000001A8F00000100000007B0000002000000118400000100000000840000030000002BE100000B000000808C0000010000003384000001000000478100000100000055840000180000007784000002000000148100000600000000810000010000000C860000030000000E84000001000000EF800000010000008980000001000000858400000100000028E1000001000000228100000100000083860000020000001F810000450100000E810000010000001A8600000300000003E100000A0000005E86000016000000EC8000000100000025E100002C010000978000000100000028DE0000030000000986000001000000E9800000020000008E860000010000000B8100000E000000A58000000100000000E100000200000002DC00000100000014860000D8000000058400000A000000588600000100000069860000010000002B8000000100000027840000010000000386000001000000D18400000100000011860000BC00000005810000200000005586000002000000278100000400000002840000030000000086000001000000F4800000010000002A8F000002000000198F000003000000168100000100000046810000D6000000108400000D0000002AE100000100000017B00000010000000BDE00000100000074860000010000000281000001000000218100000600000003B0000001000000EE80000001000000608600004B000000438100000100000044D50000010000008880000001000000A486000001000000518400000100000024E10000010000000D81000010000000088600000200000002E100000300000035E10000060000001E810000030000005D86000006000000EB80000001000000A186000002000000D684000001000000E8800000010000000A8100000200000007840000010000000586000001000000</CommandsUsage> <CommandsUsage>460900008B0001DC00000300000002860000010000005786000001000000268400000300000019800000010000005984000002000000138600001301000021DE0000010000000880000001000000298100000C00000040E10000010000002CE10000020000007884000003000000048100000500000000DA00000100000015810000030000005684000001000000268100000100000010860000F103000045810000010000003184000001000000AF0600000400000016B0000001000000239200000100000007E100000200000029E1000001000000018100000E000000878000000A000000D884000002000000009000000500000002B0000001000000ED800000010000005F8600000700000020810000010000000F8100000200000004E1000002000000A680000001000000EA800000010000001D920000010000000D8000000200000026DE0000020000001D8100000900000001E10000070000003F810000010000000C8100009701000003DC000004000000D185000002000000048600000100000009810000010000001A8F00000100000003840000050000000186000001000000568600000F0000002881000001000000178100000500000000DC00000100000014810000060000007784000002000000558400001800000047810000010000003384000001000000808C0000010000002BE100000B0000000084000003000000118400000100000007B00000020000008386000002000000228100000100000028E100000100000085840000010000008980000001000000EF800000010000000E840000010000000C860000030000000081000001000000098600000100000028DE000003000000978000000100000025E100002C010000EC800000010000005E8600001600000003E100000A0000001A860000030000000E810000010000001F8100005901000000E1000002000000A5800000010000000B8100000E0000008E86000001000000E980000002000000D184000001000000038600000100000027840000010000002B8000000100000069860000010000005886000001000000058400000A00000014860000E400000002DC0000010000001681000001000000198F0000030000002A8F000002000000F4800000010000000086000001000000028400000300000027810000040000005586000002000000058100002000000011860000C7000000028100000100000074860000010000000BDE00000100000017B00000010000002AE1000001000000108400000D00000046810000DE0000005184000001000000A486000001000000888000000100000044D50000010000004381000001000000608600004B000000EE8000000100000003B00000010000002181000006000000D684000001000000A186000002000000EB800000010000005D860000060000001E8100000300000035E100000600000002E100000300000008860000020000000D8100001000000024E1000001000000058600000100000007840000010000000A81000002000000E880000001000000</CommandsUsage>
</MFCToolBarParameters> </MFCToolBarParameters>
<CommandManager> <CommandManager>
<CommandsWithoutImages>4A0008800000098000000A8000000B8000000C800000158000000A810000FFFFFFFF01E8000012810000D2840000D1850000D78600000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E92000000DC000001DC000002DC000003DC0000748600007784000007840000808C000044D50000838600005886000004DC000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B00000248100002AE10000008200001C8200000182000067860000008800000188000002880000038800000488000005880000</CommandsWithoutImages> <CommandsWithoutImages>4A0008800000098000000A8000000B8000000C800000158000000A810000FFFFFFFF01E8000012810000D2840000D1850000D78600000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E92000000DC000001DC000002DC000003DC0000748600007784000007840000808C000044D50000838600005886000004DC000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B00000248100002AE10000008200001C8200000182000067860000008800000188000002880000038800000488000005880000</CommandsWithoutImages>
<MenuUserImages>5E00138600002E000000048400007B00000057860000190000000286000010000000048100004B000000108600002C00000076860000380000001581000054000000268100005C0000002CE10000720000008486000039000000318400008200000023920000000000000D8600001600000007E100006A000000D98600000D0000000F81000052000000208100005A00000004E10000680000005F860000630000000A8600002A0000001D920000120000000C8100004F000000008D00001D0000000D8000004600000001E100006500000023E100006C000000098100004D000000068400007D00000019820000440000005686000032000000038400007A0000009A8600001700000017810000560000004A810000760000001682000042000000018600000F000000008400007700000014810000530000002BE1000071000000449200002100000030840000810000000E8400007F0000000C860000150000000081000048000000D88600000C0000001F9200001E0000005E860000340000000E810000510000001F810000590000001A8600003100000003E100006700000025E100006E0000002F8200004500000009860000290000002D920000200000000B8100004E0000008E8600003A00000000E100006400000022E100006B000000148600002F000000058400007C000000D18400001C000000698600003700000041E100007400000018820000430000000386000011000000058100004C000000118600002D0000000284000079000000558600000700000016810000550000004981000075000000008600000E0000004681000061000000328400008300000010840000800000000E86000018000000DA860000050000006086000036000000518400008500000005E10000690000000B8600002B00000002E100006600000035E10000730000005D860000330000000D810000500000000A8400007E000000A18600003B000000C38600000300000008860000280000002C9200001F000000C08600000B0000001686000030000000</MenuUserImages> <MenuUserImages>5E0002860000100000005786000019000000048400007B000000138600002E0000002CE1000072000000268100005C00000015810000540000007686000038000000108600002C000000048100004B000000D98600000D00000007E100006A0000000D860000160000002392000000000000318400008200000084860000390000000A8600002A0000005F8600006300000004E1000068000000208100005A0000000F8100005200000023E100006C00000001E10000650000000D80000046000000008D00001D0000000C8100004F0000001D920000120000001982000044000000068400007D000000098100004D000000018600000F00000016820000420000004A8100007600000017810000560000009A86000017000000038400007A00000056860000320000002BE100007100000014810000530000000084000077000000D88600000C00000000810000480000000C860000150000000E8400007F0000003084000081000000449200002100000009860000290000002F8200004500000025E100006E00000003E10000670000001A860000310000001F810000590000000E810000510000005E860000340000001F9200001E00000022E100006B00000000E10000640000008E8600003A0000000B8100004E0000002D920000200000000386000011000000188200004300000041E10000740000006986000037000000D18400001C000000058400007C000000148600002F000000008600000E0000004981000075000000168100005500000055860000070000000284000079000000118600002D000000058100004C000000DA860000050000000E860000180000001084000080000000328400008300000046810000610000000B8600002B00000005E1000069000000518400008500000060860000360000000886000028000000C386000003000000A18600003B0000000A8400007E0000000D810000500000005D8600003300000035E100007300000002E10000660000001686000030000000C08600000B0000002C9200001F000000</MenuUserImages>
</CommandManager> </CommandManager>
<Pane-59393> <Pane-59393>
<ID>0</ID> <ID>0</ID>
@ -880,7 +880,7 @@
</BasePane-34049> </BasePane-34049>
<MFCToolBar-34050> <MFCToolBar-34050>
<Name>Main</Name> <Name>Main</Name>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000064000000FFFEFF000000000000000000000000000100000001000000018001E100000000000065000000FFFEFF000000000000000000000000000100000001000000018003E100000000000067000000FFFEFF0000000000000000000000000001000000010000000180008100000000000048000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006C000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006B000000FFFEFF000000000000000000000000000100000001000000018025E10000000004006E000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040071000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040072000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005B000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006D000000FFFEFF000000000000000000000000000100000001000000018028E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018029E100000000000070000000FFFEFF000000000000000000000000000100000001000000018002810000000000004A000000FFFEFF000000000000000000000000000100000001000000018029810000000000005F000000FFFEFF000000000000000000000000000100000001000000018027810000000000005D000000FFFEFF000000000000000000000000000100000001000000018028810000000000005E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000057000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040058000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000004E000000FFFEFF00000000000000000000000000010000000100000001800C810000000000004F000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000063000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F8100000000000059000000FFFEFF000000000000000000000000000100000001000000018020810000000000005A000000FFFEFF0000000000000000000000000001000000010000000180468100000000020061000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons> <Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000064000000FFFEFF000000000000000000000000000100000001000000018001E100000000000065000000FFFEFF000000000000000000000000000100000001000000018003E100000000000067000000FFFEFF0000000000000000000000000001000000010000000180008100000000000048000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006C000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006B000000FFFEFF000000000000000000000000000100000001000000018025E10000000000006E000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040071000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040072000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005B000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006D000000FFFEFF000000000000000000000000000100000001000000018028E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018029E100000000000070000000FFFEFF000000000000000000000000000100000001000000018002810000000000004A000000FFFEFF000000000000000000000000000100000001000000018029810000000000005F000000FFFEFF000000000000000000000000000100000001000000018027810000000000005D000000FFFEFF000000000000000000000000000100000001000000018028810000000000005E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040057000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040058000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000004E000000FFFEFF00000000000000000000000000010000000100000001800C810000000000004F000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000063000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F8100000000000059000000FFFEFF000000000000000000000000000100000001000000018020810000000000005A000000FFFEFF0000000000000000000000000001000000010000000180468100000000020061000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>
</MFCToolBar-34050> </MFCToolBar-34050>
<Pane-34050> <Pane-34050>
<ID>34050</ID> <ID>34050</ID>

View File

@ -19,7 +19,7 @@
<LeaveTargetRunning>_ 0</LeaveTargetRunning> <LeaveTargetRunning>_ 0</LeaveTargetRunning>
</JLinkDriver> </JLinkDriver>
<DebugChecksum> <DebugChecksum>
<Checksum>2651721875</Checksum> <Checksum>1255953232</Checksum>
</DebugChecksum> </DebugChecksum>
<Exceptions> <Exceptions>
<StopOnUncaught>_ 0</StopOnUncaught> <StopOnUncaught>_ 0</StopOnUncaught>
@ -72,7 +72,7 @@
<Bp19>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\FreeRTOS-Plus\FreeRTOS-Plus-TCP\FreeRTOS_Sockets.c}.365.13" 0 0 1 "" 0 "" 0</Bp19> <Bp19>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\FreeRTOS-Plus\FreeRTOS-Plus-TCP\FreeRTOS_Sockets.c}.365.13" 0 0 1 "" 0 "" 0</Bp19>
<Bp20>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\FreeRTOS-Plus\FreeRTOS-Plus-TCP\FreeRTOS_Sockets.c}.373.5" 0 0 1 "" 0 "" 0</Bp20> <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> <Bp21>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\FreeRTOS-Plus\FreeRTOS-Plus-TCP\FreeRTOS_Sockets.c}.323.9" 0 0 1 "" 0 "" 0</Bp21>
<Bp22>_ 1 "EMUL_CODE" "{$PROJ_DIR$\..\lib\lwip\src\api\sockets.c}.1988.5" 0 0 1 "" 0 "" 0</Bp22> <Bp22>_ 0 "EMUL_CODE" "{$PROJ_DIR$\..\lib\lwip\src\api\sockets.c}.1988.5" 0 0 1 "" 0 "" 0</Bp22>
<Count>23</Count> <Count>23</Count>
</Breakpoints2> </Breakpoints2>
<Aliases> <Aliases>

File diff suppressed because one or more lines are too long