debug

source/Application/APP/Key/Key_user.c

@@ -1287,6 +1287,7 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
         }
         else if (bCurMenuIDX == _MN_DSP_Menu_Test)
         {
+
         }
         else if (User_set_Num.Trip_Type == 0u)
         {

source/Application/K_BUS/kwp2000_interface.c

@@ -2,13 +2,13 @@
 #include "kwp2000_interface.h"
 #include "UART.h"
 
-#define   BOARD_TMBCLK_HZ   32000000
+#define BOARD_TMBCLK_HZ 32000000
 
 /* physical and functional addresses for the ECU */
 unsigned char kwp2000_PhysicalAddress;
 unsigned char kwp2000_FunctionalAddress;
 unsigned char kwp2000_ServerAddress;
-unsigned int  kwp2000_P3_MAX_LIMIT;
+unsigned int kwp2000_P3_MAX_LIMIT;
 
 /*-------------------------------------------------------------------------
 * Function Name  : Kwp2000_SetAddress
@@ -18,7 +18,7 @@ unsigned int  kwp2000_P3_MAX_LIMIT;
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_SetAddress( void )
+void Kwp2000_SetAddress(void)
 {
     kwp2000_PhysicalAddress = KWP2000_ADDR_IC;
     kwp2000_FunctionalAddress = KWP2000_ADDR_OBD;
@@ -33,20 +33,20 @@ void Kwp2000_SetAddress( void )
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_SetTiming( void )
+void Kwp2000_SetTiming(void)
 {
     kwp2000_P3_MAX_LIMIT = KWP2000_P3_MAX;
 }
 
 /*-------------------------------------------------------------------------
 * Function Name  : Kwp2000_AscDisableRx
-* Description    : 禁止收 使能发
+* Description    : 禁止收 使能发
 * Input          :
 * Output         : None
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_AscDisableRx( void )
+void Kwp2000_AscDisableRx(void)
 {
     Uart_DisableRx();
     Uart_EnableTx();
@@ -54,13 +54,13 @@ void Kwp2000_AscDisableRx( void )
 
 /*-------------------------------------------------------------------------
 * Function Name  : Kwp2000_AscEnableRx
-* Description    : 使能接收功能
+* Description    : 使能接收功能
 * Input          :
 * Output         : None
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_AscEnableRx( void )
+void Kwp2000_AscEnableRx(void)
 {
     /* enable receiver, clear all error flags */
     Uart_ClearAllErrorFlag();
@@ -69,13 +69,13 @@ void Kwp2000_AscEnableRx( void )
 
 /*-------------------------------------------------------------------------
 * Function Name  : Kwp2000_AscTx
-* Description    : 发送数据字节
+* Description    : 发送数据字节
 * Input          :
 * Output         : None
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_AscTx( unsigned char* xBuffer_pu8 )
+void Kwp2000_AscTx(unsigned char *xBuffer_pu8)
 {
     Uart_SetData(*xBuffer_pu8);
 }
@@ -88,9 +88,8 @@ void Kwp2000_AscTx( unsigned char* xBuffer_pu8 )
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_AscStart( void )
+void Kwp2000_AscStart(void)
 {
-
 }
 
 /*-------------------------------------------------------------------------
@@ -101,27 +100,24 @@ void Kwp2000_AscStart( void )
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_AscStop( void )
+void Kwp2000_AscStop(void)
 {
-
 }
 
-
 /*-------------------------------------------------------------------------
 * Function Name  : Kwp2000_AscInit
-* Description    : 串口模块初始化
+* Description    : 串口模块初始化
 * Input          :
 * Output         : None
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void Kwp2000_AscInit( void )
+void Kwp2000_AscInit(void)
 {
-    Kwp2000_AscStop();      // disable ASC_A mode
+    Kwp2000_AscStop(); // disable ASC_A mode
 
     /* disable interrupt service request, clear service request flags */
-    /*预留设置*/
-
+    /*预留设置*/
 
     /* enable receiver and transmitter function*/
     Uart_EnableRx();
@@ -139,13 +135,13 @@ void Kwp2000_AscInit( void )
     ///  -----------------------------------------------------------------------
     ///  Configuration of the used ASC0 Port Pins:
     ///  -----------------------------------------------------------------------
-    Uart_SetTxGpio(); //TX
-    Uart_SetRxGpio(); //RX
+    Uart_SetTxGpio(); // TX
+    Uart_SetRxGpio(); // RX
 
     ///  -----------------------------------------------------------------------
     ///  Configuration of priority of SCI_A interrupt:
     ///  -----------------------------------------------------------------------
-    /*预留优先级设置*/
+    /*预留优先级设置*/
 
     /* Configuration of Baudrate , as 10400bps */
     Kwp2000_AscSwitchBaudrate(KWP2000_DEFAULT_BAUDRATE_KLINE_DU);
@@ -158,8 +154,8 @@ void Kwp2000_AscInit( void )
 
 /*-------------------------------------------------------------------------
 * Function Name  : Kwp2000_AscSwitchBaudrate
-* Description    : 设置波特率
-* Input          : xBaudrate_u32 波特率数值
+* Description    : 设置波特率
+* Input          : xBaudrate_u32 波特率数值
 * Output         : None
 * Return         : None
 * onther         :
@@ -167,7 +163,7 @@ void Kwp2000_AscInit( void )
 void Kwp2000_AscSwitchBaudrate(unsigned long xBaudrate_u32)
 {
     /* if configuration is valid, ... */
-    if ( xBaudrate_u32 != 0ul )
+    if (xBaudrate_u32 != 0ul)
     {
         Kwp2000_AscStop();
 

source/Application/K_BUS/kwp2000_interface.h

@@ -7,57 +7,57 @@
 *********************************************************************
 */
 /* Defined for ComStatus */
-#define KWP2000_DEFAULT_BAUDRATE_KLINE_DU           10400ul
-#define KWP2000_MID_BAUDRATE_KLINE_DU               57600ul
-#define KWP2000_HIGH_BAUDRATE_KLINE_DU              249600ul
+#define KWP2000_DEFAULT_BAUDRATE_KLINE_DU 10400ul
+#define KWP2000_MID_BAUDRATE_KLINE_DU 57600ul
+#define KWP2000_HIGH_BAUDRATE_KLINE_DU 249600ul
 
-#define KWP2000_ADDR_IC             0x60u
-#define KWP2000_ADDR_OBD            0x33u
-#define KWP2000_ADDR_SERVER         0xF1u
+#define KWP2000_ADDR_IC 0x60u
+#define KWP2000_ADDR_OBD 0x33u
+#define KWP2000_ADDR_SERVER 0xF1u
 
-#define KWP2000_P2_MIN             0
-#define KWP2000_P3_MAX             5000
+#define KWP2000_P2_MIN 0
+#define KWP2000_P3_MAX 5000
 
 /*
 *********************************************************************
 * variable
 *********************************************************************
 */
-extern  unsigned char kwp2000_PhysicalAddress;
-extern  unsigned char kwp2000_FunctionalAddress;
-extern  unsigned char kwp2000_ServerAddress;
-extern  unsigned int  kwp2000_P3_MAX_LIMIT;
+extern unsigned char kwp2000_PhysicalAddress;
+extern unsigned char kwp2000_FunctionalAddress;
+extern unsigned char kwp2000_ServerAddress;
+extern unsigned int kwp2000_P3_MAX_LIMIT;
 
 /*
 *********************************************************************
 * function
 *********************************************************************
 */
-extern void Kwp2000_AscInit( void );
+extern void Kwp2000_AscInit(void);
 extern void Kwp2000_AscSwitchBaudrate(unsigned long xBaudrate_u32);
 
-extern  unsigned short Uart_GetData( void );
-extern  unsigned char  Uart_GetRxLevel(void);
-
-extern  void  Uart_SetData(  unsigned char xBuffer_pu8  );
-
-extern  void  Uart_DisableReceiveIsrReq( void );
-extern  void  Uart_EnableReceiveIsrReq( void );
-
-extern  void  Uart_ClearAllErrorFlag( void );
-extern  void  Uart_EnableRx( void );
-extern  void  Uart_DisableRx( void );
-extern  void  Uart_EnableTx( void );
-extern  void  Uart_SetRxGpio( void );
-extern  void  Uart_SetTxGpio( void );
-extern  void  Uart_SetBaudrate( unsigned long xBaudrate_u32 );
-extern  void  Uart_ClearRxFullFlag(void);
-extern  void  Uart_DisableTxInterrupt( void );
-extern  void  Uart_ConfigOperationMode(void);
-extern  void  TJA1021_Enable( unsigned char state );
-extern  void  Kwp2000_SetTiming( void );
-extern  void  Kwp2000_SetAddress( void );
-extern  void  Kwp2000_AscTx( unsigned char* xBuffer_pu8 );
-extern  void  Kwp2000_AscEnableRx( void );
+extern unsigned short Uart_GetData(void);
+extern unsigned char Uart_GetRxLevel(void);
+
+extern void Uart_SetData(unsigned char xBuffer_pu8);
+
+extern void Uart_DisableReceiveIsrReq(void);
+extern void Uart_EnableReceiveIsrReq(void);
+
+extern void Uart_ClearAllErrorFlag(void);
+extern void Uart_EnableRx(void);
+extern void Uart_DisableRx(void);
+extern void Uart_EnableTx(void);
+extern void Uart_SetRxGpio(void);
+extern void Uart_SetTxGpio(void);
+extern void Uart_SetBaudrate(unsigned long xBaudrate_u32);
+extern void Uart_ClearRxFullFlag(void);
+extern void Uart_DisableTxInterrupt(void);
+extern void Uart_ConfigOperationMode(void);
+extern void TJA1021_Enable(unsigned char state);
+extern void Kwp2000_SetTiming(void);
+extern void Kwp2000_SetAddress(void);
+extern void Kwp2000_AscTx(unsigned char *xBuffer_pu8);
+extern void Kwp2000_AscEnableRx(void);
 
 #endif

source/Application/K_BUS/kwp2000_protocol.h

@@ -3,10 +3,6 @@
 #ifndef _KWP2000_SERVICE_H
 #define _KWP2000_SERVICE_H
 
-
-
-extern void          Kwp2000_Handle( void );
-
-
+extern void Kwp2000_Handle(void);
 
 #endif

source/Application/K_BUS/kwp2000_service.h

@@ -125,28 +125,28 @@ extern unsigned char kwp_ClearDiagnosticInformation(unsigned char *TxData, unsig
 
 typedef union
 {
-    unsigned char SendSeedEQUSRecvSeed;        //密钥配对成功标识   0 失败，1 成功
-    unsigned char RecvStart           ;        //通讯开始表示位     0 结束，1 开始
-    unsigned char S_Regist            ;        //是否注册标识
-    unsigned char AccessMode2701      ;        //27服务进入计时标志
+    unsigned char SendSeedEQUSRecvSeed;        /*密钥配对成功标识 0-失败 1-成功*/
+    unsigned char RecvStart           ;        /*通讯开始标识    0-结束 1-开始*/
+    unsigned char S_Regist            ;        /*是否注册标识*/
+    unsigned char AccessMode2701      ;        /*27服务进入计时标志*/
 } _K_LINE_SIGNAL_FLAG;
 
 extern _K_LINE_SIGNAL_FLAG   K_LINE_SIGNAL_FLAG;
 
 typedef union
 {
-    unsigned char ActiveSecurityAccess ;   /*修正值状态     0-未实施 1-实施后*/
-    unsigned char SensorStatus         ;   /*传感器输入状态  0-LOW    1-HIGH*/
-    unsigned char Security_Active      ;   /*锁定状态       0-未锁定  1-锁定*/
+    unsigned char ActiveSecurityAccess ;   /*修正值状态   0-未实施 1-实施后*/
+    unsigned char SensorStatus         ;   /*传感器输入状态 0-LOW    1-HIGH*/
+    unsigned char Security_Active      ;   /*锁定状态      0-未锁定 1-锁定*/
     unsigned char reserve              ;
 } _ECUStatus;
 
 extern    _ECUStatus        ECUStatusONE;
 
-#define   ECUSTATUST_F      00              /*修正系数  EOL系数*2048*/
+#define   ECUSTATUST_F      00             /*修正系数 EOL系数*2048*/
 
 /******************************************************************************
-5.2.5. ECU ID_ECU件号写入(SID=$3B LID=$91)
+5.2.5. ECU ID_ECU件号写入(SID=$3B LID=$91)
 ******************************************************************************/
 typedef union
 {
@@ -166,21 +166,21 @@ typedef union
     unsigned char ECUStatus3;         //13
     unsigned char ECUStatus4;         //14
     unsigned char ECUStatus5;         //15
-    unsigned char METERCOUNT;         //16 修正率次数
+    unsigned char METERCOUNT;         //16 修正率次数
     unsigned char NoOfDTCFF00;        //17
     unsigned char NoOfDTC8000;        //18
-    unsigned char TesterECU;          //19 车速修正码
-    unsigned char TesterECUCAN;       //20 CAN发送用修正码
+    unsigned char TesterECU;          //19 车速修正码
+    unsigned char TesterECUCAN;       //20 CAN发送用修正码
 } _NVMNODIGIT;
 
 extern       _NVMNODIGIT       NVMNODIGIT;
 
-extern unsigned char        Sendseed1;      //仪表计算的
+extern unsigned char        Sendseed1;      /*仪表计算*/
 extern unsigned char        Sendseed2;
 extern unsigned char        Sendseed3;
 extern unsigned char        Sendseed4;
 
-extern unsigned char        Recvseed1;      //仪表接收的
+extern unsigned char        Recvseed1;      /*仪表接收*/
 extern unsigned char        Recvseed2;
 extern unsigned char        Recvseed3;
 extern unsigned char        Recvseed4;

source/Driver/UART/UART.c

@@ -2,6 +2,7 @@
 #include "dr7f701441.dvf.h"
 #include "UART.h"
 //#include "rh850_macros.h"
+#include "GPIO.h"
 #include "r_dev_api.h"
 
 #include "kwp2000_tp.h"
@@ -490,6 +491,7 @@ void Uart_ConfigOperationMode(void)
 unsigned char Uart_GetRxLevel(void)
 {
     // return PTS_PTS0;
+    return GPIO_OUT_PORT00_PIN03;
 }
 
 /*-------------------------------------------------------------------------
@@ -682,6 +684,7 @@ void TJA1021_Enable(unsigned char state)
 
     // DDRR_DDRR3 = 1;
     // PTR_PTR3 = state;
+    GPIO_OUT_PORT16_PIN04 = state;
 }
 
 /*-------------------------------------------------------------------------