Compare commits
1 Commits
car-4while
...
base
| Author | SHA1 | Date | |
|---|---|---|---|
| f9b7dbe1ed |
File diff suppressed because one or more lines are too long
13
User.c
13
User.c
@@ -361,10 +361,6 @@ void CanRXTX(void)
|
||||
|
||||
CanTX();
|
||||
|
||||
if(vcu_can_cnt == vcu_can_last)//数据一样表示故障
|
||||
{
|
||||
flg_wake_ecu = FAULT;
|
||||
|
||||
if(1 == flg_KGF)//等待KGF唤醒后再发送数据
|
||||
{
|
||||
un_inf_can_kgf_output3.bit_data.KGF01 = un_sample_kgf_command.bit_data.KGF01_CH01_Reserve | un_inf_can_kgf_output1.bit_data.KGF01;
|
||||
@@ -405,6 +401,10 @@ void CanRXTX(void)
|
||||
canSendTo(DF_SwTxKGF2,(ubyte *)&un_inf_can_kgf_output4.arr[0]);
|
||||
|
||||
}
|
||||
|
||||
if(vcu_can_cnt == vcu_can_last)//数据一样表示故障
|
||||
{
|
||||
flg_wake_ecu = FAULT;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -413,15 +413,14 @@ void CanRXTX(void)
|
||||
}
|
||||
|
||||
GetTemp();//1s采集一次温度
|
||||
UnSwSample_1.bit_data.emergency_stop_switch = 0;
|
||||
UnSwSample_1.bit_data.High_voltage_switch = 1;
|
||||
UnSwSample_1.bit_data.emergency_stop_switch = STOP_PIN;
|
||||
UnSwSample_1.bit_data.High_voltage_switch = ~WAKE_UP_PIN;
|
||||
UnSwSample_1.bit_data.CH03 = flg_wake_ecu;
|
||||
|
||||
if(1 == flg_KGF)//等待KGF唤醒后再发送数据
|
||||
{
|
||||
canSendTo(DF_SwTxTemp,(ubyte *)&UnSwSample_1.arr[0]); //不需要发送 小车不需要采集
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if( (0x40 == can_error_cnt) || (0x80 == can_error_cnt) )//20250625判断是否出现总线错误
|
||||
|
||||
6
user.H
6
user.H
@@ -16,12 +16,12 @@
|
||||
#define dfPwmH 10 //PWM<57>ĸߵ<C4B8>ƽʱ<C6BD>䣬10<31><30>10ms<6D><73><EFBFBD>ң<EFBFBD><D2A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>20181227
|
||||
|
||||
|
||||
#define WAKE_UP_PIN P1_5 //<2F><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
#define WAKE_UP_PIN P1_4 //<2F><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
#define KGF_PIN P0_0 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
#define CAN_PIN P1_6 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
#define STOP_PIN P3_6 //<2F><>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
#define STOP_PIN P1_2 //<2F><>ͣ<EFBFBD><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
#define BATTERY_PIN P0_0 //<2F><><EFBFBD>ؿ<EFBFBD><D8BF>ƽ<EFBFBD>
|
||||
#define BATTERY_PIN P3_6 //<2F><><EFBFBD>ؿ<EFBFBD><D8BF>ƽ<EFBFBD>
|
||||
|
||||
#define ON 0 //<2F><><EFBFBD><EFBFBD>
|
||||
#define OFF 1 //<2F>ɿ<EFBFBD>
|
||||
|
||||
Reference in New Issue
Block a user