Commit 305e954a authored by 陈家乐's avatar 陈家乐

🎉 init:润通草地车老化台

parent 519d8cf2
......@@ -28,7 +28,7 @@ void Api_CAN_Init(void)
CANBTR1_TSEG_20 = Seg2_2Tq;
CANBTR0_SJW = SJW_1Tq; //重新同步
CANBTR1_SAMP = SAMP_1;
CANBTR0_BRP = 0x00; //0 500K 1 250K
CANBTR0_BRP = 0x01; //0 500K 1 250K
CANIDAC_IDAM = IDAM_2_32Bit;
......
......@@ -99,19 +99,25 @@ void Format_CAN_Msg()
CanMsg_37B.ID = 0x37B;
CanMsg_12B.ID = 0x12B;
CanMsg_402.ID = 0x402;
CanMsg_18202922.ID = 0x18202922;
CanMsg_125.ID = 0x125;
CanMsg_101.Length = 8;
CanMsg_111.Length = 8;
CanMsg_37B.Length = 8;
CanMsg_12B.Length = 8;
CanMsg_402.Length = 8;
CanMsg_18202922.Length = 8;
CanMsg_125.Length = 8;
CanMsg_101.ID_EN = 1;
CanMsg_111.ID_EN = 1;
CanMsg_37B.ID_EN = 1;
CanMsg_12B.ID_EN = 1;
CanMsg_402.ID_EN = 1;
CanMsg_18202922.ID_EN = 1;
CanMsg_125.ID_EN = 1;
}
void Disable_CAN_Tx(void){
......@@ -148,22 +154,27 @@ void App_Can_Proc(void)
}
if(GetCtrlTime(CANMsgSend_10ms) >= 10){
ClearCtrlTime(CANMsgSend_10ms);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_101);
Clear_CAN_Msg((CAN_message *)&CanMsg_101);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_111);
Clear_CAN_Msg((CAN_message *)&CanMsg_111);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_37B);
Clear_CAN_Msg((CAN_message *)&CanMsg_37B);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_12B);
Clear_CAN_Msg((CAN_message *)&CanMsg_12B);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_402);
Clear_CAN_Msg((CAN_message *)&CanMsg_402);
if(GetCtrlTime(CANMsgSend_100ms) >= 10){
// ClearCtrlTime(CANMsgSend_10ms);
//bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_101);
// Clear_CAN_Msg((CAN_message *)&CanMsg_101);
//
//bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_111);
// Clear_CAN_Msg((CAN_message *)&CanMsg_111);
//
//bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_37B);
// Clear_CAN_Msg((CAN_message *)&CanMsg_37B);
//
//bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_12B);
// Clear_CAN_Msg((CAN_message *)&CanMsg_12B);
//
//bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_402);
// Clear_CAN_Msg((CAN_message *)&CanMsg_402);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_18202922);
Clear_CAN_Msg((CAN_message *)&CanMsg_18202922);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_125);
Clear_CAN_Msg((CAN_message *)&CanMsg_125);
//bReturn = Api_CANSendFrame((CAN_message *)&CanMessageID18FEDCD5);
//bReturn = Api_CANSendFrame((CAN_message *)&CanMessageID18FEDED5);
......@@ -235,6 +246,8 @@ void App_Can_Proc(void)
CurValueStr[ISG_Power ].val = 0;
CurValueStr[ISG_Power_Enable ].val = 0;
CurValueStr[ECU_Warning_Lamp ].val = 0;
CurValueStr[MMCU_PowerMode ].val = 0;
CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
CurValueStr[ENUM_RSpeed ].fval = Value_Plus;
......@@ -244,6 +257,7 @@ void App_Can_Proc(void)
CurValueStr[ISG_Power ].fval = Value_Plus;
CurValueStr[ISG_Power_Enable ].fval = Value_Plus;
CurValueStr[ECU_Warning_Lamp ].fval = 1;
CurValueStr[MMCU_PowerMode ].fval = 1;
......
This diff is collapsed.
......@@ -50,6 +50,14 @@ enum
ABS_Warning_Lamp,
ECU_Warning_Lamp,
//MBMS_TOTALSigCharg, //充电指示灯
MMCU_PowerMode, //125
MMCU_TravelSpeedGear,
MMCU_SeatDetectState,
MMCU_ParkingGearState,
CAN_List_Num ,
};
......@@ -72,6 +80,17 @@ static const s_CAN_List CAN_List[] =
{&CanMsg_402, 7, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECU_Warning_Lamp ], Motorola},
//{&CanMsg_18202922, 0, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[MBMS_TOTALSigCharg ], Motorola},
{&CanMsg_125, 0, 2, 4, 0, Offset_Plus, 1, 1, &CurValueStr[MMCU_PowerMode ], Motorola},
{&CanMsg_125, 1, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[MMCU_TravelSpeedGear ], Motorola},
{&CanMsg_125, 2, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[MMCU_SeatDetectState ], Motorola},
{&CanMsg_125, 2, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[MMCU_ParkingGearState ], Motorola},
};
......
......@@ -113,6 +113,8 @@
EXTERN_VAR CAN_message CanMsg_111;
EXTERN_VAR CAN_message CanMsg_37B;
EXTERN_VAR CAN_message CanMsg_402;
EXTERN_VAR CAN_message CanMsg_18202922;
EXTERN_VAR CAN_message CanMsg_125;
extern CAN_message CanMsg_101;
......
......@@ -45,6 +45,13 @@ NV_AUTO_ID=1
[USBDM]
COMSETTINGS=SETCOMM DRIVER NOPROTOCOL NOPERIODICAL
NV_PARAMETER_FILE=
NV_PARAMETER_FILE=C:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu02F2.fpp
NV_SAVE_WSP=0
NV_AUTO_ID=1
[Recent Layout File List]
File0=C_layout.hwl
File1=
File2=
File3=
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