diff --git a/CAN.C b/CAN.C index 997c8a4..5df587b 100644 --- a/CAN.C +++ b/CAN.C @@ -942,11 +942,11 @@ void CAN_vInit(void) /// - priority class 3; transmit acceptance filtering is based on the list /// order (like class 1) /// - extended 29-bit identifier - /// - identifier 29-bit: 0x14000001 + /// - identifier 29-bit: 0x11000001 - //--------------MOAR13 = 0xF4000001--------------------------------------- + //--------------MOAR13 = 0xF1000001--------------------------------------- - CAN_vWriteAMData(0xF4000001); // load MO13 arbitration register + CAN_vWriteAMData(0xF1000001); // load MO13 arbitration register // CAN Address pointing to the CAN_MODATAH13 CAN_ADCON = ADR_DEC; // Auto Decrement the current address(-1) diff --git a/User.c b/User.c index de5b6de..9cdba7e 100644 --- a/User.c +++ b/User.c @@ -39,7 +39,7 @@ ubyte can_error_flg = 0; //----------------------------------------------------------------------- -//RTC定时器 +//RTC定时器 890-= //----------------------------------------------------------------------- void RTCProcess(void) { @@ -312,7 +312,7 @@ void CanRXTX(void) } //休眠处理 - SystemStateMachine(&sleepstate); +// SystemStateMachine(&sleepstate); 不需要休眠处理,上电直接都上电。 //1000ms发送一帧 @@ -343,23 +343,34 @@ void CanRXTX(void) { flg_wake_ecu = FAULT; - un_inf_can_kgf_output2.bit_data.KGF01 = 0x01;// 计算机 - un_inf_can_kgf_output2.bit_data.KGF02 = 0x01;// 计算机 - un_inf_can_kgf_output2.bit_data.KGF15 = 0x01;// 计算机 - un_inf_can_kgf_output2.bit_data.KGF16 = 0x01;// 计算机 + // un_inf_can_kgf_output2.bit_data.KGF01 = 0x01;// 计算机 + // un_inf_can_kgf_output2.bit_data.KGF02 = 0x01;// 计算机 + // un_inf_can_kgf_output2.bit_data.KGF15 = 0x01;// 计算机 + // un_inf_can_kgf_output2.bit_data.KGF16 = 0x01;// 计算机 - un_inf_can_kgf_output2.bit_data.KGF03 = 0x01;// 遥控器 - un_inf_can_kgf_output2.bit_data.KGF05 = 0x01;// 网络交换机 - un_inf_can_kgf_output2.bit_data.KGF06 = 0x01;// 网络交换机 + // un_inf_can_kgf_output2.bit_data.KGF03 = 0x01;// 遥控器 + // un_inf_can_kgf_output2.bit_data.KGF05 = 0x01;// 网络交换机 + // un_inf_can_kgf_output2.bit_data.KGF06 = 0x01;// 网络交换机 - un_inf_can_kgf_output2.bit_data.KGF04 = 0x01;//KGF20接的主控 - - + // un_inf_can_kgf_output2.bit_data.KGF04 = 0x01;//KGF20接的主控 + + un_inf_can_kgf_output1.bit_data.KGF01 = 0x01; // E3 + un_inf_can_kgf_output1.bit_data.KGF02 = 0x01; // 导航仪 + un_inf_can_kgf_output1.bit_data.KGF03 = 0 ; // 导航仪 + un_inf_can_kgf_output1.bit_data.KGF05 = 0x01; // 交换机、路由器 + un_inf_can_kgf_output1.bit_data.KGF06 = 0x01; // 交换机、路由器 + un_inf_can_kgf_output1.bit_data.KGF07 = 0x01; // 计算机 + un_inf_can_kgf_output1.bit_data.KGF08 = 0x01; // 计算机 + un_inf_can_kgf_output1.bit_data.KGF09 = 0x01; // 上装 + un_inf_can_kgf_output1.bit_data.KGF11 = 0x01; // 上装 + un_inf_can_kgf_output1.bit_data.KGF12 = 0x01; // 待定 + un_inf_can_kgf_output1.bit_data.KGF15 = 0x01; // 网络摄像头 + un_inf_can_kgf_output1.bit_data.KGF16 = 0x01; // 遥控器 if(1 == flg_KGF)//等待KGF唤醒后再发送数据 { - canSendTo(DF_SwTxKGF2,(ubyte *)&un_inf_can_kgf_output2.arr[0]); -// canSendTo(DF_SwTxKGF1,(ubyte *)&un_inf_can_kgf_output1.arr[0]); +// canSendTo(DF_SwTxKGF2,(ubyte *)&un_inf_can_kgf_output2.arr[0]); + canSendTo(DF_SwTxKGF1,(ubyte *)&un_inf_can_kgf_output1.arr[0]); } } else @@ -375,7 +386,7 @@ void CanRXTX(void) if(1 == flg_KGF)//等待KGF唤醒后再发送数据 { - canSendTo(DF_SwTxTemp,(ubyte *)&UnSwSample_1.arr[0]); +// canSendTo(DF_SwTxTemp,(ubyte *)&UnSwSample_1.arr[0]); //不需要发送 小车不需要采集 } }