Commit 3eee5b42 authored by 张久成's avatar 张久成

feat: M27老化台

parent a0a7d08f
......@@ -94,61 +94,65 @@ void Set_CAN_CRC(CAN_message * CanMessage){
*/
void Format_CAN_Msg()
{
CanMsg_101.ID = 0x101;
CanMsg_111.ID = 0x111;
CanMsg_37B.ID = 0x37B;
CanMsg_12B.ID = 0x12B;
CanMsg_402.ID = 0x402;
CanMsg_18202922.ID = 0x18202922;
CanMsg_125.ID = 0x125;
CanMsg_157.ID = 0x157;
CanMsg_SOC.ID = 0x18203020;
CanMsg_SOC1.ID = 0x18200A20;
CanMsg_SOC2.ID = 0x18200A21;
CanMsg_38E.ID = 0x38E;
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_157.Length = 8;
CanMsg_SOC.Length = 8;
CanMsg_SOC1.Length = 8;
CanMsg_SOC2.Length = 8;
CanMsg_38E.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;
CanMsg_157.ID_EN = 1;
CanMsg_SOC.ID_EN = 1;
CanMsg_SOC1.ID_EN = 1;
CanMsg_SOC2.ID_EN = 1;
CanMsg_38E.ID_EN = 1;
CanMsg_0A31FFE8.ID = 0x0A31FFE8;
CanMsg_0A30FFE8.ID = 0x0A30FFE8;
// CanMsg_111.ID = 0x111;
// CanMsg_37B.ID = 0x37B;
// CanMsg_12B.ID = 0x12B;
// CanMsg_18202922.ID = 0x18202922;
// CanMsg_125.ID = 0x125;
// CanMsg_157.ID = 0x157;
// CanMsg_SOC.ID = 0x18203020;
// CanMsg_SOC1.ID = 0x18200A20;
// CanMsg_SOC2.ID = 0x18200A21;
// CanMsg_38E.ID = 0x38E;
CanMsg_0A31FFE8.Length = 8;
CanMsg_0A30FFE8.Length = 8;
// CanMsg_111.Length = 8;
// CanMsg_37B.Length = 8;
// CanMsg_12B.Length = 8;
// CanMsg_18202922.Length = 8;
// CanMsg_125.Length = 8;
// CanMsg_157.Length = 8;
// CanMsg_SOC.Length = 8;
// CanMsg_SOC1.Length = 8;
// CanMsg_SOC2.Length = 8;
// CanMsg_38E.Length = 8;
CanMsg_0A31FFE8.ID_EN = 1;
CanMsg_0A30FFE8.ID_EN = 1;
// CanMsg_111.ID_EN = 1;
// CanMsg_37B.ID_EN = 1;
// CanMsg_12B.ID_EN = 1;
// CanMsg_18202922.ID_EN = 1;
// CanMsg_125.ID_EN = 1;
// CanMsg_157.ID_EN = 1;
// CanMsg_SOC.ID_EN = 1;
// CanMsg_SOC1.ID_EN = 1;
// CanMsg_SOC2.ID_EN = 1;
// CanMsg_38E.ID_EN = 1;
}
void Disable_CAN_Tx(void){
CanMsg_101.ID_EN = 0;
CanMsg_111.ID_EN = 0;
CanMsg_37B.ID_EN = 0;
CanMsg_402.ID_EN = 0;
CanMsg_12B.ID_EN = 0;
CanMsg_402.ID_EN = 0;
CanMsg_18202922.ID_EN = 0;
CanMsg_125.ID_EN = 0;
CanMsg_157.ID_EN = 0;
CanMsg_SOC.ID_EN = 0;
CanMsg_SOC1.ID_EN = 0;
CanMsg_SOC2.ID_EN = 0;
CanMsg_0A31FFE8.ID_EN = 0;
CanMsg_0A30FFE8.ID_EN = 0;
// CanMsg_111.ID_EN = 0;
// CanMsg_37B.ID_EN = 0;
// CanMsg_12B.ID_EN = 0;
// CanMsg_402.ID_EN = 0;
// CanMsg_18202922.ID_EN = 0;
// CanMsg_125.ID_EN = 0;
// CanMsg_157.ID_EN = 0;
// CanMsg_SOC.ID_EN = 0;
// CanMsg_SOC1.ID_EN = 0;
// CanMsg_SOC2.ID_EN = 0;
}
void Set_Pin(INT16U pin)
......@@ -178,20 +182,22 @@ 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_0A31FFE8);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A31FFE8);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_0A30FFE8);
Clear_CAN_Msg((CAN_message *)&CanMsg_0A30FFE8);
//
//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_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);
......@@ -282,7 +288,7 @@ void App_Can_Proc(void)
//
//
CurValueStr[ENUM_VSpeed ].fval = Value_Plus;
CurValueStr[ENUM_RSpeed ].fval = Value_Plus;
// CurValueStr[ENUM_RSpeed ].fval = Value_Plus;
//CurValueStr[ENUM_WaterTemp ].fval = Value_Plus;
//CurValueStr[TCS_Warning_Lamp ].fval = Value_Plus;
//CurValueStr[TCS_Work_Mode ].fval = Value_Plus;
......
......@@ -101,7 +101,7 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
// Disable_CAN_Tx();
// CAN_lost_flag = 0;
// }
CurValueStr[ECU_Warning_Lamp ].val = 0;
CurValueStr[ABS_Warning_Lamp ].val = 0;
CurValueStr[TCS_Warning_Lamp ].val = 0;
//if(count_flag_a==1)
{//Format_CAN_Msg();
......@@ -115,71 +115,66 @@ void APP_ICM_Proc(void) /*zh321*/ /*FS04*/
#if 1
case 0:
CurValueStr[ENUM_VSpeed ].val = 0;//VSpeed(20);
CurValueStr[ENUM_RSpeed ].val = 0;
CurValueStr[ENUM_VSpeed ].val = 0;
break;
case 1:
{
CurValueStr[ENUM_VSpeed ].val = VSpeed(20);
CurValueStr[ENUM_RSpeed ].val = 1000;
}break;
case 2:
{
CurValueStr[ENUM_VSpeed ].val = VSpeed(40);
CurValueStr[ENUM_RSpeed ].val = 2000;
}break;
case 3:
{
CurValueStr[ENUM_VSpeed ].val = VSpeed(60);
CurValueStr[ENUM_RSpeed ].val = 3000;
}break;
case 4:
{
CurValueStr[ECU_Warning_Lamp ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[ENUM_VSpeed ].val = VSpeed(80);
CurValueStr[ENUM_RSpeed ].val = 4000;
}break;
case 5:
{
CurValueStr[ABS_Warning_Lamp ].val = 1;
CurValueStr[ENUM_VSpeed ].val = VSpeed(100);
CurValueStr[ENUM_RSpeed ].val = 5000;
}break;
case 6:
{
CurValueStr[ENUM_VSpeed ].val = VSpeed(120);
CurValueStr[ENUM_RSpeed ].val = 6000;
}break;
case 7:
{
CurValueStr[ENUM_VSpeed ].val = VSpeed(140);
CurValueStr[ENUM_RSpeed ].val = 7000;
}break;
case 8:
{
CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[ENUM_VSpeed ].val = VSpeed(160);
CurValueStr[ENUM_RSpeed ].val = 8000;
}break;
case 9:
{
CurValueStr[ENUM_VSpeed ].val = VSpeed(180);
CurValueStr[ENUM_RSpeed ].val = 10000;
}break;
case 10:
{
CurValueStr[ECU_Warning_Lamp ].val = 1;
CurValueStr[ABS_Warning_Lamp ].val = 1;
CurValueStr[TCS_Warning_Lamp ].val = 1;
CurValueStr[ENUM_VSpeed ].val = VSpeed(199);
CurValueStr[ENUM_RSpeed ].val = 12000;
}break;
case 11:
......
......@@ -26,23 +26,23 @@ typedef struct{
typedef struct{
CAN_message *canMsg;
unsigned char StartByte;
unsigned char StartBit;
unsigned char SignalLen;
unsigned int Offset;
unsigned char fOffset;
unsigned int Factor_1;/*Denominator of Resolution*/ /*���ȵķ�ĸ*/
unsigned int Factor_2;/*Numerator of Resolution*/ /*���ȵķ���*/
s_CurValue *CurValue;
unsigned char fFormat;
unsigned char StartByte; //起始字节
unsigned char StartBit; //起始位
unsigned char SignalLen; //信号长度
unsigned int Offset; //偏移量
unsigned char fOffset; //偏移量标志位
unsigned int Factor_1; //缩放因子1
unsigned int Factor_2; //缩放因子2
s_CurValue *CurValue; //当前值指针
unsigned char fFormat; //信号格式 Motorola or Intel
}s_CAN_List;
enum
{
ENUM_VSpeed = 0,//����
ENUM_RSpeed,
ECU_Warning_Lamp,
TCS_Warning_Lamp,
ABS_Warning_Lamp,
CAN_List_Num ,
#if 0
......@@ -84,10 +84,9 @@ EXTERN_APP_TEST volatile s_CurValue CurValueStr[CAN_List_Num];
static const s_CAN_List CAN_List[] =
{
{&CanMsg_101, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[ENUM_VSpeed ], Motorola},
{&CanMsg_101, 1, 0, 16, 0, Offset_Plus, 100, 25, &CurValueStr[ENUM_RSpeed ], Motorola},
{&CanMsg_402, 7, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[ECU_Warning_Lamp ], Motorola},
{&CanMsg_37B, 3, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_Warning_Lamp ], Motorola}
{&CanMsg_0A31FFE8, 0, 0, 16, 0, Offset_Plus, 1, 1, &CurValueStr[ENUM_VSpeed ], Intel},
{&CanMsg_0A30FFE8, 0, 3, 2, 0, Offset_Plus, 1, 1, &CurValueStr[TCS_Warning_Lamp ], Intel},
{&CanMsg_0A30FFE8, 0, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ABS_Warning_Lamp ], Intel}
#if 0
{&CanMsg_101, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[ENUM_VSpeed ], Motorola},
......
......@@ -108,26 +108,24 @@
/*zh:*/
/*CS08 test*/
EXTERN_VAR CAN_message CanMessageID0CFF7F03;
EXTERN_VAR CAN_message CanMsg_101;
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_VAR CAN_message CanMsg_157;
EXTERN_VAR CAN_message CanMsg_SOC;
EXTERN_VAR CAN_message CanMsg_SOC1;
EXTERN_VAR CAN_message CanMsg_SOC2;
EXTERN_VAR CAN_message CanMsg_38E;
extern CAN_message CanMsg_101;
extern CAN_message CanMsg_111;
extern CAN_message CanMsg_37B;
extern CAN_message CanMsg_402;
extern CAN_message CanMsg_12B;
// EXTERN_VAR CAN_message CanMessageID0CFF7F03;
EXTERN_VAR CAN_message CanMsg_0A31FFE8;
EXTERN_VAR CAN_message CanMsg_0A30FFE8;
// EXTERN_VAR CAN_message CanMsg_111;
// EXTERN_VAR CAN_message CanMsg_37B;
// EXTERN_VAR CAN_message CanMsg_18202922;
// EXTERN_VAR CAN_message CanMsg_125;
// EXTERN_VAR CAN_message CanMsg_157;
// EXTERN_VAR CAN_message CanMsg_SOC;
// EXTERN_VAR CAN_message CanMsg_SOC1;
// EXTERN_VAR CAN_message CanMsg_SOC2;
// EXTERN_VAR CAN_message CanMsg_38E;
// extern CAN_message CanMsg_0A31FFE8;
// extern CAN_message CanMsg_111;
// extern CAN_message CanMsg_37B;
// extern CAN_message CanMsg_402;
// extern CAN_message CanMsg_12B;
......
......@@ -596,7 +596,7 @@
<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
</SETTING>
<SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE>%targetFilePath -Prod=%projectFileDir\USBDM.ini -instance=usbdm</VALUE></SETTING>
<SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE>%targetFilePath -Prod=%projectFileDir\TBDML.ini -instance=tbdml</VALUE></SETTING>
<SETTING><NAME>DebuggerWorkingDir</NAME>
<SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
......@@ -1713,9 +1713,9 @@
4F494E545F4E4F4E4522206964726566733D2249445F484331325F464C5F504F
494E542049445F484331325F464C5F504F494E545F4E4F4E45222F3E0A20203C
53656C656374656457697A617264456C656D656E74206E616D653D2254617267
657422207465726D3D22555342444D222069643D2249445F434F4E4E5F555342
444D22206964726566733D2249445F434F4E4E454354494F4E5F4C4953542049
445F434F4E4E5F555342444D222F3E0A3C2F57697A617264436F6E6669677572
657422207465726D3D225442444D4C222069643D2249445F434F4E4E5F544244
4D4C22206964726566733D2249445F434F4E4E454354494F4E5F4C4953542049
445F434F4E4E5F5442444D4C222F3E0A3C2F57697A617264436F6E6669677572
6174696F6E3E0A
</VALUE></PLUGINDATA>
</PLUGINDATALIST>
......
......@@ -10,22 +10,8 @@ Target=TBDML
Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12
MainFrame=0,1,-1,-1,-1,-1,508,143,1438,860
MainFrame=0,1,-1,-1,-1,-1,332,132,1772,881
TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
AEFWarningDialog=FALSE
Configuration=TBDML.hwc
Statusbar=1
ShowToolbar=1
Smallborder=0
Hideheadline=0
Hidetitle=0
......@@ -42,13 +28,9 @@ CHIPSECURE=CHIPSECURE SETUP 0xFF0F 0x3 0x2
DBG0=DBG GENERAL DISARM_ON PROTECT_OFF ANALYZE_ON STEPATRUN_ON
DBG1=DBG PREDEFINED SELECT 0
DBG2=DBG PREDEFINED DBGENGINE TRACE ENABLE RECORDAFTER PUREPC
NV_PARAMETER_FILE=D:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu02F2.fpp
NV_PARAMETER_FILE=C:\Program Files (x86)\Freescale\CWS12v5.1\prog\FPP\mcu02F2.fpp
NV_SAVE_WSP=0
NV_AUTO_ID=1
COMDEVICE=SETCOMM COMPORT LPT "TBDML #1"
ISRDISABLEDSTEP=0
......@@ -64,28 +46,8 @@ NV_SAVE_WSP=0
NV_AUTO_ID=1
[Recent Applications File List]
File0=D:\GIT\일뺏憩\列떴쇱꿎憩\Test_Bench\bin\Project.abs.s19
File1=C:\Users\葺屢퓻\Desktop\莖團일뺏憩\Project.abs.s19
File2=D:\TYW1\列떴쇱꿎憩\Test_Bench\bin\Project.abs
File3=C:\Users\葺屢퓻\Desktop\TYW\列떴쇱꿎憩\Test_Bench\bin\Project.abs
LoadFlags0=CODEONLY AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags3=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
[Recent Layout File List]
File0=C_layout.hwl
File1=
File2=
File3=
[Recent HI-WAVE FindProcedure Search]
Search0=APP_ICM_Proc
Search1=App_Can_Proc
Search2=main
[Turbo_BDM_Light]
TARGET_FREQUENCY_RATIO=2000000
TARGET_FREQUENCY=26030000
......@@ -10,7 +10,7 @@ Target=USBDM
Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12
MainFrame=0,1,-1,-1,-1,-1,-634,-383,518,282
MainFrame=0,1,-1,-1,-1,-1,-634,0,1413,1300
TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
AEFWarningDialog=FALSE
......
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