Commit f6dc38c8 authored by hu's avatar hu

调整工具

parent ef56acce
No preview for this file type
This diff is collapsed.
project .intvect 1536
project .text 298972
project .text 299068
project .rodata 412383
project .secinfo 120
project .syscall 6
......
......@@ -174,7 +174,7 @@ void BL_Management_service ( void )
/*主函数中调用第一个参数电源状态 1是 ON档 2 off 第二个参数 唤醒条件 1是TTF唤醒 2 是表盘唤醒 3 是表盘和屏都有唤醒,0无唤醒*/
BackLightSchedu(Common_Get_IG_Sts(), BackLightWakeFlag);
BL_PWM_OUT = 1 ;
//BL_PWM_OUT = 1 ;
//水温灯
TimerB_PWM_Channel_Duty_Set(TIMERB_2_CH7 , testBG );//水温格白色
......
......@@ -3,21 +3,21 @@
#include "GaugesInterface.h"
#include "RTE_PWM_OUT.h"
//-------------------------------------------
//转速数据处理 wangboyu
//转速数据处理
//-------------------------------------------
//断码显示
//-------------------------------------------
//342 - 3.2. 行驶记录仪
// 342 - 3.2. 行驶记录仪
//-------------------------------------------
static struct
{
uint16_t Value ;
uint16_t Valid ;
uint8_t CurSeg ;
}TachoVariable ;
uint16_t Value;
uint16_t Valid;
uint8_t CurSeg;
} TachoVariable;
static uint8_t CalTacho_CurSeg(uint8_t Valid,uint16_t Value);
static uint8_t CalTacho_CurSeg(uint8_t Valid, uint16_t Value);
/*-------------------------------------------------------------------------
* Function Name : Tacho_KL30_Init
* Description : 转速KL30初始化
......@@ -28,33 +28,33 @@ static uint8_t CalTacho_CurSeg(uint8_t Valid,uint16_t Value);
--------------------------------------------------------------------------*/
void Tacho_KL30_Init(void)
{
TachoVariable.Value = 0 ;
TachoVariable.Valid = 0 ;
TachoVariable.CurSeg = 0 ;
TachoVariable.Value = 0u;
TachoVariable.Valid = 0u;
TachoVariable.CurSeg = 0u;
}
void Tacho_KL15_ON_Init(void)
{
TachoVariable.Value = 0 ;
TachoVariable.Valid = 0 ;
TachoVariable.CurSeg = 0 ;
TachoVariable.Value = 0u;
TachoVariable.Valid = 0u;
TachoVariable.CurSeg = 0u;
}
void Tacho_KL15_OFF_Init(void)
{
TachoVariable.Value = 0 ;
TachoVariable.Valid = 0 ;
TachoVariable.CurSeg = 0 ;
TachoVariable.Value = 0u;
TachoVariable.Valid = 0u;
TachoVariable.CurSeg = 0u;
}
void Tacho_Wakeup_Init(void)
{
TachoVariable.Value = 0 ;
TachoVariable.Valid = 0 ;
TachoVariable.CurSeg = 0 ;
TachoVariable.Value = 0u;
TachoVariable.Valid = 0u;
TachoVariable.CurSeg = 0u;
}
void Tacho_Sleep_Init(void)
{
TachoVariable.Value = 0 ;
TachoVariable.Valid = 0 ;
TachoVariable.CurSeg = 0 ;
TachoVariable.Value = 0u;
TachoVariable.Valid = 0u;
TachoVariable.CurSeg = 0u;
}
/*-------------------------------------------------------------------------
* Function Name : Tacho_Processing_Service
......@@ -66,50 +66,44 @@ void Tacho_Sleep_Init(void)
--------------------------------------------------------------------------*/
void Tacho_Processing_Service(void)
{
uint16_t Msg_Epm_nEng = 0 ;
uint32_t u32Result = 0 ;
uint16_t Fre = 0 ;
uint16_t Msg_Epm_nEng = 0u;
uint32_t u32Result = 0u;
uint16_t Fre = 0u;
Msg_Epm_nEng = Get_ID_CF00400_Sig_Engine_speed();
TachoVariable.Valid = 0 ;
if(Msg_Epm_nEng > 0xFAFF)
{//abnormal
u32Result = 0 ;
}
else if(Msg_Epm_nEng > 0x5DC0)
{
u32Result = 3000u ;
}
else
{
TachoVariable.Valid = 1 ;
u32Result = Msg_Epm_nEng ;
u32Result *= 125u ;
u32Result += 500u ;
u32Result /= 1000u ;
}
if(u32Result > 3000u)
{
u32Result = 3000u ;
}
Msg_Epm_nEng = Get_ID_CF00400_Sig_Engine_speed();
TachoVariable.Value = RevSpeedManage((uint16_t)u32Result);
if (Msg_Epm_nEng > 0xFAFFu)
{
TachoVariable.Valid = 0u;
u32Result = 0u;
}
else
{
TachoVariable.Valid = 1u;
TachoVariable.CurSeg = CalTacho_CurSeg(TachoVariable.Valid,TachoVariable.Value);
u32Result = Msg_Epm_nEng;
u32Result *= 125u;
u32Result += 500u;
u32Result /= 1000u;
//转*每转脉冲数/60=频率
if (u32Result > 3000u)
{
u32Result = 3000u;
}
}
u32Result *= 4 ;
u32Result /= 60 ;
TachoVariable.Value = RevSpeedManage((uint16_t)u32Result);
Fre = (uint16_t)u32Result ;
TachoVariable.CurSeg = CalTacho_CurSeg(TachoVariable.Valid, TachoVariable.Value);
RTE_PWM_Set_Tacho_Out(Fre,500) ;
//转*每转脉冲数/60=频率
u32Result *= 4;
u32Result /= 60;
Fre = (uint16_t)u32Result;
RTE_PWM_Set_Tacho_Out(Fre, 500);
}
/*-------------------------------------------------------------------------
* Function Name : Tacho_Display
......@@ -119,22 +113,21 @@ void Tacho_Processing_Service(void)
* Return : None
* onther : None
--------------------------------------------------------------------------*/
static uint8_t CalTacho_CurSeg(uint8_t Valid,uint16_t Value)
static uint8_t CalTacho_CurSeg(uint8_t Valid, uint16_t Value)
{
uint8_t u8Result = 0u;
uint8_t u8Result = 0u;
if(Valid)
{
}
else
{
//范围外/CAN中断
}
SetGaugesPara(RevGauges,Value);
u8Result = GetGaugesCurrentPos(RevGauges) ;
if (Valid)
{
}
else
{
//范围外/CAN中断
}
SetGaugesPara(RevGauges, Value);
u8Result = GetGaugesCurrentPos(RevGauges);
return u8Result ;
return u8Result;
}
/*-------------------------------------------------------------------------
* Function Name : Tacho_Get_ActualValue
......@@ -147,12 +140,12 @@ static uint8_t CalTacho_CurSeg(uint8_t Valid,uint16_t Value)
uint16_t Tacho_Get_ActualValue(void)
{
uint16_t u16Result = 0u;
u16Result = TachoVariable.Value ;
u16Result = TachoVariable.Value;
return u16Result;
}
/*-------------------------------------------------------------------------
* Function Name : Tacho_Get_Valid
* Description :
* Description :
* Input : None
* Output : None
* Return : None
......@@ -161,7 +154,7 @@ uint16_t Tacho_Get_ActualValue(void)
uint8_t Tacho_Get_Valid(void)
{
uint8_t u8Result = 0u;
u8Result = TachoVariable.Valid ;
u8Result = TachoVariable.Valid;
return u8Result;
}
/*-------------------------------------------------------------------------
......@@ -174,9 +167,5 @@ uint8_t Tacho_Get_Valid(void)
--------------------------------------------------------------------------*/
uint8_t Tacho_Get_CurSeg(void)
{
return TachoVariable.CurSeg ;
return TachoVariable.CurSeg;
}
......@@ -5,21 +5,21 @@
#define VEH_FILTER_LEN 7
static struct
static struct
{
uint8_t Count ;
uint16_t Data[VEH_FILTER_LEN] ;
}VehcleFilter;
} VehcleFilter;
static uint32_t SPEED_PPK = 159246ul ;
static uint32_t SPEED_RADIO = 637 ;
static uint32_t SPEED_PPK = 159246ul ;
static uint32_t SPEED_RADIO = 637 ;
uint16_t Vehicle_ACT_Speed;
uint16_t Vehicle_DISP_Speed;
uint8_t VehicleSpeedValid;
uint8_t Vehicle_CurSeg ;
static uint16_t Cal_VehSpeed(uint16_t Fre,uint8_t Len);
static uint16_t Cal_VehSpeed(uint16_t Fre, uint8_t Len);
void Speed_KL30_Init(void)
{
......@@ -29,7 +29,7 @@ void Speed_KL30_Init(void)
VehicleSpeedValid = 0u;
Vehicle_CurSeg = 0u;
VehcleFilter.Count = 0 ;
for(i = 0 ;i < VEH_FILTER_LEN ;i ++)
for (i = 0 ; i < VEH_FILTER_LEN ; i ++)
{
VehcleFilter.Data[ i ] = 0 ;
}
......@@ -44,12 +44,12 @@ void Speed_KL15_ON_Init(void)
VehicleSpeedValid = 0u;
Vehicle_CurSeg = 0u;
VehcleFilter.Count = 0 ;
for(i = 0 ;i < VEH_FILTER_LEN ;i ++)
for (i = 0 ; i < VEH_FILTER_LEN ; i ++)
{
VehcleFilter.Data[ i ] = 0 ;
}
Veh_Fre_Init(Get_Speed_PPK()/10);
Veh_Fre_Init(Get_Speed_PPK() / 10);
}
void Speed_KL15_OFF_Init(void)
{
......@@ -59,7 +59,7 @@ void Speed_KL15_OFF_Init(void)
VehicleSpeedValid = 0u;
Vehicle_CurSeg = 0u;
VehcleFilter.Count = 0 ;
for(i = 0 ;i < VEH_FILTER_LEN ;i ++)
for (i = 0 ; i < VEH_FILTER_LEN ; i ++)
{
VehcleFilter.Data[ i ] = 0 ;
}
......@@ -71,7 +71,7 @@ void Speed_Wakeup_Init(void)
Vehicle_DISP_Speed = 0u;
VehicleSpeedValid = 0u;
Vehicle_CurSeg = 0u;
for(i = 0 ;i < VEH_FILTER_LEN ;i ++)
for (i = 0 ; i < VEH_FILTER_LEN ; i ++)
{
VehcleFilter.Data[ i ] = 0 ;
}
......@@ -83,7 +83,7 @@ void Speed_Sleep_Init(void)
Vehicle_DISP_Speed = 0u;
VehicleSpeedValid = 0u;
Vehicle_CurSeg = 0u;
for(i = 0 ;i < VEH_FILTER_LEN ;i ++)
for (i = 0 ; i < VEH_FILTER_LEN ; i ++)
{
VehcleFilter.Data[ i ] = 0 ;
}
......@@ -96,7 +96,7 @@ void Speed_Processing_Service(void)
//if(Get_Veh_Fre_Event())
//{
// VehValTmp = Cal_VehSpeed(Get_Veh_Fre(),VEH_FILTER_LEN) ;
// VehValTmp *= 3600 ;
// VehValTmp *= 10 ;
// VehValTmp *= 10 ;
......@@ -112,14 +112,14 @@ void Speed_Processing_Service(void)
VehValTmp *= 10 ;
VehValTmp /= PPK ;
//VehValTmp = Cal_Veh_Frequency();
//VehValTmp *= 3600 ;
//VehValTmp *= 10 ;
//VehValTmp /= PPK ;
if(VehValTmp > 2250)
if (VehValTmp > 2250)
{
VehValTmp = 0 ;
VehicleSpeedValid = 0 ;
......@@ -129,36 +129,36 @@ void Speed_Processing_Service(void)
VehicleSpeedValid = 1 ;
}
Vehicle_ACT_Speed = VehValTmp ;
//传入表头
VehValTmp = VehSpeedAmplification((uint16_t)VehValTmp);
SetGaugesPara(VehGauges, (uint16_t)VehValTmp);
//获得显示格和显示车速
Vehicle_CurSeg = GetGaugesCurrentPos(VehGauges);
Vehicle_DISP_Speed = GetVehDisVal(Vehicle_CurSeg,&GaugesInfo_Init_Table[VehGauges]);
Vehicle_DISP_Speed = GetVehDisVal(Vehicle_CurSeg, &GaugesInfo_Init_Table[VehGauges]);
}
static uint16_t Cal_VehSpeed(uint16_t Fre,uint8_t Len)
static uint16_t Cal_VehSpeed(uint16_t Fre, uint8_t Len)
{
static uint16_t u16Result = 0 ;
if(Fre > 2000)
if (Fre > 2000)
{
//do nothing
//do nothing
}
else
{
if(VehcleFilter.Count < Len)
if (VehcleFilter.Count < Len)
{
VehcleFilter.Data[VehcleFilter.Count] = Fre ;
VehcleFilter.Count ++ ;
}
else
{
{
VehcleFilter.Count = 0 ;
App_SortNByte(VehcleFilter.Data,Len);
App_SortNByte(VehcleFilter.Data, Len);
u16Result = VehcleFilter.Data[2] ;
u16Result += VehcleFilter.Data[3] ;
......@@ -181,7 +181,7 @@ static uint16_t Cal_VehSpeed(uint16_t Fre,uint8_t Len)
--------------------------------------------------------------------------*/
void Set_Speed_PPK(uint32_t PPK)
{
SPEED_PPK = PPK ;
SPEED_PPK = PPK ;
}
/*-------------------------------------------------------------------------
* Function Name : Set_Speed_PPK
......@@ -197,20 +197,19 @@ void Set_Speed_Ratio(uint32_t Ratio)
}
/*-------------------------------------------------------------------------
* Function Name : Get_Speed_PPK
* Description :
* Description :
* Input : None
* Output : None
* Return : 10倍PPK值
* onther :
* onther :
--------------------------------------------------------------------------*/
uint32_t Get_Speed_PPK(void)
{
uint32_t u32Result = 0u;
u32Result = SPEED_PPK ;
return u32Result ;
uint32_t u32Result = 0u;
u32Result = SPEED_PPK ;
return u32Result ;
}
uint16_t Speed_Get_ActualValue(void)
{
uint16_t u16Result = 0u;
......
......@@ -5,7 +5,7 @@ uint32_t DataServiceInterval = 0xFFFFu;
#pragma ghs section bss=".myNonInitArea"
uint32_t NVM_USER_SETTINGS_SERVICE ;
uint32_t NVM_USER_SETTINGS_SERVICE ;
uint32_t MainTimer ; /*****100ms累加器****/
#pragma ghs section bss=default
......@@ -20,18 +20,18 @@ MaintenanceStruct MaintenanceTime;
******************************************************************************/
void Data_Maintenance_Service_KL30_Init(void)
{
uint32_t TempBuf[1] = {0};
if (EEPROM_Get_Block_Status(EEPROM_BLOCK_SERVICE_INFO) == EEPROM_STAT_BLANK)
{
NVM_USER_SETTINGS_SERVICE = 50000u;
TempBuf[0] = NVM_USER_SETTINGS_SERVICE;
Data_User_EEPROM_Write(EEPROM_BLOCK_SERVICE_INFO, TempBuf, 1);
}
else
{
Data_User_EEPROM_Read(EEPROM_BLOCK_SERVICE_INFO, TempBuf, 1);
NVM_USER_SETTINGS_SERVICE = TempBuf[0];
}
uint32_t TempBuf[1] = {0};
if (EEPROM_Get_Block_Status(EEPROM_BLOCK_SERVICE_INFO) == EEPROM_STAT_BLANK)
{
NVM_USER_SETTINGS_SERVICE = 50000u;
TempBuf[0] = NVM_USER_SETTINGS_SERVICE;
Data_User_EEPROM_Write(EEPROM_BLOCK_SERVICE_INFO, TempBuf, 1);
}
else
{
Data_User_EEPROM_Read(EEPROM_BLOCK_SERVICE_INFO, TempBuf, 1);
NVM_USER_SETTINGS_SERVICE = TempBuf[0];
}
/*保养里程*/
DataServiceInterval = 0xFFFFu;
......@@ -62,7 +62,7 @@ uint32_t Get_Data_Maintenace_Interval_Processing(void)
{
MileageDev = NVM_USER_SETTINGS_SERVICE - ODO_Data;
Servicekm = (uint32_t)MileageDev;
Servicekm +=9;
Servicekm += 9;
Servicekm /= 10u;
}
DataServiceInterval = Servicekm;
......@@ -83,8 +83,8 @@ void Data_Maintenance_Interval_Reset(uint32_t Maintenance_def)
uint32_t TempBuf[1] = {0};
ODO_Data = Data_ODO_Read();
NVM_USER_SETTINGS_SERVICE = ODO_Data + Maintenance_def;
TempBuf[0]=NVM_USER_SETTINGS_SERVICE;
Data_User_EEPROM_Write(EEPROM_BLOCK_SERVICE_INFO,TempBuf, 1);
TempBuf[0] = NVM_USER_SETTINGS_SERVICE;
Data_User_EEPROM_Write(EEPROM_BLOCK_SERVICE_INFO, TempBuf, 1);
//DataServiceInterval = Maintenance_def;
}
......
......@@ -248,7 +248,7 @@ uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void)
void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status)
{
//T1_LED_OUT = led_status;
T1_LED_OUT = led_status;
if (led_status == 1)
{
......@@ -291,7 +291,7 @@ uint8_t LED_ACC_AIR_R_Judgement(void)//done
void LED_ACC_AIR_R_Execution(uint8_t led_status)
{
//R6_LED_OUT = led_status;
R6_LED_OUT = led_status;
if (led_status == 1)
{
......@@ -1688,7 +1688,7 @@ void LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(uint8_t led_status)
void LED_ABS_R_Execution(uint8_t led_status)
{
//ABS_LED_MCU_OUT = led_status;
ABS_LED_MCU_OUT = led_status;
if (led_status == 1)
{
......
......@@ -167,7 +167,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
2000ul,
0xCF00400ul,
(( void * )0),
(( void * )0),
......
......@@ -11,29 +11,23 @@
#include "Line_in.h"
#include "Maintenance.h"
#include "Menu.h"
#include "Emulated_EEPROM.h"
#include "Watchdog.h"
/*修饰变量static*/
/*ig on off时间线*/
static uint32_t PowerIgnOnTimeLine;
static uint32_t PowerIgnOffTimeLine;
static COMMON_PowerStatus_t PowerSts;/*1 ON ; 0 OFF*/
static uint16_t Act_V_Speed;/*实际值,十倍的*/
static uint16_t Act_E_Speed;/*实际值*/
static uint16_t Disp_V_Speed;/*显示值,十倍的*/
static uint16_t Disp_E_Speed;/*显示值*/
static COMMON_PowerStatus_t PowerSts; /*1 ON ; 0 OFF*/
static uint16_t Act_V_Speed; /*实际值,十倍的*/
static uint16_t Act_E_Speed; /*实际值*/
static uint16_t Disp_V_Speed; /*显示值,十倍的*/
static uint16_t Disp_E_Speed; /*显示值*/
/*数据有效 1 ;数据无效 0 /0xff */
static DataValid_t PowerSts_Valid;
......@@ -52,15 +46,11 @@ static void Common_Set_Act_E_Speed_Valid(DataValid_t Val);
static void Common_Set_Disp_V_Speed_Valid(DataValid_t Val);
static void Common_Set_Disp_E_Speed_Valid(DataValid_t Val);
static uint16_t SysRollingCounter;
//wangboyu - begin
// wangboyu - begin
static uint8_t CanFirstEvent[ID_TOTAL_MAX];
static void Individual_ECU_Communication(void) ;
//wangboyu - end
static void Individual_ECU_Communication(void);
// wangboyu - end
/*菜单设置项存储EEP结构*/
//_Menu_Configure_Value Menu_Con_EEP_Value;
......@@ -83,12 +73,8 @@ void Common_DataInit(void)
Disp_E_Speed_Valid = COMMON_Valid_UNKNOW;
PowerIgnOnTimeLine = 0x0ul;
PowerIgnOffTimeLine = 0x0ul;
}
/*以下由各个处理模块按需调用*/
/*使用数据之前,需要先判断数据是否有效,如果无效,则不可以使用*/
......@@ -133,8 +119,6 @@ uint8_t Common_Get_OverSpeed_Status(void)
return OverSpeedStatus;
}
static void Common_Set_IG_Sts(COMMON_PowerStatus_t Val)
{
PowerSts = Val;
......@@ -162,11 +146,11 @@ DataValid_t Common_Get_IG_Sts_Valid(void)
}
DataValid_t Common_Get_Act_V_Speed_Valid(void)
{
return Act_V_Speed_Valid;
return Act_V_Speed_Valid;
}
DataValid_t Common_Get_Act_E_Speed_Valid(void)
{
return Act_E_Speed_Valid;
return Act_E_Speed_Valid;
}
DataValid_t Common_Get_Disp_V_Speed_Valid(void)
{
......@@ -177,8 +161,6 @@ DataValid_t Common_Get_Disp_E_Speed_Valid(void)
return Disp_E_Speed_Valid;
}
static void Common_Set_IG_Sts_Valid(DataValid_t Val)
{
PowerSts_Valid = Val;
......@@ -215,7 +197,7 @@ uint16_t Common_Get_DispSpeed(void)
}
/*2MS任务*/
static uint16_t wbyTest = 0 ;
static uint16_t wbyTest = 0;
void Common_Input_Para(void)
{
/* if (SYS_OPR_STAT_IGN_ON)
......@@ -227,8 +209,6 @@ void Common_Input_Para(void)
uint8_t LineStatus1 = 0u;
uint8_t LineStatus2 = 0u;
u32IG_ON_Timer = Common_GetIgnOnTime();
if (SYS_OPR_STAT_IGN_ON)
......@@ -242,6 +222,7 @@ void Common_Input_Para(void)
wbyTest = Speed_Get_Display_Value();
Common_Set_Disp_V_Speed(wbyTest);
Common_Set_Act_V_Speed(Speed_Get_ActualValue());
if (Speed_Get_Valid())
{
Common_Set_Act_V_Speed_Valid(COMMON_Valid);
......@@ -255,16 +236,11 @@ void Common_Input_Para(void)
Common_Set_Act_E_Speed(RevSpeedManage(Tacho_Get_ActualValue()));
PowerIgnOffTimeLine = 0ul;
if (PowerIgnOnTimeLine < 0x7ffffffful)
{
PowerIgnOnTimeLine += 2u;
}
}
else
{
......@@ -283,28 +259,23 @@ void Common_Input_Para(void)
Common_Set_Disp_V_Speed(0u);
Common_Set_Disp_E_Speed(0u);
}
}
void Set_Can18FF5510_FirstRecv_Event(void)
{
CanFirstEvent[ID_CanMsg18FF5510_Msg_Count] = 1 ;
CanFirstEvent[ID_CanMsg18FF5510_Msg_Count] = 1;
}
void Set_Can18FF2300_FirstRecv_Event(void)
{
CanFirstEvent[ID_CanMsg18FF2300_Msg_Count] = 1 ;
CanFirstEvent[ID_CanMsg18FF2300_Msg_Count] = 1;
}
uint8_t Get_CanFirstRecv_Event(uint8_t ID)
{
return CanFirstEvent[ID] ;
uint8_t Get_CanFirstRecv_Event(uint8_t ID)
{
return CanFirstEvent[ID];
}
void Common_RollingCounterAdd(void)
{
SysRollingCounter++;
......@@ -342,13 +313,9 @@ void Common_BlockDelay(uint16_t m_MS)
Counter = 65535u - RocBackup + Counter + 1u;
}
}
while (Counter < DIMCounter);
} while (Counter < DIMCounter);
}
uint32_t Common_GetIgnOnTime(void)
{
return PowerIgnOnTimeLine;
......@@ -359,19 +326,9 @@ uint32_t Common_GetIgnOffTime(void)
return PowerIgnOffTimeLine;
}
#pragma diag_suppress=Pm064
int32_t SEGGER_RTT_printf(uint16_t BufferIndex, const char * sFormat, ...);
int32_t SEGGER_RTT_printf(uint16_t BufferIndex, const char * sFormat, ...)
#pragma diag_suppress = Pm064
int32_t SEGGER_RTT_printf(uint16_t BufferIndex, const char *sFormat, ...);
int32_t SEGGER_RTT_printf(uint16_t BufferIndex, const char *sFormat, ...)
{
return 0;
}
......@@ -3,7 +3,79 @@
#include "TYW_stdint.h"
/******************************************************************************
K-LINE下线配置
******************************************************************************/
static struct
{
// HEX
uint8_t K_Line_LID20; /* 00 应对ECE R13 //0:非应对、1:应对 */
uint8_t K_Line_LID21; /* 00 EBS/ABS //0:无、1:EBS、2:ABS(CAN应对) 3:ABS (CAN非应对) */
uint8_t K_Line_LID22; /* 00 EVSC //0:无、1:有 */
uint8_t K_Line_LID23; /* 00 驻车锁定 //0:无、1:有 */
uint8_t K_Line_LID24; /* 00 HSA //0:无、1:有 */
uint8_t K_Line_LID25; /* 00 AEBS //0:无、1:有 */
uint8_t K_Line_LID26; /* 00 ACC //0:无、1:有 */
uint8_t K_Line_LID27; /* 00 LDWS //0:无、1:有 */
uint8_t K_Line_LID28; /* 00 车辆间报警 //0:无、1:有 */
uint8_t K_Line_LID29; /* 01 有无巡航 //0:无、1:有 /*初值1*/
uint8_t K_Line_LID2A; /* 00 气悬 //0:Reef、1:Rear air、2:Full air */
uint8_t K_Line_LID2B; /* 00 ISS //0:无、1: eco stop、 2:Idle Stop */
uint8_t K_Line_LID2C; /* 00 装货台工作警报蜂鸣//0:无、1:有 */
uint8_t K_Line_LID2D; /* 00 ROWS //0:无、1:ROWS有、2LOCAL警报有 */
uint8_t K_Line_LID2E; /* 00 行车记录仪 //0:模拟记录仪、1:数字记录仪或行车记录仪 */
uint8_t K_Line_LID2F; /* 00 车型 //0:单车、1:拖车、2:全拖车 */
uint8_t K_Line_LID30; /* 00 缓速器 //0:无、1:有(C&E)、2:有(F) */
uint8_t K_Line_LID31; /* -- 地图巡航 //0:无、1:有 */
uint8_t K_Line_LID32; /* 00 装货台种类 //0:一般、1:侧翼、2:倾倒 */
uint8_t K_Line_LID33; /* 01 SCR?DPD //0:SCR无/DPD有、1:SCR有/DPD有、2:SCR无/DPD无、3:SCR有/DPD无 /*初值1*/
uint8_t K_Line_LID34; /* 00 驻车种类 //0:FULL AIR、1:AOH /*初值1*/
uint8_t K_Line_LID35; /* -- 气压计 //0:2针式、1:1针式 */
uint8_t K_Line_LID36; /* -- 低压警报压 //0:一般输出(539kPa)、1:ADR(588kPa) */
uint8_t K_Line_LID37; /* -- 超限警报 //0:无、1:有 */
uint8_t K_Line_LID38; /* -- 速度警报 //0:无、1:有 */
uint8_t K_Line_LID39; /* 00 可变SLD //0:无、1:1车速、2:2车速 /*初值1*/
uint8_t K_Line_LID3A; /* -- OEM //0:ISZ、1:UDT */
uint8_t K_Line_LID3B; /* -- 预留 */
uint8_t K_Line_LID3C; /* -- 预留 */
uint8_t K_Line_LID3D; /* -- 预留 */
uint8_t K_Line_LID3E; /* 01 预留 //0:胎压功能未匹配 1:匹配 */
uint8_t K_Line_LID3F; /* -- 预留 */
uint8_t K_Line_LID40; /* 00 发动机种类 */
uint8_t K_Line_LID41; /* 10 变速器种类&控制 /*初值50*/
uint8_t K_Line_LID42; /* 00 驻车管道 /*初值 0*/
uint8_t K_Line_LID43; /* 82 车型 /*初值44*/
uint8_t K_Line_LID44; /* FF 速度警报 /*初值FF*/
uint8_t K_Line_LID45; /* FF 发动机转速 /*初值FF*/
uint8_t K_Line_LID46; /* FF 急加速 /*初值FF*/
uint8_t K_Line_LID47; /* FF 急减速 /*初值FF*/
uint8_t K_Line_LID48; /* FF 长时间怠速 /*初值FF*/
uint8_t K_Line_LID49; /* FF 辅助驻车 /*初值FF*/
uint8_t K_Line_LID4A; /* 32 变速箱油 5000 */
uint8_t K_Line_LID4B; /* 32 差速器油 5000 */
uint8_t K_Line_LID4C; /* 32 离合器油 */
uint8_t K_Line_LID4D; /* 64 动力转向油 10000 */
uint8_t K_Line_LID4E; /* 78 轮胎 12000 */
uint8_t K_Line_LID4F; /* 32 机油&滤清器 5000 */
uint8_t K_Line_LID50; /* -- 预留 */
uint8_t K_Line_LID51; /* 01 工作模式 */
uint8_t K_Line_LID52; /* 00 电子部件设定 */
uint8_t Reserved0;
uint8_t Reserved1;
uint8_t Reserved2;
uint8_t Reserved3;
uint8_t Reserved4;
uint8_t Reserved5;
} _EOL_K_LINE_SET;
extern _EOL_K_LINE_SET K_Line_Set;
extern void Common_DataInit(void);
extern void Common_Input_Para(void);
......@@ -18,38 +90,26 @@ extern uint16_t Common_Get_Act_V_Speed(void);
extern uint16_t Common_Get_Act_E_Speed(void);
extern uint16_t Common_Get_Disp_V_Speed(void);
extern uint16_t Common_Get_Disp_E_Speed(void);
extern uint8_t Common_Get_OverSpeed_Status(void);/*获取超速报警状态*/
extern uint8_t Common_Get_Disp_E_Status(void); /*获取转速不在经济区状态*/
extern uint8_t Common_Get_OverSpeed_Status(void); /*获取超速报警状态*/
extern uint8_t Common_Get_Disp_E_Status(void); /*获取转速不在经济区状态*/
extern DataValid_t Common_Get_Act_V_Speed_Valid(void);
extern DataValid_t Common_Get_Act_E_Speed_Valid(void);
extern DataValid_t Common_Get_Disp_V_Speed_Valid(void);
extern DataValid_t Common_Get_Disp_E_Speed_Valid(void);
uint16_t Common_Get_DispSpeed(void);
uint32_t Common_GetIgnOnTime(void); /*ms*/
uint32_t Common_GetIgnOffTime(void); /*ms*/
void Common_RollingCounterAdd(void);
void Common_RollingCounterClear(void);
void Common_BlockDelay(uint16_t m_MS);
uint16_t Common_ReadRollingCounter(void);
void Set_Can18FF5510_FirstRecv_Event(void);
void Set_Can18FF2300_FirstRecv_Event(void);
uint8_t Get_CanFirstRecv_Event(uint8_t ID);
uint8_t Get_CanFirstRecv_Event(uint8_t ID);
#endif
......@@ -72,23 +72,21 @@ void RTE_PWM_Set_Speed_Out(uint16_t m_Cycle, uint16_t m_Duty)
Fre_8_pulse = m_Cycle ;
Fre_8_pulse *= 25 ;
Fre_8_pulse /= 8 ;
//车速1//8脉冲
ActSetFreq=TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH10 , Fre_8_pulse ,m_Duty);
//TimerB_PWM_Channel_Duty_Set(TIMERB_2_CH10 , m_Duty );
ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH10 , Fre_8_pulse , m_Duty);
//车速2//25脉冲
ActSetFreq=TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH13 , m_Cycle ,m_Duty);
//TimerB_PWM_Channel_Duty_Set(TIMERB_2_CH13, m_Duty);
//车速3//25脉冲
ActSetFreq=TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH15 , m_Cycle ,m_Duty);
//TimerB_PWM_Channel_Duty_Set(TIMERB_2_CH15, m_Duty);
ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH13 , m_Cycle , m_Duty);
//车速3//25脉冲
ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH15 , m_Cycle , m_Duty);
}
void RTE_PWM_Set_Tacho_Out(uint16_t m_Cycle, uint16_t m_Duty)
{
uint32_t ActSetFreq;
//转速
ActSetFreq=TimerB_PWM_Channel_Fre_Set(TIMERB_0_CH7 , m_Cycle ,m_Duty);
ActSetFreq = TimerB_PWM_Channel_Fre_Set(TIMERB_0_CH7 , m_Cycle , m_Duty);
}
......@@ -174,8 +174,8 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010000ul, /*Pin_P16_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_0 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_0 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000041ul, /*Pin_P17_0 TAUB2O1 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000041ul, /*Pin_P17_0 TAUB2O1 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_1 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_1 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
......
......@@ -471,7 +471,6 @@
#define TEMP_W_LED_OUT GPIO_OUT_PORT16_PIN09
#define CD4051A_C_MCU_OUT GPIO_OUT_PORT16_PIN10
#define FUEL_W_LED_OUT GPIO_OUT_PORT16_PIN11
#define BL_PWM_OUT GPIO_OUT_PORT17_PIN00
#define BL_ACC_EN GPIO_OUT_PORT17_PIN01
#define CD4051A_COM4_MCU_IN GPIO_IN_PORT17_PIN02
#define CD4051A_COM5_MCU_IN GPIO_IN_PORT17_PIN03
......
......@@ -68,7 +68,7 @@ void TYW_FLASH_PreInit(void)
uint32_t spbcr = 0x00000100u;
uint32_t ckdly = 0xa5040001u;
uint32_t spodly = 0xa5000000u;
uint32_t cmncr = 0x8005000u;
uint32_t cmncr = 0x80005000u;
uint32_t smenr = 0x00005000u;
uint32_t smcmr = 0x00ff00ffu;
uint32_t smcr = 0x00000001u;
......@@ -280,9 +280,14 @@ void TYW_FLASH_Init(void)
uint32_t TEMP[2];
FLASH_MANUFACTURER_ID_t FlashType;
SFMA_DDR_Parameter_t SFMA_Parameter;
uint32_t i_count;
i_count=0;
Total_Begin:
i_count++;
if(i_count>=20)
{
goto End_Begin;
}
Flash_WaitNop(60);
TYW_FLASH_PreInit();
FlashType = SPI_NOR_Init();
......@@ -318,5 +323,7 @@ Total_Begin:
{
goto Total_Begin;
}
End_Begin:
i_count=0;
}
......@@ -504,11 +504,10 @@ static void TimerB_BackLight_Demo_Init(void)
//TimerB_PWM_Channel_Duty_Set(TIMERB_0_CH15, 0u);
TimerB_PWM_Channel_Start(TIMERB_0_CH15);
//8867_BL_PWM TFT背光
//TimerB_PWM_Channel_Init(TIMERB_1_CH10 , TIMERB_CLOCK_0 , TIMERB_HIGH );
//TimerB_PWM_Channel_Fre_Set(TIMERB_1_CH10 , 3000U , 0u);
//TimerB_PWM_Channel_Start(TIMERB_1_CH10 );
TimerB_PWM_Channel_Init(TIMERB_2_CH1 , TIMERB_CLOCK_0 , TIMERB_HIGH );
TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH1 , 3000U , 0u);
TimerB_PWM_Channel_Start(TIMERB_2_CH1 );
//水温白色
TimerB_PWM_Channel_Init(TIMERB_2_CH7, TIMERB_CLOCK_0, TIMERB_HIGH);
TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH7, 3000U, 0u);
......
......@@ -94,9 +94,9 @@ typedef enum
extern void TimerB_PWM_Init(void);
extern uint8_t TimerB_PWM_Channel_Init(TIMERB_Channel_en_t enTimerBChannel, TIMERB_Clock_en_t enTimerBClock, TIMERB_Polarity_en_t enTimerBPolarity);
extern uint32_t TimerB_PWM_Channel_Fre_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_t u16Fre, uint16_t u16Duty);
extern uint32_t TimerB_PWM_Channel_Fre_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_t u16Fre, uint16_t u16Duty);/*设置频率*/
/*占空比精度千分之一*/
extern void TimerB_PWM_Channel_Duty_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_t u16Duty);
extern void TimerB_PWM_Channel_Duty_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_t u16Duty);/*设置占空比*/
extern void TimerB_PWM_Channel_Start(TIMERB_Channel_en_t enTimerBChannel);
/*调用该函数后,仅重新调用开始函数功能即可正常使用*/
extern void TimerB_PWM_Channel_Stop(TIMERB_Channel_en_t enTimerBChannel);
......
......@@ -152,7 +152,7 @@ void Sys_Run_Mode_10ms_Tasks(void)
//Test_LED_AllLight();
Key_Service();
CAN_BUSOFF_Recover();
DisplayServices();
DisplayServices();
/*表头调度函数 added by yutian*/
UserGaugeSchedule();/*在主循环中调用*/
/*end*/
......@@ -168,7 +168,6 @@ void Sys_Run_Mode_10ms_Tasks(void)
/*==============================================================================
20ms周期执行任务
------------------------------------------------------------------------------*/
uint32_t heed;
void Sys_Run_Mode_20ms_Tasks(void)
{
Individual_ECU_Comm_Processing_Service();
......@@ -200,7 +199,7 @@ void Sys_Run_Mode_20ms_Tasks(void)
void Sys_Run_Mode_50ms_Tasks(void)
{
Data_Time_Calibration();
Data_Service_Gear_Processing();
Speed_PPK_Processing();
......@@ -270,7 +269,7 @@ void Sys_Sleep_Mode_Tasks(void)
void Sys_Exact_50us_Tasks(void)
{
static uint16_t PerCounter = 0u;
Sys_Rolling();·
Sys_Rolling();
COM_NM_Process();
COM_TX_Process();
DoCAN_Timer_Update(50);
......
File added
/**************************************************************************//**
* \file Analog_Signals.h
* \brief Analog signal processing
* \attention
*
* This file is automatically generated by analog signals configuration tool.
* Date : 2021/9/3 16:26:22
* Cfg Tool Ver : 1.1.0
* Engineer : wangboyu
* (c) Heilongjiang TYW electronics co., LTD
*
******************************************************************************/
#ifndef ANALOG_SIGNALS_H__
#define ANALOG_SIGNALS_H__
/* Includes -----------------------------------------------------------------*/
#include "ADC.h"
#include "Analog_Circuits.h"
/* C binding of definitions if building with C++ compiler */
#ifdef __cplusplus
extern {
#endif
/*! @{ */
/* Exported types ------------------------------------------------------------*/
enum ADCChName
{
ADC_CH_KL30_VOLTAGE = 0,
ADC_CH_PRIMARY_AIR_VOLTAGE,
ADC_CH_SECONDARY_AIR_VOLTAGE,
ADC_CH_FUEL_REF_VOLTAGE,
ADC_CH_FUEL_R,
ADC_CH_KEY,
ADC_CH_NTC_R,
};
/* Exported macro ------------------------------------------------------------*/
#define ADC_TOTAL_CH_NUMBER (7U)
#define ADC_SIGNAL_CH_NUMBER (7U)
#define ADC_REF_VOLTAGE u16ADCRefVoltage
/* Exported variables --------------------------------------------------------*/
extern volatile uint16_t u16ADCRefVoltage;
/* Exported functions --------------------------------------------------------*/
extern void Analog_Signal_Conv_Init(void);
extern void Analog_Signal_Conv_Stop(void);
extern void Analog_Signal_Conv_Service(void);
extern uint16_t ADC_Read_Signal(uint8_t u8ADCCh);
extern uint8_t ADC_Read_Signal_Valid(uint8_t u8ADCCh);
extern uint16_t ADC_Conv_Single_Channel(uint8_t u8ADCCh);
/*! @} */
#ifdef __cplusplus
}
#endif
#endif /* ANALOG_SIGNALS_H__ */
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -3284,7 +3284,7 @@
"pinName": "BL_PWM_OUT",
"pinAddress": "14A",
"wakeupPin": {
"pinModeName": "GPIO_OUT",
"pinModeName": "TAUB2O1",
"circuitName": "SCHMITT1",
"PINV": false,
"PODC": false,
......@@ -3294,18 +3294,18 @@
"PU": false,
"PD": false,
"PBDC": false,
"PIBC": true,
"PIBC": false,
"P": false,
"PPR": false,
"PMC": false,
"PMC": true,
"PIPC": false,
"PM": false,
"PFCAE": false,
"PFCE": false,
"PFC": false
"PFC": true
},
"sleepPin": {
"pinModeName": "GPIO_OUT",
"pinModeName": "TAUB2O1",
"circuitName": "SCHMITT1",
"PINV": false,
"PODC": false,
......@@ -3315,15 +3315,15 @@
"PU": false,
"PD": false,
"PBDC": false,
"PIBC": true,
"PIBC": false,
"P": false,
"PPR": false,
"PMC": false,
"PMC": true,
"PIPC": false,
"PM": false,
"PFCAE": false,
"PFCE": false,
"PFC": false
"PFC": true
},
"pinModeList": {
"GPIO_OUT": 65536,
......@@ -5173,7 +5173,7 @@
},
{
"pinID": "Pin_P42_8",
"pinName": "CD4051A_COM2_MCU_IN",
"pinName": "",
"pinAddress": " 2K",
"wakeupPin": {
"pinModeName": "TAUB0O15",
......
S0400000443A5CCFEEC4BF5C335A435C335A4320626F6F742073766E5C6272616E636865735C46452D337A615F76312E355C62696E5C50726F6A6563742E616273A9
S123C000CF2200C6055B134A8040FE4A80CBFE0002C015E20A0FE2001CE40FD000000907B4
S9030000FC
:02000004019F5A
:10000000F0F00FFF000FFF22FF33F66FFAAFCCFFC7
:10001000F0F0112302013F23F334F161F9AF2C4FCB
:00000001FF
S00F000050726F6A6563742E737265633E
S315019F0000F0F00FFF000FFF22FF33F66FFAAFCCFF21
S315019F0010F0F0112302013F23F334F161F9AF2C4F25
S70501ABD96411
\ No newline at end of file
S019000007473959573730313030303032354141202020202000CE
S123C0A00000000000000100000000000000010000000000000000000000000000800000FA
S9030000FC
\ No newline at end of file
S019000007473959573730313030303130304141202020202000C8
S31501A0000004F01FE5E47EA00170B58EB040F25770F2
S31501A00010009000208DF804009620ADF80800282055
S31501A00020ADF80A0001208DF8050028208DF80600FC
S31501A0003041F28830ADF80C002824DFF83C5A04AE12
S31501A0004022002900300001F0B0ED684601F01EFE45
S31501A000500EB070BD0020704710B40200EB24200042
S31501A000600C00611EE4B2002C12D014786040521C20
S31501A0007000242300DBB2082BF2DAC40704D5C0B2F0
S31501A00080400890F08C0001E0C0B240085B1CF1E78B
S31501A00090C0B210BC704738B50400E4B2002C01D040
S31501A000A000201BE0002542F21070854204DA00BF51
S31501A000B002F05BFF6D1CF6E702F084EF010072B659
S31501A000C0DFF8B809DFF8B8291060DFF8B009DFF862
S31501A000D0BC2C1060080002F07AEF012032BD2DE998
S31501A000E0F04385B004000D0016001F0002A80021F0
S31501A000F00022C0E90012DFF88C090078002800F080
S31501A00100B581DFF880090078012814D0C0F0AA8152
S31501A00110032873D050D3052800F0B480C0F0908096
S31501A00120072800F0F980C0F0D580092800F0798170
S31501A00130C0F0318196E105208DF8080071208DF877
S31501A00140090001208DF80A00FF208DF80B00002080
S31501A001508DF80C0001208DF80D0000208DF80E0001
S31501A0016000208DF80F0070787F2818D103208DF814
S31501A0017008007F208DF8090031208DF80A00722031
S31501A001808DF80B0000208DF80C0000208DF80D00D5
S31501A0019000208DF80E0000208DF80F0002E001204E
S31501A001A08DF80D005FF008080DF108094246494691
S31501A001B0300001F0FAEC55E105208DF80800712018
S31501A001C08DF8090002208DF80A00FF208DF80B009A
S31501A001D000208DF80C0004208DF80D0000208DF86C
S31501A001E00E0000208DF80F005FF008080DF1080938
S31501A001F042464946300001F0D8EC33E105208DF89E
S70501A07EE4F7
S00600004844521B
S32500003C006CA8C6016B876B83EC8B4949496B86EC8B6C840FF0100707C6026B83063CD61F2F
S32500003C2001008003063CCDC6077B0100063CCD1F010680FB1F010620091F010610041C014C
S32500003C400630790102C6067B010ACE0000EC8DC47F87B7067B010B720102EC8F7C010AC3CB
S32500003C6000086C8FEC8DC90089006C8D6982EC8427200F820109EE80E6307B010B200A7293
S32500003C800102EE80E6307B010A6E80EE84096E8420130F820107C6FF7B010B200872010201
S32500003CA0C6FF7B010A6282E682C10825C1C6807B01061F010680FB1F01062304C602200713
S32500003CC01F01061006C6036B8369876386E6862705E687041159E6831B880A1B963B1B9EE4
S32500003CE0C6016B8BC7876C896B886C8CC60B87ED8C13B745EC89E3E2CCAB6C89AC82254EAC
S32500003D00ECE2CCAB3BEC8BA3843BCC0000C20082003BEC84A3826C82CC0000E281A280ED38
S32500003D20E2CCA835EDE2CCA635B746EC866E8AB76516CD8AED86E3EACCA46C8CB754E9EA06
S32500003D40CCA3A9EACCA26C8AC6016B8E1B86EE8C086E8C8E00012404E68827900F8707029F
S32500003D60203F1E01008005C6077B01001F010680FBCC0A337B01067901027A010ACE0000F6
S32500003D80EC84C47F87B7067B010B720102EC867C010AC6807B01061F010680FB1F0106237F
S31800003DA004C60220071F01061004C6036B8BE68B1B8E0AFA
S503000EEE
S70500003C00BE
S31501A0000004F01FE5E067A001F8B504000D00160095
S31501A00010002701F097FF002007003800310080B2C9
S31501A0002089B2884208D20122BFB2E95914FA87F0EF
S31501A0003002F002F83F1DF0E7B6B2042096FBF0F1FC
S31501A0004000FB1160002806D00122BFB2E95D14FAB7
S31501A0005087F001F0F1FFF1BD10B5040000212000E9
S31501A0006002F04EF910BD01000020C9B201291DD030
S31501A00070C9B202291AD0C9B2032917D0C9B2052912
S31501A0008014D0C9B2102911D0C9B281290ED0C9B2D2
S31501A0009083290BD0C9B2852908D0C9B2902905D028
S31501A000A0C9B2D02902D0C9B2D12901D101221000E9
S31501A000B0C0B270470100C9B201291DD0C9B2022937
S31501A000C01AD0C9B2032917D0C9B2052914D0C9B209
S31501A000D0102911D0C9B281290ED0C9B283290BD05A
S31501A000E0C9B2852908D0C9B2902905D0C9B2D029EB
S31501A000F002D0C9B2D12900D10800C0B2704710B54B
S31501A001000400E4B2002C14D1DFF8880C007B00288F
S31501A001100BD1DFF8800CC07950F04000DFF8C41C89
S70501A0667C77
\ No newline at end of file
S224FE80003B34E6815B10EE8218EC0018871B840AB745EC0018870A3B34C7877C22127C22C4
S224FE802014EE82ED807D22127E22148680CE00F8168126221416811B250F16812EC380003A
S224FE80401889FF85168137206208168126221416811B250F16812EC3C0001889FF841681C4
S224FE806037204808168126221116811B250CFC2212FE2214C3FF8406810608168126221451
S224FE808016811B250F16812EC340001889FF831681372078081681262213077F250F16815B
S224FE80A02EC380001889FF82168137205F87CD4000BD221418BC2212220CCE7FFFBE2214E0
S224FE80C018BC2212241B87CEC000BE221418BC221222145343CE0000BC221418BE2212258A
S224FE80E0061C22137F20258680C7CE00FE0737222386BF53BC221418BE22122517FC221246
S224FE8100FE2214C3FF817C22127E2214FE2212FC221420041887B7541B840ACDBFFFBD223C
S224FE81201418BE22123DBC221418BE22123DFC2212B745FC22143D7E22127C22143D6BA958
S224FE8140E6F010260B8611C76C8552876C83200A8606C76C85CE00076E83186981EC8EE45A
S224FE816084A483EE8118A48CB746C7873B3BB76416FC3A2704C60320561F010680FBC63071
S224FE81807B0106790102C787EE8C1884007F18AA857E010A527B0102EE8E7E010AEE8A20BE
S224FE81A00C37527B0102EC317C010A3352E18023F0141016220010EFC6307B01061F010613
S224FE81C03004C60420091F01060303C60521C71B870A1B923B3BE6F01AC4076B88873BEC6B
S224FE81E0F01BA3806C88CC0000EEF019188200006E866B8BEE841B82182700D3E688277FDE
S224FE82001A8A34C6FF3BC6084A8222FC1B84E68887E3828C00082506C608E0882004E68350
S224FE8220C4076B89E688871A8A19E635ECF0173BE68D876E844A81FFFCC6016BA2EC873B4D
S224FE8240EC873BEC853BC6044A813EFE1B870441022054EC86C300086CF019EC84C900891F
S224FE8260006CF017E689873BEC84A3806C84E68A876C80C608A380E3F0176CF0171B82C640
S224FE8280555B3F585B3FEC828C0008253FC60137ECF01A3BECF01A3BECF01A3BC6044A816E
S224FE82A03EFE1B87044102205CEEF0151A086EF015ECF019C300086CF019ECF017C9008918
S224FE82C0006CF017EE821A186E8220B3046403C720331A8A34C6FF873BC6086E844A822231
S224FE82E0FCECA33BEEF01734EC864A81FFFCC6016BA2ECF01A3BECF01A3BEC853BC6044A5E
S224FE8300813EFE1B871BF0120A1B9AE689260A8612C76C84CEFFFE2008860AC76C84CEFF2A
S224FE8320F86E8286FF536C80FE2212FD221418E48218A4807E22127D22141F010680FBC6A3
S224FE8340307B0106790102C787FE22121884007F18AA847E010A527B0102FE22147E010AF5
S224FE8360141016220010EFC6307B01061F01063004C60420091F01060303C60521C71B865A
S205FE83800AEF
S9030000FC
\ No newline at end of file
S019000007473959573730313030303034344141202020202000CD
S123C0A00000000000000100000000000000010000000000000000000000000000800000FA
S9030000FC
\ No newline at end of file
File deleted
#new Option
#Mon Oct 18 14:25:02 CST 2021
=\=\=\=\=\=\=
IsSort=true
MergeFlashIsCompression=false
ChangeAppFilePath=
MergeCanXLSPath=
DBFFilePath=
MergeCrcTtpe=1
MergeBootFilePath=
IsMergeChangeAddress=false
MergeFlashOutPutFilePath=
GPIOOutPutPath=C\:\\Users\\de'l'l\\Desktop
MergeCanDBCPath=
IsFilling=true
RxID=729
MergeAudioInPutPath=
MergeAudioIndex=3
IsFastSend=true
MsgMaxBc=0
SoftwareVersion=0
MsgSTmin=0
MergeLineInOutPutPath=
Leave2ID=17
PHYID=721
BaudRate=500K
AppUpdateFilePath=
FUNID=7DF
IsMergeCreateBin=false
IsOverWrite=true
DllFilePath=
MergeAudioOutPutPath=
MergeCanOutPutPath=
ChangeOutPutFilePath=
MergeTelltalesOutPutPath=
MergeFlashIsMandatory=false
UpdateProcess=\u5409\u5229
MergeFlashImageFormat=
Driver=Kvaser
DriverFilePath=
IsMergeCreateHex=false
MergeFlashIsCreateREC=false
MergeImageFilePath=
IsMergeCreateUpdateBin=false
MergeImageSize=128M
CRCFilePath=
MergeFlashCompressionFormat=
IsPlayMusic=false
IsHexDisplay=true
MergeLineInXLSPath=
MergeFlashInPutFilePath=
MergeFlashIsInternal=false
MergeOutPutFilePath=
>>>>>>>=73e83be46b1b55508e3c026b2b9b9f58e9edb5f3
MergeAppFilePath=
MergeTelltalesXLSPath=
FillingByte=-86
ImageVersion=0
Leave1ID=1
MergeAudioPWMMax=2000
<<<<<<<=HEAD
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment