Skip to content

J
jiancetai
Commit ea8ef187 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:3500检测台初版

parent be88bac5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1417 additions and 611 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.h
View file @ ea8ef187
#ifndef _CAN_APP_H_ #ifndef _CAN_APP_H_
#define _CAN_APP_H_ #define _CAN_APP_H_
typedef enum
{
SWOUT_READ = 0,
HWOUT_READ,
SWIN_READ,
HWIN_READ,
PN_READ,
TIME_READ,
Finish_READ,
}CAN_MSG_READ_STEP_t;
extern uint8_t PortNumberStep;
void Can_Abort_All(void); void Can_Abort_All(void);
void CAN_QuickTimer_Init(void); void CAN_QuickTimer_Init(void);
void Can_Write_Fun_APP(void); void Can_Write_Fun_APP(void);
...@@ -46,8 +58,8 @@ void Can_BusOffRecover(void); ...@@ -46,8 +58,8 @@ void Can_BusOffRecover(void);
uint8_t CrcCheckSum(uint8_t *data, uint8_t len); uint8_t CrcCheckSum(uint8_t *data, uint8_t len);
void can_submit(void); void can_submit(void);
void Get_ID_0x794_Msg(void); void Get_ID_0x794_Msg(void);
void Send_UDS_fuc(void); extern void UDS_Process_Service(void);
extern uint8_t ruanjianbanbenhao[8]; // extern uint8_t ruanjianbanbenhao[8];
void Get_PN_msg(void); void Get_PN_msg(void);
extern void Get_UID_msg(void); extern void Get_UID_msg(void);
void change_UDS_DID(void); void change_UDS_DID(void);
...@@ -58,6 +70,14 @@ extern void Get_HW_msg(void); ...@@ -58,6 +70,14 @@ extern void Get_HW_msg(void);
extern void UIDRead(void); extern void UIDRead(void);
extern void uidreset(void); extern void uidreset(void);
extern void CAN_Service(void); extern void CAN_Service(void);
extern void UDS_Message_Get(void);
extern uint8_t MCU_SWversion_Get(void);
extern uint8_t MCU_HWversion_Get(void);
extern uint8_t tyw_MCU_SWversion_Get(void);
extern uint8_t tyw_MCU_HWversion_Get(void);
extern uint8_t MCU_PartNumbers_Get(void);
extern uint8_t SW_Release_Time_Get(void);
extern uint8_t UDS_DisableFlag;
extern uint8_t UIDcode1[33]; extern uint8_t UIDcode1[33];
extern uint8_t UIDcode2[33]; extern uint8_t UIDcode2[33];
extern uint8_t UIDNumber[19]; extern uint8_t UIDNumber[19];
......
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.c
View file @ ea8ef187
...@@ -244,13 +244,38 @@ uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void) ...@@ -244,13 +244,38 @@ uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void)
uint8_t Get_CAN_CH0_ID_UDS_byte0_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 0u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_UDS_byte1_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 1u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_UDS_byte2_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 2u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_UDS_byte3_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 3u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_UDS_byte4_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 4u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_UDS_byte5_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 5u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_UDS_byte6_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 6u) >> 0u) & 0xFFu));
}
uint8_t Get_CAN_CH0_ID_UDS_byte7_Sig(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_UDS_Msg_Count, 7u) >> 0u) & 0xFFu));
}
uint8_t Co_Can_ConvertSubID(uint32_t MsgID) uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
{ {
...@@ -278,8 +303,8 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID) ...@@ -278,8 +303,8 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case CAN_CH0_ID_Send0x794_Msg: case CAN_CH0_ID_Send0x794_Msg:
u8Result = CAN_CH0_ID_0x794_Msg_Count; u8Result = CAN_CH0_ID_0x794_Msg_Count;
break; break;
case CAN_CH0_ID_Send0x7A9_Msg: case CAN_CH0_ID_Send0xUDS_Msg:
u8Result = CAN_CH0_ID_0x7A9_Msg_Count; u8Result = CAN_CH0_ID_UDS_Msg_Count;
break; break;
default : default :
u8Result = CAN_CH0_ID_TOTAL_MAX; u8Result = CAN_CH0_ID_TOTAL_MAX;
......
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.h
View file @ ea8ef187
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
#include "TYW_stdint.h" #include "TYW_stdint.h"
#include "CAN_Lib.h" #include "CAN_Lib.h"
#define CAN_CH0_ID_UDS_Msg_Count CAN_CH0_ID_0x7A9_Msg_Count
#define CAN_CH0_ID_Send0xUDS_Msg 0x7A9ul
typedef enum typedef enum
{ {
CAN_CH0_ID_Send10FF4117_Msg_Count, CAN_CH0_ID_Send10FF4117_Msg_Count,
...@@ -13,7 +16,7 @@ typedef enum ...@@ -13,7 +16,7 @@ typedef enum
CAN_CH0_ID_Send0CFE6CEE_Msg_Count, CAN_CH0_ID_Send0CFE6CEE_Msg_Count,
CAN_CH0_ID_Send18FEFC17_Msg_Count, CAN_CH0_ID_Send18FEFC17_Msg_Count,
CAN_CH0_ID_0x794_Msg_Count, CAN_CH0_ID_0x794_Msg_Count,
CAN_CH0_ID_0x7A9_Msg_Count, CAN_CH0_ID_UDS_Msg_Count,
CAN_CH0_ID_TOTAL_MAX, CAN_CH0_ID_TOTAL_MAX,
} CAN_MSG_ID_t; } CAN_MSG_ID_t;
...@@ -35,7 +38,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ; ...@@ -35,7 +38,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define CAN_CH0_ID_Send0CFE6CEE_Msg 0x0CFE6CEEul #define CAN_CH0_ID_Send0CFE6CEE_Msg 0x0CFE6CEEul
#define CAN_CH0_ID_Send18FEFC17_Msg 0x18FEFC17ul #define CAN_CH0_ID_Send18FEFC17_Msg 0x18FEFC17ul
#define CAN_CH0_ID_Send0x794_Msg 0x794ul #define CAN_CH0_ID_Send0x794_Msg 0x794ul
#define CAN_CH0_ID_Send0x7A9_Msg 0x7A9ul
extern uint32_t Get_ID_ODO(void); extern uint32_t Get_ID_ODO(void);
extern uint32_t Get_ID_FUEL(void); extern uint32_t Get_ID_FUEL(void);
...@@ -69,7 +72,14 @@ extern uint8_t Get_CAN_CH0_ID_7A9_byte5_Sig(void); ...@@ -69,7 +72,14 @@ extern uint8_t Get_CAN_CH0_ID_7A9_byte5_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte6_Sig(void); extern uint8_t Get_CAN_CH0_ID_7A9_byte6_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void); extern uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte0_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte1_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte2_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte3_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte4_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte5_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte6_Sig(void);
extern uint8_t Get_CAN_CH0_ID_UDS_byte7_Sig(void);
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ ea8ef187
...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
if(MENU_CHECK_STEP > 9) if(MENU_CHECK_STEP >= 7)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -578,101 +578,189 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -578,101 +578,189 @@ void Function_Check_Ctrl(uint32_t cmd)
{ {
case 0: case 0:
{ {
//电源
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
//指示灯
NEG_1_Ctrl = 0;
POS_1_Ctrl = 0;
POS_2_Ctrl = 0;
POS_3_Ctrl = 0;
POS_4_Ctrl = 0;
POS_5_Ctrl = 0;
POS_6_Ctrl = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; // FUEL_RES_1 = 0;
FUEL_RES_2 = 0; // FUEL_RES_2 = 0;
FUEL_RES_3 = 0; // FUEL_RES_3 = 0;
FUEL_RES_4 = 0; // FUEL_RES_4 = 0;
break; break;
} }
case 1: case 1:
{ {
/*燃油*///满格100欧 //电源
FUEL_RES_1 = 1; POWER_CTRL_KL30 = 0u; //B+
FUEL_RES_2 = 0; POWER_CTRL_KL15 = 0u; //KL15
FUEL_RES_3 = 0; //指示灯
FUEL_RES_4 = 0; NEG_1_Ctrl = 0;
POS_1_Ctrl = 0;
POS_2_Ctrl = 0;
POS_3_Ctrl = 0;
POS_4_Ctrl = 0;
POS_5_Ctrl = 0;
POS_6_Ctrl = 0;
/*燃油*/
// FUEL_RES_1 = 1;
// FUEL_RES_2 = 0;
// FUEL_RES_3 = 0;
// FUEL_RES_4 = 0;
break; break;
} }
case 2: case 2:
{ {
/*燃油*///1格85欧 //电源
FUEL_RES_1 = 0; POWER_CTRL_KL30 = 1u; //B+
FUEL_RES_2 = 1; POWER_CTRL_KL15 = 1u; //KL15
FUEL_RES_3 = 0; //指示灯
FUEL_RES_4 = 0; NEG_1_Ctrl = 0;
POS_1_Ctrl = 1;
POS_2_Ctrl = 1;
POS_3_Ctrl = 1;
POS_4_Ctrl = 0;
POS_5_Ctrl = 0;
POS_6_Ctrl = 0;
/*燃油*/
// FUEL_RES_1 = 0;
// FUEL_RES_2 = 1;
// FUEL_RES_3 = 0;
// FUEL_RES_4 = 0;
break; break;
} }
case 3: case 3:
{ {
/*燃油*///4格50欧 //电源
FUEL_RES_1 = 0; POWER_CTRL_KL30 = 1u; //B+
FUEL_RES_2 = 0; POWER_CTRL_KL15 = 1u; //KL15
FUEL_RES_3 = 1; //指示灯
FUEL_RES_4 = 0; NEG_1_Ctrl = 0;
POS_1_Ctrl = 0;
POS_2_Ctrl = 0;
POS_3_Ctrl = 0;
POS_4_Ctrl = 1;
POS_5_Ctrl = 1;
POS_6_Ctrl = 1;
/*燃油*/
// FUEL_RES_1 = 0;
// FUEL_RES_2 = 0;
// FUEL_RES_3 = 1;
// FUEL_RES_4 = 0;
break; break;
} }
case 4: case 4:
{ {
/*燃油*///8格5欧 //电源
FUEL_RES_1 = 0; POWER_CTRL_KL30 = 1u; //B+
FUEL_RES_2 = 0; POWER_CTRL_KL15 = 1u; //KL15
FUEL_RES_3 = 0; //指示灯
FUEL_RES_4 = 1; NEG_1_Ctrl = 1;
POS_1_Ctrl = 1;
POS_2_Ctrl = 1;
POS_3_Ctrl = 0;
POS_4_Ctrl = 0;
POS_5_Ctrl = 0;
POS_6_Ctrl = 0;
/*燃油*/
// FUEL_RES_1 = 0;
// FUEL_RES_2 = 0;
// FUEL_RES_3 = 0;
// FUEL_RES_4 = 1;
break; break;
} }
case 5: case 5:
{ {
//电源
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
//指示灯
NEG_1_Ctrl = 0;
POS_1_Ctrl = 0;
POS_2_Ctrl = 0;
POS_3_Ctrl = 0;
POS_4_Ctrl = 0;
POS_5_Ctrl = 0;
POS_6_Ctrl = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; // FUEL_RES_1 = 0;
FUEL_RES_2 = 0; // FUEL_RES_2 = 0;
FUEL_RES_3 = 0; // FUEL_RES_3 = 0;
FUEL_RES_4 = 0; // FUEL_RES_4 = 0;
break; break;
} }
case 6: case 6:
{ {
//电源
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 0u; //KL15
//指示灯
NEG_1_Ctrl = 0;
POS_1_Ctrl = 0;
POS_2_Ctrl = 0;
POS_3_Ctrl = 0;
POS_4_Ctrl = 0;
POS_5_Ctrl = 0;
POS_6_Ctrl = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; // FUEL_RES_1 = 0;
FUEL_RES_2 = 0; // FUEL_RES_2 = 0;
FUEL_RES_3 = 0; // FUEL_RES_3 = 0;
FUEL_RES_4 = 0; // FUEL_RES_4 = 0;
break; break;
} }
case 7: case 7:
{ {
//电源
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
//指示灯
NEG_1_Ctrl = 1;
POS_1_Ctrl = 1;
POS_2_Ctrl = 1;
POS_3_Ctrl = 1;
POS_4_Ctrl = 1;
POS_5_Ctrl = 1;
POS_6_Ctrl = 1;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; // FUEL_RES_1 = 0;
FUEL_RES_2 = 0; // FUEL_RES_2 = 0;
FUEL_RES_3 = 0; // FUEL_RES_3 = 0;
FUEL_RES_4 = 0; // FUEL_RES_4 = 0;
break; break;
} }
case 8: case 8:
{ {
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; // FUEL_RES_1 = 0;
FUEL_RES_2 = 0; // FUEL_RES_2 = 0;
FUEL_RES_3 = 0; // FUEL_RES_3 = 0;
FUEL_RES_4 = 0; // FUEL_RES_4 = 0;
break; break;
} }
case 9: case 9:
{ {
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; // FUEL_RES_1 = 0;
FUEL_RES_2 = 0; // FUEL_RES_2 = 0;
FUEL_RES_3 = 0; // FUEL_RES_3 = 0;
FUEL_RES_4 = 0; // FUEL_RES_4 = 0;
break; break;
} }
case 10: case 10:
{ {
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; // FUEL_RES_1 = 0;
FUEL_RES_2 = 0; // FUEL_RES_2 = 0;
FUEL_RES_3 = 0; // FUEL_RES_3 = 0;
FUEL_RES_4 = 0; // FUEL_RES_4 = 0;
break; break;
} }
} }
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ ea8ef187
...@@ -155,7 +155,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) ...@@ -155,7 +155,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
} }
else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 10)) else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 10))
{ {
LINE_OUT_NEG_02 = 1; ;
} }
} }
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ ea8ef187
...@@ -25,12 +25,8 @@ ...@@ -25,12 +25,8 @@
#define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13 #define POWER_CTRL_KL30 GPIO_OUT_PORT10_PIN13
#define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12 #define POWER_CTRL_KL15 GPIO_OUT_PORT10_PIN12
#define POWER_CTRL_KL30_Current GPIO_OUT_PORT10_PIN14 #define POWER_CTRL_KL30_Current GPIO_OUT_PORT10_PIN14
//负控硬线1-10
#define SD_FMQ GPIO_OUT_PORT10_PIN02 #define NEG_1_Ctrl GPIO_OUT_PORT09_PIN06 //制动液位低
#define PWM_FMQ GPIO_OUT_PORT10_PIN11
#define NEG_1_Ctrl GPIO_OUT_PORT09_PIN06
#define NEG_2_Ctrl GPIO_OUT_PORT09_PIN05 #define NEG_2_Ctrl GPIO_OUT_PORT09_PIN05
#define NEG_3_Ctrl GPIO_OUT_PORT09_PIN04 #define NEG_3_Ctrl GPIO_OUT_PORT09_PIN04
#define NEG_4_Ctrl GPIO_OUT_PORT09_PIN03 #define NEG_4_Ctrl GPIO_OUT_PORT09_PIN03
...@@ -40,48 +36,17 @@ ...@@ -40,48 +36,17 @@
#define NEG_8_Ctrl GPIO_OUT_PORT10_PIN03 #define NEG_8_Ctrl GPIO_OUT_PORT10_PIN03
#define NEG_9_Ctrl GPIO_OUT_PORT10_PIN04 #define NEG_9_Ctrl GPIO_OUT_PORT10_PIN04
#define NEG_10_Ctrl GPIO_OUT_PORT00_PIN08 #define NEG_10_Ctrl GPIO_OUT_PORT00_PIN08
//正控硬线1-10
//左转 #define POS_1_Ctrl GPIO_OUT_PORT10_PIN06 //左转
#define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05 #define POS_2_Ctrl GPIO_OUT_PORT09_PIN00 //右转
//右转 #define POS_3_Ctrl GPIO_OUT_APORT00_PIN04 //位置灯
#define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06 #define POS_4_Ctrl GPIO_OUT_APORT00_PIN05 //近光灯
//远光 #define POS_5_Ctrl GPIO_OUT_APORT00_PIN06 //远光灯
#define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00 #define POS_6_Ctrl GPIO_OUT_APORT00_PIN13 //后雾灯
//位置灯 #define POS_7_Ctrl GPIO_OUT_APORT00_PIN14
#define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04 #define POS_8_Ctrl GPIO_OUT_PORT08_PIN09
#define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06 #define POS_9_Ctrl GPIO_OUT_PORT08_PIN08
#define LINE_OUT_POS_06 GPIO_OUT_APORT00_PIN13 #define POS_10_Ctrl GPIO_OUT_PORT00_PIN07
#define LINE_OUT_POS_07 GPIO_OUT_APORT00_PIN14
#define LINE_OUT_POS_08 GPIO_OUT_PORT08_PIN09
#define LINE_OUT_POS_09 GPIO_OUT_PORT08_PIN08
#define LINE_OUT_POS_10 GPIO_OUT_PORT00_PIN07
//安全带//R挡
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06
//机油压力//L挡
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05
//H挡//发动机故障
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04
//P挡//驻车指示灯
#define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03
//开关后桥状态//制动失效
#define LINE_OUT_NEG_05 GPIO_OUT_PORT09_PIN02
//马达2驱信号
#define LINE_OUT_NEG_06 GPIO_OUT_PORT09_PIN01
//马达4驱信号//空挡
#define LINE_OUT_NEG_07 GPIO_OUT_PORT10_PIN07
//马达4驱锁死信号
#define LINE_OUT_NEG_08 GPIO_OUT_PORT10_PIN03
//开关2驱信号
#define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04
//B-5开关4驱信号
#define LINE_OUT_NEG_10 GPIO_OUT_PORT00_PIN08
#define LINE_FUEL_RES01 GPIO_OUT_PORT00_PIN13
#define LINE_FUEL_RES02 GPIO_OUT_PORT08_PIN12
#define LINE_FUEL_RES03 GPIO_OUT_PORT08_PIN10
#define LINE_FUEL_RES04 GPIO_OUT_PORT08_PIN11
//zh: //zh:
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ ea8ef187
...@@ -25,9 +25,10 @@ ...@@ -25,9 +25,10 @@
/*============================================================================== /*==============================================================================
αʵʱ���� αʵʱ����
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#define CAN_SEND_TIME 2 //*10ms
#define CAN_SEND_BEGIN_TIME 100 //*10ms
void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void) void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
{ {
SD_FMQ = 1;
// DoCAN_Communication_Service( ); // DoCAN_Communication_Service( );
// UDS_Server_Application_Service( ); // UDS_Server_Application_Service( );
TFT_LCD_Display_Update_Service( ); TFT_LCD_Display_Update_Service( );
...@@ -75,6 +76,8 @@ extern uint8_t fuelreset1; ...@@ -75,6 +76,8 @@ extern uint8_t fuelreset1;
extern uint8_t fuelreset2; extern uint8_t fuelreset2;
extern uint8_t fuelreset3; extern uint8_t fuelreset3;
extern uint8_t fuelreset4; extern uint8_t fuelreset4;
uint8_t UDS_DisableFlagnumber;
uint8_t IGtinmed;
void Sys_Run_Mode_10ms_Tasks_Group(void) void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
if((resettime < 250) && (writeflag == 0)) if((resettime < 250) && (writeflag == 0))
...@@ -128,7 +131,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -128,7 +131,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
if(begin714 == 0) if(begin714 == 0)
{ {
Send_UDS_fuc();
send0x714time = 0; send0x714time = 0;
} }
} }
...@@ -145,7 +147,23 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -145,7 +147,23 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
UIDWrite(); UIDWrite();
} }
if(IGtinmed <= CAN_SEND_BEGIN_TIME)
{
IGtinmed++;
}
else
{
// if(UDS_DisableFlag == 0)
// {
UDS_DisableFlagnumber++;
if(UDS_DisableFlagnumber >= CAN_SEND_TIME)
{
UDS_DisableFlagnumber = 0;
UDS_Process_Service();
CAN_Service();
}
// }
}
//刷数字、刷英文拼写。 //刷数字、刷英文拼写。
...@@ -167,7 +185,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -167,7 +185,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
void Sys_Run_Mode_20ms_Tasks_Group0(void) void Sys_Run_Mode_20ms_Tasks_Group0(void)
{ {
//Total_Check( ); //Total_Check( );
CAN_Service();
} }
/*============================================================================== /*==============================================================================
......
YueJin_test_bench/source/Driver/CAN/RSCAN.c
View file @ ea8ef187
...@@ -2058,6 +2058,8 @@ void RSCAN0_CH4_RX_ISR(void) ...@@ -2058,6 +2058,8 @@ void RSCAN0_CH4_RX_ISR(void)
} }
} }
Get_UID_msg(); Get_UID_msg();
UDS_Message_Get();
PortNumberStep += MCU_PartNumbers_Get();
} }
void RSCAN0_CH5_RX_ISR(void) void RSCAN0_CH5_RX_ISR(void)
......
YueJin_test_bench/source/Driver/GPIO/TM035HFZGZx.c
View file @ ea8ef187
...@@ -38,7 +38,7 @@ void LCD_Init(void) ...@@ -38,7 +38,7 @@ void LCD_Init(void)
Sim_8080_Data_Write ( 0x0C ); Sim_8080_Data_Write ( 0x0C );
Sim_8080_Data_Write ( 0x26 ); Sim_8080_Data_Write ( 0x26 );
Sim_8080_Command_Write ( 0x21 ); Sim_8080_Command_Write ( 0x21 );
Sim_8080_Data_Write ( 0x01 ); //翻转，正反面翻转 00 01 Sim_8080_Data_Write ( 0x00 ); //翻转，正反面翻转 00 01
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
...@@ -58,7 +58,7 @@ void LCD_Init(void) ...@@ -58,7 +58,7 @@ void LCD_Init(void)
Sim_8080_Data_Write ( 0x00 ); Sim_8080_Data_Write ( 0x00 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Command_Write ( 0xA2 ); Sim_8080_Command_Write ( 0xA2 );
Sim_8080_Data_Write ( 0x00 ); //180度翻转；00 10 Sim_8080_Data_Write ( 0x10 ); //180度翻转；00 10
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
......
YueJin_test_bench/source/Driver/TimerB/TimerB.c
View file @ ea8ef187
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#elif (TIMERB_0_CK0_DIV == 16U) #elif (TIMERB_0_CK0_DIV == 16U)
#define TIMERB_0_CK0_DIV_COE 4U #define TIMERB_0_CK0_DIV_COE 4U
#elif (TIMERB_0_CK0_DIV == 32U) #elif (TIMERB_0_CK0_DIV == 32U)
#define TIMERB_0_CK0_DIV_COE 5U #define TIMERB_0_CK0_DIV_COE 7U
#elif (TIMERB_0_CK0_DIV == 64U) #elif (TIMERB_0_CK0_DIV == 64U)
#define TIMERB_0_CK0_DIV_COE 6U #define TIMERB_0_CK0_DIV_COE 6U
#elif (TIMERB_0_CK0_DIV == 128U) #elif (TIMERB_0_CK0_DIV == 128U)
...@@ -358,7 +358,7 @@ uint32_t TimerB_PWM_Channel_Fre_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_ ...@@ -358,7 +358,7 @@ uint32_t TimerB_PWM_Channel_Fre_Set(TIMERB_Channel_en_t enTimerBChannel, uint16_
u32TimerBRegAddrChannel = u32TimerBRegBaseAddr + (4U * (u8TimerBChannel)); u32TimerBRegAddrChannel = u32TimerBRegBaseAddr + (4U * (u8TimerBChannel));
(*((uint16_t *)(u32TimerBRegAddrChannel - 4U * TIMERB_CHANNEL_INTERVAL))) = u32CalBuf - 1U; (*((uint16_t *)(u32TimerBRegAddrChannel - 4U * TIMERB_CHANNEL_INTERVAL))) = (u32CalBuf - 1U) / 4;
/*TAUB0CDR2 = u32CalBuf - 1U; // fre*/ /*TAUB0CDR2 = u32CalBuf - 1U; // fre*/
(*((uint16_t *)u32TimerBRegAddrChannel)) = (u32Duty * u32CalBuf / 1000U); (*((uint16_t *)u32TimerBRegAddrChannel)) = (u32Duty * u32CalBuf / 1000U);
......
YueJin_test_bench/source/System/init.c
View file @ ea8ef187
...@@ -82,10 +82,10 @@ void Sys_Startup_Init(void) ...@@ -82,10 +82,10 @@ void Sys_Startup_Init(void)
Display_Title_Info( ); Display_Title_Info( );
Key_Init( ); Key_Init( );
Buzzer_Init(); Buzzer_Init();
PWM_Channel_Init(1,0,0,0,0);
UIDdelay = 0; UIDdelay = 0;
POWER_CTRL_KL30 = 1u; //B+ POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15 POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_NEG_02 = 0;
for (int i = 0; i < 33; i++) for (int i = 0; i < 33; i++)
{ {
UIDcode1[i] = 0; UIDcode1[i] = 0;
......
YueJin_test_bench/utility/GPIO/GPIO.c
View file @ ea8ef187
...@@ -42,57 +42,57 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] = ...@@ -42,57 +42,57 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0020u, 0x0000u}, {0x5020u, 0x5020u},
{0x0620u, 0x0600u}, {0x0620u, 0x0620u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0630u, 0x0600u}, {0x5630u, 0x5630u},
{0x0220u, 0x2207u}, {0x0A6Fu, 0x0A6Fu},
{0x79CFu, 0x79FFu}, {0x29CFu, 0x29CFu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0008u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0003u},
{0x0000u, 0x0008u},
{0x0000u, 0x0008u},
{0x1FFFu, 0x1FF7u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x1FFFu, 0x1FFFu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0001u, 0x0001u},
{0x007Fu, 0x007Fu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x007Fu, 0x007Fu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x8000u, 0x0200u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0060u, 0x0000u}, {0x8800u, 0x8000u},
{0xFFFFu, 0xFFFFu}, {0x8800u, 0x8000u},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u},
{0x8800u, 0x8000u},
{0x0020u, 0x0000u},
{0x77FFu, 0x7FFFu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0001u, 0x0001u},
{0x0001u, 0x0001u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0001u, 0x0001u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0001u, 0x0080u}, {0x00FEu, 0x00FEu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0005u}, {0x000Fu, 0x0200u},
{0x00FFu, 0x00FFu},
{0x8080u, 0x1000u},
{0x400Fu, 0x673Fu},
{0xFFFFu, 0xFFFFu}, {0xFFFFu, 0xFFFFu},
}; };
static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode) static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode)
......
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