Skip to content

J
jiancetai
Commit 5b45145d authored by 郑萍's avatar 郑萍
Browse files
Options

Merge branch 'yedea_RS485' of... 

Merge branch 'yedea_RS485' of http://tyw-server.synology.me:12345/chenjiale/jiancetai into yadea_C011_jiancetai_z
parents e260a633 9ab5af10
Show whitespace changes
Inline Side-by-side
Showing with 401 additions and 419 deletions
source/R485_Communication_Matrix.c
View file @ 5b45145d
...@@ -3,14 +3,175 @@ ...@@ -3,14 +3,175 @@
void R485_Send_0x40(void) void R485_Send_0x40(void)
{ {
memset(R485_ID40h.Msg, 0, 64); memset(R485_ID40h.Msg, 0, 64);
switch (HJ_OtherKeyCurrent.count)
{
case 0:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 1;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 1;
R485_ID40h.Sig.FlowCode4th = 1;
R485_ID40h.Sig.ProductModel1 = 1;
break;
case 1:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 0;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 0;
R485_ID40h.Sig.FlowCode4th = 0;
R485_ID40h.Sig.ProductModel1 = 0;
break;
case 2:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 1;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 1;
R485_ID40h.Sig.FlowCode4th = 1;
R485_ID40h.Sig.ProductModel1 = 1;
break;
case 3:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 0;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 0;
R485_ID40h.Sig.FlowCode4th = 0;
R485_ID40h.Sig.ProductModel1 = 0;
break;
case 4:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 1;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 1;
R485_ID40h.Sig.FlowCode4th = 1;
R485_ID40h.Sig.ProductModel1 = 1;
break;
case 5:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 0;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 0;
R485_ID40h.Sig.FlowCode4th = 0;
R485_ID40h.Sig.ProductModel1 = 0;
break;
case 6:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 1;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 1;
R485_ID40h.Sig.FlowCode4th = 1;
R485_ID40h.Sig.ProductModel1 = 1;
break;
case 7:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 0;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 0;
R485_ID40h.Sig.FlowCode4th = 0;
R485_ID40h.Sig.ProductModel1 = 0;
break;
case 8:
R485_ID40h.Sig.BackupZoneMainSoftwareVer = 1;
R485_ID40h.Sig.BOOTSoftwareUnderlyingVer = 1;
R485_ID40h.Sig.FlowCode4th = 1;
R485_ID40h.Sig.ProductModel1 = 1;
break;
case 9:
break;
default:
break;
}
R485_Send(0x40, R485_ID40h.Msg, sizeof(R485_ID40h.Msg)); R485_Send(0x40, R485_ID40h.Msg, sizeof(R485_ID40h.Msg));
} }
void R485_Send_0x41(void) void R485_Send_0x41(void)
{ {
memset(R485_ID41h.Msg, 0, 64); memset(R485_ID41h.Msg, 0, 64);
R485_ID41h.Sig.AlarmStatus = 1; switch (HJ_OtherKeyCurrent.count)
R485_ID41h.Sig.ALMCommunicationStatus = 1; {
case 0:
break;
case 1:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x2; //电量
R485_ID41h.Sig.VehicleStatus = 0x3; //整车状态
R485_ID41h.Sig.SpeedGear = 0x2; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 2:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0xC3; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x1E; //电量
R485_ID41h.Sig.VehicleStatus = 0x3; //整车状态
R485_ID41h.Sig.SpeedGear = 0x3; //挡位
//功率暂空一会做
R485_ID41h.Sig.EleHeadlightFunctionSettings = 0x1; // 自动大灯
R485_ID41h.Sig.IOTRealTime_Hour = 0xB; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0xB; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 3:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0x186; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x2C; //电量
R485_ID41h.Sig.VehicleStatus = 0x3; //整车状态
R485_ID41h.Sig.SpeedGear = 0x1; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0x16; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0x16; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 4:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0x240; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x42; //电量
R485_ID41h.Sig.VehicleStatus = 0x3; //整车状态
R485_ID41h.Sig.SpeedGear = 0x0; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0xD; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 21; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 5:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0xC3; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x1E; //电量
R485_ID41h.Sig.VehicleStatus = 0x1; //整车状态
R485_ID41h.Sig.SpeedGear = 0x3; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 6:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0xC3; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x1E; //电量
R485_ID41h.Sig.VehicleStatus = 0x1; //整车状态
R485_ID41h.Sig.SpeedGear = 0x3; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 7:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0xC3; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x1E; //电量
R485_ID41h.Sig.VehicleStatus = 0x1; //整车状态
R485_ID41h.Sig.SpeedGear = 0x3; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 8:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0xC3; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x1E; //电量
R485_ID41h.Sig.VehicleStatus = 0x1; //整车状态
R485_ID41h.Sig.SpeedGear = 0x3; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 9:
R485_ID41h.Sig.ICMCalculatesVehicleSpeed = 0xC3; //速度 = (X * 0.512 * 3.14 * 1.05) / 30
R485_ID41h.Sig.TotalBatterySOC = 0x1E; //电量
R485_ID41h.Sig.VehicleStatus = 0x1; //整车状态
R485_ID41h.Sig.SpeedGear = 0x3; //挡位
//功率暂空一会做
R485_ID41h.Sig.IOTRealTime_Hour = 0; //时间：时
R485_ID41h.Sig.IOTRealTime_Minute = 0; //时间：分
R485_ID41h.Sig.IOTRealTime_Second = 0; //时间：秒
break;
case 10:
break;
default:
break;
}
R485_Send(0x41, R485_ID41h.Msg, sizeof(R485_ID41h.Msg)); R485_Send(0x41, R485_ID41h.Msg, sizeof(R485_ID41h.Msg));
} }
......
source/app/api_gpio/io_config.c
View file @ 5b45145d
...@@ -203,42 +203,110 @@ void Api_GPIO_Init(void) ...@@ -203,42 +203,110 @@ void Api_GPIO_Init(void)
} }
void ApiPowerSupply(void) void Line_Temp(void)
{ {
//�ϵ�ʱ�� switch (HJ_OtherKeyCurrent.count)
//DelayMs(6);//6ms {
case 0:
P_VCC4V2_EN_NEW(PortGpioLow);// P1_25 Pin97 LINE_LampLowON;
LINE_LampHighOFF;
//DelayMs(1000);//125ms LINE_weizhiOFF;
LINE_TurnLeftOFF;
P_3V3MCU_EN(PortGpioHigh);//64pin 104 LINE_TurnRightOFF;
LINE_ABSOFF;
//DelayMs(1500);//1500ms LINE_BLEOFF;
break;
P_VCC3V3_EN(PortGpioHigh);//106pin 200 case 1:
LINE_LampLowOFF;
//DelayMs(2);//1ms LINE_LampHighON;
LINE_weizhiOFF;
F_LCD_RESET(PortGpioHigh);//103pin 129 LINE_TurnLeftON;
LINE_TurnRightOFF;
F_LCD_STBYB(PortGpioHigh);//6pin 004 LINE_ABSOFF;
LINE_BLEOFF;
//DelayMs(1); break;
case 2:
P_1531_EN(PortGpioHigh); LINE_LampLowON;
LINE_LampHighOFF;
//DelayMs(115);//115ms LINE_weizhiON;
LINE_TurnLeftOFF;
P_61194_EN(PortGpioHigh);//125pin 213 LINE_TurnRightON;
LINE_ABSOFF;
P_APOWER_OUT(PortGpioHigh);//91pin 119 LINE_BLEOFF;
break;
NEW_F_Sound_EN(PortGpioHigh);//����ʹ�� case 3:
LINE_LampLowON;
P_BD12_EN(PortGpioHigh); LINE_LampHighOFF;
LINE_weizhiOFF;
P_TPA6211_EN(PortGpioHigh); LINE_TurnLeftOFF;
LINE_TurnRightOFF;
LINE_ABSOFF;
LINE_BLEOFF;
break;
case 4:
LINE_LampLowON;
LINE_LampHighOFF;
LINE_weizhiOFF;
LINE_TurnLeftOFF;
LINE_TurnRightOFF;
LINE_ABSOFF;
LINE_BLEOFF;
break;
case 5:
LINE_LampLowON;
LINE_LampHighOFF;
LINE_weizhiOFF;
LINE_TurnLeftOFF;
LINE_TurnRightOFF;
LINE_ABSOFF;
LINE_BLEOFF;
break;
case 6:
LINE_LampLowON;
LINE_LampHighOFF;
LINE_weizhiOFF;
LINE_TurnLeftOFF;
LINE_TurnRightOFF;
LINE_ABSON;
LINE_BLEOFF;
break;
case 7:
LINE_LampLowON;
LINE_LampHighOFF;
LINE_weizhiOFF;
LINE_TurnLeftOFF;
LINE_TurnRightOFF;
LINE_ABSOFF;
LINE_BLEON;
break;
case 8:
LINE_LampLowON;
LINE_LampHighOFF;
LINE_weizhiOFF;
LINE_TurnLeftOFF;
LINE_TurnRightOFF;
LINE_ABSOFF;
LINE_BLEOFF;
break;
case 9:
LINE_LampLowON;
LINE_LampHighON;
LINE_weizhiON;
LINE_TurnLeftON;
LINE_TurnRightON;
LINE_ABSON;
LINE_BLEON;
break;
default:
LINE_LampLowON;
LINE_LampHighOFF;
LINE_weizhiOFF;
LINE_TurnLeftOFF;
LINE_TurnRightOFF;
LINE_ABSOFF;
LINE_BLEOFF;
break;
}
} }
source/app/api_gpio/io_config.h
View file @ 5b45145d
...@@ -138,8 +138,28 @@ extern en_port_gpio_level_t BUTTON_GND_Signal3_IN; ...@@ -138,8 +138,28 @@ extern en_port_gpio_level_t BUTTON_GND_Signal3_IN;
extern en_port_gpio_level_t Can1Rx_IN; extern en_port_gpio_level_t Can1Rx_IN;
#define GET_CAN1_RX_IN_LEVEL Port_GetPortPinLevel(0, 27, &Can1Rx_IN) #define GET_CAN1_RX_IN_LEVEL Port_GetPortPinLevel(0, 27, &Can1Rx_IN)
#define LINE_LampLowON Port_SetPortPinLevel(2,5,PortGpioHigh)
#define LINE_LampLowOFF Port_SetPortPinLevel(2,5,PortGpioLow)
#define LINE_LampHighON Port_SetPortPinLevel(2,0,PortGpioHigh)
#define LINE_LampHighOFF Port_SetPortPinLevel(2,0,PortGpioLow)
#define LINE_weizhiON Port_SetPortPinLevel(1,25,PortGpioHigh)
#define LINE_weizhiOFF Port_SetPortPinLevel(1,25,PortGpioLow)
#define LINE_TurnLeftON Port_SetPortPinLevel(2,27,PortGpioLow)
#define LINE_TurnLeftOFF Port_SetPortPinLevel(2,27,PortGpioHigh)
#define LINE_TurnRightON Port_SetPortPinLevel(2,29,PortGpioLow)
#define LINE_TurnRightOFF Port_SetPortPinLevel(2,29,PortGpioHigh)
#define LINE_ABSON Port_SetPortPinLevel(1,24,PortGpioHigh)
#define LINE_ABSOFF Port_SetPortPinLevel(1,24,PortGpioLow)
#define LINE_BLEON Port_SetPortPinLevel(1,24,PortGpioHigh)
#define LINE_BLEOFF Port_SetPortPinLevel(1,24,PortGpioLow)
extern void Api_GPIO_Init(void); extern void Api_GPIO_Init(void);
extern void ApiPowerSupply(void); extern void Line_Temp(void);
#endif /* API_IOCONFIG_H_ */ #endif /* API_IOCONFIG_H_ */
// //
source/bsp_source/bsp_button/bsp_button.c
View file @ 5b45145d
...@@ -690,7 +690,7 @@ void Button_Statu_Manage(void) ...@@ -690,7 +690,7 @@ void Button_Statu_Manage(void)
if(Botton.Other.Time < 3000) if(Botton.Other.Time < 3000)
Botton.Other.Time += IntervalTimerDelta; Botton.Other.Time += IntervalTimerDelta;
if(Botton.Other.Time >= 1000 && Botton.S15.Flag == 1 && CheckClusterValid == 0u){ if(Botton.Other.Time >= 1000 && CheckClusterValid == 0u){
if(Botton.Other.Statu != 3) { if(Botton.Other.Statu != 3) {
Botton.Other.Statu = 2; Botton.Other.Statu = 2;
} }
...@@ -824,7 +824,7 @@ void Button_Statu_Manage(void) ...@@ -824,7 +824,7 @@ void Button_Statu_Manage(void)
//if (uart_send_flag==1) //if (uart_send_flag==1)
//{ //{
Mfs_Uart_Write(UART9_Type, g_butto_msg, 5, TRUE); // Mfs_Uart_Write(UART9_Type, g_butto_msg, 5, TRUE);
uart_send_flag=0; uart_send_flag=0;
//} //}
...@@ -832,13 +832,13 @@ void Button_Statu_Manage(void) ...@@ -832,13 +832,13 @@ void Button_Statu_Manage(void)
{ {
//LampState_L.Lamps.RELAY_B = 0; //LampState_L.Lamps.RELAY_B = 0;
//LampState_L.Lamps.RELAY_IGN1 = 0; //LampState_L.Lamps.RELAY_IGN1 = 0;
bsp_BD8379_WriteData(LampState_L.LampData, LampState_M.LampData); // bsp_BD8379_WriteData(LampState_L.LampData, LampState_M.LampData);
Delay(200); // Delay(200);
//LampState_L.Lamps.RELAY_B = 1; //LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1; //LampState_L.Lamps.RELAY_IGN1 = 1;
bsp_BD8379_WriteData(LampState_L.LampData, LampState_M.LampData); // bsp_BD8379_WriteData(LampState_L.LampData, LampState_M.LampData);
Delay(20); // Delay(20);
} }
} }
} }
...@@ -1078,342 +1078,7 @@ void APP_OIL_TEMP(void) //ȼ��ˮ�� ˮ�µı��ķ��ͷŵ��� ...@@ -1078,342 +1078,7 @@ void APP_OIL_TEMP(void) //ȼ��ˮ�� ˮ�µı��ķ��ͷŵ���
{ {
//Iol_TempCurrent.enable = 0; //Iol_TempCurrent.enable = 0;
} }
// switch (Iol_TempCurrent.count)
// {
// case 0:
// LampState_L.Lamps.RELAY_L4 = 0;
// LampState_L.Lamps.RELAY_F1 = 0;
// LampState_L.Lamps.RELAY_F2 = 0;
// LampState_L.Lamps.RELAY_F3 = 0;
// LampState_L.Lamps.RELAY_F4 = 0;
// LampState_L.Lamps.RELAY_L3 = 0;
// Iol_TempCurrent.statu = UNFINISH;
// break;
//
// case 1:
// if(Iol_TempCurrent.enable == 1)
// {
// LampState_L.Lamps.RELAY_B = 0;
// LampState_L.Lamps.RELAY_IGN1 = 0;
// if(Iol_TempCurrent.Time > 1000)
// {
// LampState_L.Lamps.RELAY_IGN1 = 1;
// LampState_L.Lamps.RELAY_B = 1;
// Iol_TempCurrent.enable = 0;
// }
// }
// LampState_L.Lamps.RELAY_L4 = 0;
// LampState_L.Lamps.RELAY_F1 = 1;//ȼ�Ϳյ� һ����˸
// LampState_L.Lamps.RELAY_F2 = 0;
// LampState_L.Lamps.RELAY_F3 = 0;
// LampState_L.Lamps.RELAY_F4 = 0;
// LampState_L.Lamps.RELAY_L3 = 0;
// //Gear_P();
// DisPlayCurChargingTime_H = 0106;
//
// Iol_TempCurrent.statu = UNFINISH;
// break;
// case 2:
// if(Iol_TempCurrent.enable == 1)
// {
// LampState_L.Lamps.RELAY_IGN1 = 0;
// LampState_L.Lamps.RELAY_B = 0;
// if(Iol_TempCurrent.Time > 1000)
// {
// LampState_L.Lamps.RELAY_IGN1 = 1;
// LampState_L.Lamps.RELAY_B = 1;
// Iol_TempCurrent.enable = 0;
// }
// }
// LampState_L.Lamps.RELAY_L4 = 0;
// LampState_L.Lamps.RELAY_F1 = 0;
// LampState_L.Lamps.RELAY_F2 = 1;//ȼ�ͱ����� һ��
// LampState_L.Lamps.RELAY_F3 = 0;
// LampState_L.Lamps.RELAY_F4 = 0;
// LampState_L.Lamps.RELAY_L3 = 0;
//Gear_R();
// #if (CAN_2ND)
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG1 ; //70.5
//#if (PRO_AI3)
// EMS_CNG11.msg.bits.CNG_FTL = CNG_SEG1;
//#elif ((PRO_CN7C) || (PRO_QYC))
// if(GetCluType() == SVC_CFG){
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG1_SVC;
// }
// else{
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG1;
// }
//#elif (PRO_CN7)
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG1 ; //62.25
// HEV_PC9.msg.bits.CR_Bms_DisplaySoc = SOC_WARNING1;
//#endif
//#endif
//#if (CAN_3RD)
//#if (PRO_NU2)
// if(GetCluType() == STD_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_EMPTY;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG1_STD;
// }
// else if(GetCluType() == SVC_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_EMPTY;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG1;
// }
//#elif (PRO_NX4C)
// if(GetCluType() == STD_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_WARNING;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG1;
// }
// else if(GetCluType() == SVC_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_WARNING_SVC;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG1;
// }
//#else
// BMS_02_100ms.xEV_SocDis = SOC_WARNING;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG1;
//#endif
//#endif
// Iol_TempCurrent.statu = UNFINISH;
// break;
// case 3://�������������
// if(Iol_TempCurrent.enable == 1)
// {
// LampState_L.Lamps.RELAY_IGN1 = 0;
// LampState_L.Lamps.RELAY_B = 0;
// if(Iol_TempCurrent.Time > 1000)
// {
// LampState_L.Lamps.RELAY_IGN1 = 1;
// LampState_L.Lamps.RELAY_B = 1;
// Iol_TempCurrent.enable = 0;
// }
// }
// LampState_L.Lamps.RELAY_L3 = 1;///ȼ������
// LampState_L.Lamps.RELAY_L4 = 0;
// LampState_L.Lamps.RELAY_F1 = 0;
// LampState_L.Lamps.RELAY_F2 = 0;
// LampState_L.Lamps.RELAY_F3 = 0;
// LampState_L.Lamps.RELAY_F4 = 0;
//#if (CAN_2ND)
// EMS12.msg.bits.TEMP_ENG = 0x85 ; //116.25
//#endif
//#if (CAN_3RD)
// BMS_02_100ms.xEV_SocDis = 0x3D;
// EMS_02_10ms.ENG_EngClntTempVal=0x82;
//#endif
// Iol_TempCurrent.statu = UNFINISH;
// break;
// case 3:
// // if(Iol_TempCurrent.enable == 1)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 0;
// // LampState_L.Lamps.RELAY_B = 0;
// // if(Iol_TempCurrent.Time > 1000)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 1;
// // LampState_L.Lamps.RELAY_B = 1;
// // Iol_TempCurrent.enable = 0;
// // }
// // }
// // LampState_L.Lamps.RELAY_L4 = 0;
// // LampState_L.Lamps.RELAY_F1 = 0;
// // LampState_L.Lamps.RELAY_F2 = 0;
// // LampState_L.Lamps.RELAY_F3 = 1;//ȼ������
// // LampState_L.Lamps.RELAY_F4 = 0;
// // LampState_L.Lamps.RELAY_L3 = 0;
//
// Gear_N();
//#if (CAN_2ND)
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG6 ; //120.75
//#if (PRO_AI3)
// EMS_CNG11.msg.bits.CNG_FTL = CNG_SEG6;
//#elif ((PRO_CN7C) || (PRO_QYC))
// if(GetCluType() == SVC_CFG){
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG6_SVC;
// }
// else{
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG6;
// }
//#elif (PRO_CN7)
// EMS12.msg.bits.TEMP_ENG = TEMP_SEG6 ; //62.25
// HEV_PC9.msg.bits.CR_Bms_DisplaySoc = SOC_MIDDLE1;
//#endif
//#endif
//#if (CAN_3RD)
//#if (PRO_NU2)
// if(GetCluType() == STD_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_EMPTY;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG6_STD;
// }
// else if(GetCluType() == SVC_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_EMPTY;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG6;
// }
//#elif (PRO_NX4C)
// if(GetCluType() == STD_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_MIDDLE;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG6;
// }
// else if(GetCluType() == SVC_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_MIDDLE_SVC;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG6;
// }
//#else
// BMS_02_100ms.xEV_SocDis = SOC_MIDDLE;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_SEG6;
//#endif
//#endif
// Iol_TempCurrent.statu = UNFINISH;
// break;
//
// case 4:
// // if(Iol_TempCurrent.enable == 1)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 0;
// // LampState_L.Lamps.RELAY_B = 0;
// // if(Iol_TempCurrent.Time > 1000)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 1;
// // LampState_L.Lamps.RELAY_B = 1;
// // Iol_TempCurrent.enable = 0;
// // }
// // }
// // LampState_L.Lamps.RELAY_L4 = 0;
// // LampState_L.Lamps.RELAY_F1 = 0;
// // LampState_L.Lamps.RELAY_F2 = 0;
// // LampState_L.Lamps.RELAY_F3 = 0;
// // LampState_L.Lamps.RELAY_F4 = 1;//ȼ������
// // LampState_L.Lamps.RELAY_L3 = 0;
//
// Gear_D();
//#if (CAN_2ND)
// EMS12.msg.bits.TEMP_ENG = TEMP_FULL ; //120.75
//#if (PRO_AI3)
// EMS_CNG11.msg.bits.CNG_FTL = CNG_FULL;
//#elif ((PRO_CN7C) || (PRO_QYC))
// if(GetCluType() == SVC_CFG){
// EMS12.msg.bits.TEMP_ENG = TEMP_FULL_SVC;
// }
// else{
// EMS12.msg.bits.TEMP_ENG = TEMP_FULL;
// }
//#elif (PRO_CN7)
// EMS12.msg.bits.TEMP_ENG = TEMP_FULL ; //62.25
// HEV_PC9.msg.bits.CR_Bms_DisplaySoc = SOC_FULL1;
//#endif
//#endif
//#if (CAN_3RD)
//#if (PRO_NU2)
// if(GetCluType() == STD_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_EMPTY;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_FULL_STD;
// }
// else if(GetCluType() == SVC_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_EMPTY;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_FULL;
// }
//#elif (PRO_NX4C)
// if(GetCluType() == STD_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_FULL;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_FULL;
// }
// else if(GetCluType() == SVC_CFG){
// BMS_02_100ms.xEV_SocDis = SOC_FULL_SVC;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_FULL;
// }
//#else
// BMS_02_100ms.xEV_SocDis = SOC_FULL;
// EMS_02_10ms.ENG_EngClntTempVal=TEMP_FULL;
//#endif
//#endif
// Iol_TempCurrent.statu = UNFINISH;
// break;
//#if (PRO_QYC)
// case 5:
// if(Iol_TempCurrent.enable == 1)
// {
// LampState_L.Lamps.RELAY_IGN1 = 0;
// LampState_L.Lamps.RELAY_B = 0;
// if(Iol_TempCurrent.Time > 1000)
// {
// LampState_L.Lamps.RELAY_IGN1 = 1;
// LampState_L.Lamps.RELAY_B = 1;
// Iol_TempCurrent.enable = 0;
// }
// }
// LampState_L.Lamps.RELAY_L4 = 0;
// LampState_L.Lamps.RELAY_F1 = 0;
// LampState_L.Lamps.RELAY_F2 = 0;
// LampState_L.Lamps.RELAY_F3 = 0;
// LampState_L.Lamps.RELAY_F4 = 1;//ȼ������
// LampState_L.Lamps.RELAY_L3 = 0;
// if(GetCluType() == SVC_CFG){
// EMS12.msg.bits.TEMP_ENG = TEMP_FULL_SVC;
// }
// else{
// EMS12.msg.bits.TEMP_ENG = TEMP_FULL_UP;
// }
// Iol_TempCurrent.statu = UNFINISH;
// break;
//#endif
// case 5://�������������
// // if(Iol_TempCurrent.enable == 1)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 0;
// // LampState_L.Lamps.RELAY_B = 0;
// // if(Iol_TempCurrent.Time > 1000)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 1;
// // LampState_L.Lamps.RELAY_B = 1;
// // Iol_TempCurrent.enable = 0;
// // }
// // }
// // LampState_L.Lamps.RELAY_L4 = 1;//ȼ�;Ÿ�
// // LampState_L.Lamps.RELAY_F1 = 0;
// // LampState_L.Lamps.RELAY_F2 = 0;
// // LampState_L.Lamps.RELAY_F3 = 0;
// // LampState_L.Lamps.RELAY_F4 = 0;
// // LampState_L.Lamps.RELAY_L3 = 0;
// // #if (CAN_2ND)
// // EMS12.msg.bits.TEMP_ENG = 0xdb ; //120.75
// // #endif
// // #if (CAN_3RD)
// // BMS_02_100ms.xEV_SocDis = 0x83;
// // EMS_02_10ms.ENG_EngClntTempVal=0xDB;
// // #endif
// // Iol_TempCurrent.statu = UNFINISH;
// Gear_OUT();
// break;
// case 6://�������������
// // if(Iol_TempCurrent.enable == 1)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 0;
// // LampState_L.Lamps.RELAY_B = 0;
// // if(Iol_TempCurrent.Time > 1000)
// // {
// // LampState_L.Lamps.RELAY_IGN1 = 1;
// // LampState_L.Lamps.RELAY_B = 1;
// // Iol_TempCurrent.enable = 0;
// // }
// // }
// // LampState_L.Lamps.RELAY_L4 = 1;//ȼ�;Ÿ�
// // LampState_L.Lamps.RELAY_F1 = 0;
// // LampState_L.Lamps.RELAY_F2 = 0;
// // LampState_L.Lamps.RELAY_F3 = 0;
// // LampState_L.Lamps.RELAY_F4 = 0;
// // LampState_L.Lamps.RELAY_L3 = 0;
// // #if (CAN_2ND)
// // EMS12.msg.bits.TEMP_ENG = 0xdb ; //120.75
// // #endif
// // #if (CAN_3RD)
// // BMS_02_100ms.xEV_SocDis = 0x83;
// // EMS_02_10ms.ENG_EngClntTempVal=0xDB;
// // #endif
// // Iol_TempCurrent.statu = UNFINISH;
// //SpeedRpmMax();
// APP_END();
// break;
// }
} }
void ProjectDynamicConfig(void) void ProjectDynamicConfig(void)
...@@ -2580,44 +2245,44 @@ uint8_t laohuaflag = 0; ...@@ -2580,44 +2245,44 @@ uint8_t laohuaflag = 0;
uint16_t laohuatime = 0; uint16_t laohuatime = 0;
void laohuafun() void laohuafun()
{ {
if(laohuaflag == 0) { // if(laohuaflag == 0) {
laohuaflag = 1; // laohuaflag = 1;
switch(HJ_OtherKeyCurrent.count) // switch(HJ_OtherKeyCurrent.count)
{ // {
case 1: // case 1:
laohuatime = 5000; // laohuatime = 5000;
break; // break;
case 2: // case 2:
laohuatime = 10000; // laohuatime = 10000;
break; // break;
case 3: // case 3:
laohuatime = 15000; // laohuatime = 15000;
break; // break;
case 4: // case 4:
laohuatime = 18000; // laohuatime = 18000;
break; // break;
case 5: // case 5:
laohuatime = 5000; // laohuatime = 5000;
break; // break;
case 6: // case 6:
laohuatime = 5000; // laohuatime = 5000;
break; // break;
} // }
if(HJ_OtherKeyCurrent.count > 6) { // if(HJ_OtherKeyCurrent.count > 6) {
laohuatime = 500; // laohuatime = 500;
} // }
//laohuatime = 15000; // //laohuatime = 15000;
Othercount = 0; // Othercount = 0;
} // }
if(laohuatime == 0){ // if(laohuatime == 0){
HJ_OtherKeyCurrent.count ++; // HJ_OtherKeyCurrent.count ++;
if(HJ_OtherKeyCurrent.count > 12) { // if(HJ_OtherKeyCurrent.count > 12) {
HJ_OtherKeyCurrent.count = 1; // HJ_OtherKeyCurrent.count = 1;
} // }
laohuaflag = 0; // laohuaflag = 0;
} // }
} }
void HJ_SwitchSecondPage() void HJ_SwitchSecondPage()
...@@ -3020,6 +2685,7 @@ void Stage_Manage() ...@@ -3020,6 +2685,7 @@ void Stage_Manage()
// DOWNKeyCurrent.count ++; // DOWNKeyCurrent.count ++;
g_Stage = STAGE_Other; g_Stage = STAGE_Other;
HJ_OtherKeyCurrent.count ++; HJ_OtherKeyCurrent.count ++;
Line_Temp();
ClearOtherSWFlagFun(); ClearOtherSWFlagFun();
ClearOtherFlagFun(); ClearOtherFlagFun();
Othercount = 0; Othercount = 0;
......
source/main.c
View file @ 5b45145d
...@@ -821,8 +821,8 @@ void CANInit(void) ...@@ -821,8 +821,8 @@ void CANInit(void)
g_UI_Language = NewData.Data2; g_UI_Language = NewData.Data2;
#endif #endif
g_UI_SWHW = NewData.Data3; g_UI_SWHW = NewData.Data3;
UART_PORT_init(); // UART_PORT_init();
UART_init(); // UART_init();
HU_USM_E_04.CF_AVN_CluVoiceVolume = 0x3; HU_USM_E_04.CF_AVN_CluVoiceVolume = 0x3;
BarcodePartNumOffect = 14; BarcodePartNumOffect = 14;
// Mfs_Uart_Write(UART0_Type, StartBuf, 8, TRUE); // Mfs_Uart_Write(UART0_Type, StartBuf, 8, TRUE);
......
tools/iar_ewarm/standalone_tcflash/objs/S6J3360_template_iar_ewarm.pbd.linf 0 → 100644
View file @ 5b45145d
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\S6J3360_template_iar_ewarm.pbd.linf
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\adc12b.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\adc12b_driver.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\api_adc.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\api_can_2nd.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\api_can_3rd.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\api_capture.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\api_RS485.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\api_timer.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\api_workflash.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\app_tft.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_app_AUTO.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_app_ELSE.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_app_END.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_app_EOL.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_app_led_output.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_app_led_QX23.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_app_tft_output.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_bd8379.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_bt_rlt.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_bt_rlt_driver.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_button.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_ddrhsspi.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_dma.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_eeprom_Interface.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_eic.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_mfs_uart.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_mfs_uart_driver.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_motor.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_port.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_Presskey.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_pwm.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_rtc.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_speed_check.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_sysctrl.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bsp_system.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\bt_pwm_driver.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\can.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\can_2nd.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\can_3rd.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\CAN_CFG.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\canfd_320_driver.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\cpu.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\DCC_Write.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\DTC.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\exceptions.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\hsspi_flash.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\interrupts.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\io_config.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\JLINKDCC_Process.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\LCD_BUS_Interface.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\LCD_C035QAN02.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\main.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\MM_Can_TP.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\NM_Interface.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\NM_protocol.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\ProjectConfig.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\PWM.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\R485_Communication_Matrix.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\ScanQrCodeConfig.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\sound.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\start.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\tcflash.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\Traveo_template_version.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\UDS_Service.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\workflash.pbi
D:\share\yedeą\jiancetai\tools\iar_ewarm\standalone_tcflash\objs\WorkFlashInterFace.pbi
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