A27两个不同版本的UI合并到同一个工程
This commit is contained in:
@ -148,76 +148,10 @@ 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;
|
||||
// }
|
||||
speed_convert_mile_calculation();
|
||||
}
|
||||
|
||||
// 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毫秒)
|
||||
@ -231,9 +165,4 @@ void Moto_speed_timer(void){
|
||||
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);
|
||||
|
||||
|
||||
}
|
||||
|
@ -277,6 +277,9 @@ int test_light = 0;
|
||||
extern uint8_t bt_communication_heartbeat;//时间检测
|
||||
//MOTO通讯协议
|
||||
void data_analysis(uint8_t *buf){
|
||||
#if (MOTO_WARE_HOSE == MOTO_TEST_DEMO)
|
||||
return;
|
||||
#endif
|
||||
// printf("data_analysis-------------.\r\n");
|
||||
uint32_t data;
|
||||
uint32_t sum,sum1,sum2,sum3,sum4;
|
||||
@ -503,6 +506,11 @@ void data_analysis(uint8_t *buf){
|
||||
if(JUDGE_BIN_4(data)){//收到胎压信息,不再发送
|
||||
DEBUG_PRINT("Received tire pressure command, no longer sending.\n");
|
||||
Set_sys_tire_pressure_mesg(10);
|
||||
tire_power = 1;
|
||||
}
|
||||
if(JUDGE_BIN_5(data) && JUDGE_BIN_6(data)){
|
||||
DEBUG_PRINT("bt reset.\n");
|
||||
bt_reset_flag = 2;
|
||||
}
|
||||
#ifdef DATA_CAN
|
||||
switch(result){
|
||||
|
@ -16,7 +16,6 @@ extern void SaveDataToFlash(SfudData_t user_data);
|
||||
//uint8_t oil_buffer[SAVE_DATA_SIZE];
|
||||
uint8_t light_buffer[SAVE_DATA_SIZE];
|
||||
double cell_buffer[SAVE_DATA_SIZE];
|
||||
uint8_t data_storage=0;
|
||||
uint8_t flash_bt_state = 0;
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user