🎉 init:删除无用代码(3236驱动和93015触摸驱动和iic模拟函数),配置IO口

HJ232_Source/source/Application/APPCan/CAN_User.h

@@ -39,11 +39,6 @@ typedef struct
 } RSCAN0BusoffMonitorStruct;
 
 
-typedef struct
-{
-    uint32_t StructDtcCurFault;
-    uint32_t StructDtcHisFault;
-} _DTCReturnVal;
 
 typedef enum
 {
@@ -79,13 +74,12 @@ void CAN_TX_Tick(void);
 void Can_Receive_Msg(uint32_t m_id, uint8_t m_dlc, uint8_t m_Msg[]);
 /* CAN Parometer */
 void swap32(uint32_t *DwData);
-_DTCReturnVal GetDtcFault(void);
+
 void GetAllDtcFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
-void SetDtcFault(void);
-void DtcFaultInit(void);
-uint32_t GetDtcDispNum(uint8_t DispNum);
-uint8_t GetDtcAmnt(void);
-void DtcFaultTimeInit(void);
+
+
+
+
 void LianDianModuleIn(void);
 void DelfuModuleIn(void);
 void CAN_Check_Liandian(void);
@@ -99,15 +93,15 @@ void Set_TCS_WorkModeFlshTime(uint16_t Time);
 uint8_t get_ECU_Battery_Voltage(void);
 uint8_t Get_LED_ECU_Battery_VoltageFlag(void);
 void SET_LED_ECU_Battery_VoltageFlag(uint8_t Flag);
-void CAN_LED_Check_50msTask(void);
+
 int16_t get_CoolantTempVal(void);
 int16_t get_ECU_Temperature_WaterVal(void);
-int16_t get_ID_ISG_BATT(void);
-int16_t get_ID_ISG_Power(void);
-int8_t get_Delay_ECU_Battery_Voltage(void);
-void BatteryVoltageDelayInit(void);
 
-void Test(void);
+
+
+
+
+
 void Can_BusOff_Fun(uint8_t deltaTime);
 void Set_CanSleepDelayTime(uint32_t data);
 uint32_t Get_CanSleepDelayTime(void);

HJ232_Source/source/Application/Fuel/Fuel.c

@@ -36,14 +36,14 @@ uint8_t FuelADCompleteFlg = 0u;
 void Fuel_KL30_Init(void)
 {
 	
-	PORT_ClrBit(Fuel_Vcc_en);
+	PORT_ClrBit(FUEL_POWER_MCU_OUT);
 
 
 }
 
 void Fuel_KL15_Init(void)
 {
-    PORT_SetBit(Fuel_Vcc_en);
+    PORT_SetBit(FUEL_POWER_MCU_OUT);
     DesFuelSetp = 0u;
     CurFuelSetp = 0u;
     FuelInitFlag = 1u;

HJ232_Source/source/Application/PowerManagement/PowerManagement_user.c

@@ -28,8 +28,8 @@
 
 #include "can.h"
 #include "RTE_ADC.h"
-#include "IS31FL3236.h"
-#include "AW93015.h"
+
+
 #include "Services_Mileage.h"
 
 uint16_t g_sleepDelay = 0;
@@ -64,7 +64,6 @@ void Power_Sleep_Init(void)
     Capture_Stop(40);
     Analog_Signal_Conv_Stop();
 
-    IS31_Shutdown();
 
     BU98R10_Shutdown();
 
@@ -201,12 +200,9 @@ void Power_Wakeup_Init ( void )
     Common_DataInit();
 
 
-    IS31_OFF_Wakeup();
-    IS31FL3236_Update();
-    Init93015_IIC();//4034
+
     BU98R10_Init();
 	APP_CAN_Init();
-    IS31FL3236_Init();
     Data_User_Mileage_WakeupInit();
 }
 
@@ -237,16 +233,14 @@ void Power_IG_ON_Init(void)
     TMB0_PWM_Pin33_Init();
     DiagnosisInit_main();
     U2_DiagnosisInit_main();
-    uart2_User_KL15_Init();
+    //uart2_User_KL15_Init();
     APP_CAN_Init();
 
     Common_Set_IG_Sts(COMMON_POWER_ON);
     //   UART2_Init(115200);
-    //IS31FL3236_Init();
-    Init93015_IIC(); // 4034
-    DtcFaultInit();
-    /*----------------------------------------*/
-    BatteryVoltageDelayInit();
+
+
+
 
 }
 void Power_IG_OVP_Init(void)

HJ232_Source/source/Application/PowerManagement/System_Monitor_user.c

@@ -93,7 +93,7 @@ uint8_t Sys_Read_KL30_Valid(void)
 uint8_t System_LINE_KL15(void)
 {
     uint8_t u8KL15;
-    if(PORT_GetBit(CHECK_KL15_In)){
+    if(PORT_GetBit(POWER_KL15_In)){
         u8KL15 = 1;
     }
     else{

HJ232_Source/source/Application/Telltales/app_Telltales.c

 #include "app_Telltales.h"
-#include "IS31FL3236.h"
+
 
 
 typedef struct
@@ -50,10 +50,7 @@ const s_IS31FL3236_LED_Channel_t IS31FL3236_LED_Channel[LED_MAX] =
 
 void App_Telltales_Ctrl(uint8_t Idx, uint8_t Status)
 {
-    if(IS31FL3236_LED_Channel[Idx].Chl != 0xFF)
-    {
-        u8IS31Data[IS31FL3236_LED_Channel[Idx].ICNum][IS31FL3236_LED_Channel[Idx].Chl] = Status;
-    }
+    
 }
 
 void App_Telltales_AllON(void)

HJ232_Source/source/Driver/inc/AW93015.h

-#ifndef __SOUND_IIC_H__
-#define __SOUND_IIC_H__
-/** SWDG *********************************************************************/
-
-#define MAX_NUM    30
-
-
-typedef void (*aw9310x_irq_init_t)(void(*)(void));
-
-typedef struct {
-    uint16_t Value_Filter[MAX_NUM]; 
-		uint16_t MaxValue;
-		uint16_t MinValue;
-		uint16_t CurValue;
-	  uint16_t AveValue; 
-		uint32_t CumulativeSum;
-		uint8_t MaxValuePtr;
-		uint8_t MinValuePtr;
-}PD_VALUE_FILTER_PARA;
-
-extern PD_VALUE_FILTER_PARA PD1_Value;
-extern PD_VALUE_FILTER_PARA PD2_Value;
-
-extern void Init93015_IIC(void);
-uint8_t GET_Key_Prosess(void);
-#endif /* __SOUND_IIC_H__ */

HJ232_Source/source/Driver/inc/IS31FL3236.h

-#include "common.h"
-#ifdef        GLOBALS_IS31FL3236
-#define   EXTERN_IS31FL3236
-#else
-#define   EXTERN_IS31FL3236    extern
-#endif
-
-
-
-#ifndef IS31FL3236_H__
-#define IS31FL3236_H__
-
-
-
-/*-------------------------------------------------------------------------------------------*/
-
-#define IS31_CHIP_NUM 1U
-
-#define IS31_CHIP1_ADDRESS 0X78U
-#define IS31_CHIP2_ADDRESS 0X7EU
-#define IS31_CHIP3_ADDRESS 0X7AU
-#define IS31_CHIP4_ADDRESS 0X7CU
-
-/*-------------------------------------------------------------------------------------------*/
-#define IS31_CHANNEL_NUM 36U
-
-
-extern uint8_t u8IS31Data[IS31_CHIP_NUM][IS31_CHANNEL_NUM];
-extern uint8_t LedUpdateDeviceFlg;
-
-/*-------------------------------------------------------------------------*/
-
-#if (IS31_CHIP_NUM >= 1U)
-
-#define IS31_CHIP0_CHANNEL01 u8IS31Data[0U][0U]
-#define IS31_CHIP0_CHANNEL02 u8IS31Data[0U][1U]
-#define IS31_CHIP0_CHANNEL03 u8IS31Data[0U][2U]
-#define IS31_CHIP0_CHANNEL04 u8IS31Data[0U][3U]
-#define IS31_CHIP0_CHANNEL05 u8IS31Data[0U][4U]
-#define IS31_CHIP0_CHANNEL06 u8IS31Data[0U][5U]
-#define IS31_CHIP0_CHANNEL07 u8IS31Data[0U][6U]
-#define IS31_CHIP0_CHANNEL08 u8IS31Data[0U][7U]
-#define IS31_CHIP0_CHANNEL09 u8IS31Data[0U][8U]
-#define IS31_CHIP0_CHANNEL10 u8IS31Data[0U][9U]
-#define IS31_CHIP0_CHANNEL11 u8IS31Data[0U][10U]
-#define IS31_CHIP0_CHANNEL12 u8IS31Data[0U][11U]
-#define IS31_CHIP0_CHANNEL13 u8IS31Data[0U][12U]
-#define IS31_CHIP0_CHANNEL14 u8IS31Data[0U][13U]
-#define IS31_CHIP0_CHANNEL15 u8IS31Data[0U][14U]
-#define IS31_CHIP0_CHANNEL16 u8IS31Data[0U][15U]
-#define IS31_CHIP0_CHANNEL17 u8IS31Data[0U][16U]
-#define IS31_CHIP0_CHANNEL18 u8IS31Data[0U][17U]
-#define IS31_CHIP0_CHANNEL19 u8IS31Data[0U][18U]
-#define IS31_CHIP0_CHANNEL20 u8IS31Data[0U][19U]
-#define IS31_CHIP0_CHANNEL21 u8IS31Data[0U][20U]
-#define IS31_CHIP0_CHANNEL22 u8IS31Data[0U][21U]
-#define IS31_CHIP0_CHANNEL23 u8IS31Data[0U][22U]
-#define IS31_CHIP0_CHANNEL24 u8IS31Data[0U][23U]
-#define IS31_CHIP0_CHANNEL25 u8IS31Data[0U][24U]
-#define IS31_CHIP0_CHANNEL26 u8IS31Data[0U][25U]
-#define IS31_CHIP0_CHANNEL27 u8IS31Data[0U][26U]
-#define IS31_CHIP0_CHANNEL28 u8IS31Data[0U][27U]
-#define IS31_CHIP0_CHANNEL29 u8IS31Data[0U][28U]
-#define IS31_CHIP0_CHANNEL30 u8IS31Data[0U][29U]
-#define IS31_CHIP0_CHANNEL31 u8IS31Data[0U][30U]
-#define IS31_CHIP0_CHANNEL32 u8IS31Data[0U][31U]
-#define IS31_CHIP0_CHANNEL33 u8IS31Data[0U][32U]
-#define IS31_CHIP0_CHANNEL34 u8IS31Data[0U][33U]
-#define IS31_CHIP0_CHANNEL35 u8IS31Data[0U][34U]
-#define IS31_CHIP0_CHANNEL36 u8IS31Data[0U][35U]
-
-#endif
-
-
-#if (IS31_CHIP_NUM >= 2U)
-#define IS31_CHIP1_CHANNEL01 u8IS31Data[1U][0U]
-#define IS31_CHIP1_CHANNEL02 u8IS31Data[1U][1U]
-#define IS31_CHIP1_CHANNEL03 u8IS31Data[1U][2U]
-#define IS31_CHIP1_CHANNEL04 u8IS31Data[1U][3U]
-#define IS31_CHIP1_CHANNEL05 u8IS31Data[1U][4U]
-#define IS31_CHIP1_CHANNEL06 u8IS31Data[1U][5U]
-#define IS31_CHIP1_CHANNEL07 u8IS31Data[1U][6U]
-#define IS31_CHIP1_CHANNEL08 u8IS31Data[1U][7U]
-#define IS31_CHIP1_CHANNEL09 u8IS31Data[1U][8U]
-#define IS31_CHIP1_CHANNEL10 u8IS31Data[1U][9U]
-#define IS31_CHIP1_CHANNEL11 u8IS31Data[1U][10U]
-#define IS31_CHIP1_CHANNEL12 u8IS31Data[1U][11U]
-#define IS31_CHIP1_CHANNEL13 u8IS31Data[1U][12U]
-#define IS31_CHIP1_CHANNEL14 u8IS31Data[1U][13U]
-#define IS31_CHIP1_CHANNEL15 u8IS31Data[1U][14U]
-#define IS31_CHIP1_CHANNEL16 u8IS31Data[1U][15U]
-#define IS31_CHIP1_CHANNEL17 u8IS31Data[1U][16U]
-#define IS31_CHIP1_CHANNEL18 u8IS31Data[1U][17U]
-#define IS31_CHIP1_CHANNEL19 u8IS31Data[1U][18U]
-#define IS31_CHIP1_CHANNEL20 u8IS31Data[1U][19U]
-#define IS31_CHIP1_CHANNEL21 u8IS31Data[1U][20U]
-#define IS31_CHIP1_CHANNEL22 u8IS31Data[1U][21U]
-#define IS31_CHIP1_CHANNEL23 u8IS31Data[1U][22U]
-#define IS31_CHIP1_CHANNEL24 u8IS31Data[1U][23U]
-#define IS31_CHIP1_CHANNEL25 u8IS31Data[1U][24U]
-#define IS31_CHIP1_CHANNEL26 u8IS31Data[1U][25U]
-#define IS31_CHIP1_CHANNEL27 u8IS31Data[1U][26U]
-#define IS31_CHIP1_CHANNEL28 u8IS31Data[1U][27U]
-#define IS31_CHIP1_CHANNEL29 u8IS31Data[1U][28U]
-#define IS31_CHIP1_CHANNEL30 u8IS31Data[1U][29U]
-#define IS31_CHIP1_CHANNEL31 u8IS31Data[1U][30U]
-#define IS31_CHIP1_CHANNEL32 u8IS31Data[1U][31U]
-#define IS31_CHIP1_CHANNEL33 u8IS31Data[1U][32U]
-#define IS31_CHIP1_CHANNEL34 u8IS31Data[1U][33U]
-#define IS31_CHIP1_CHANNEL35 u8IS31Data[1U][34U]
-#define IS31_CHIP1_CHANNEL36 u8IS31Data[1U][35U]
-
-#endif
-
-#if (IS31_CHIP_NUM >= 3U)
-
-#define IS31_CHIP2_CHANNEL01 u8IS31Data[2U][0U]
-#define IS31_CHIP2_CHANNEL02 u8IS31Data[2U][1U]
-#define IS31_CHIP2_CHANNEL03 u8IS31Data[2U][2U]
-#define IS31_CHIP2_CHANNEL04 u8IS31Data[2U][3U]
-#define IS31_CHIP2_CHANNEL05 u8IS31Data[2U][4U]
-#define IS31_CHIP2_CHANNEL06 u8IS31Data[2U][5U]
-#define IS31_CHIP2_CHANNEL07 u8IS31Data[2U][6U]
-#define IS31_CHIP2_CHANNEL08 u8IS31Data[2U][7U]
-#define IS31_CHIP2_CHANNEL09 u8IS31Data[2U][8U]
-#define IS31_CHIP2_CHANNEL10 u8IS31Data[2U][9U]
-#define IS31_CHIP2_CHANNEL11 u8IS31Data[2U][10U]
-#define IS31_CHIP2_CHANNEL12 u8IS31Data[2U][11U]
-#define IS31_CHIP2_CHANNEL13 u8IS31Data[2U][12U]
-#define IS31_CHIP2_CHANNEL14 u8IS31Data[2U][13U]
-#define IS31_CHIP2_CHANNEL15 u8IS31Data[2U][14U]
-#define IS31_CHIP2_CHANNEL16 u8IS31Data[2U][15U]
-#define IS31_CHIP2_CHANNEL17 u8IS31Data[2U][16U]
-#define IS31_CHIP2_CHANNEL18 u8IS31Data[2U][17U]
-#define IS31_CHIP2_CHANNEL19 u8IS31Data[2U][18U]
-#define IS31_CHIP2_CHANNEL20 u8IS31Data[2U][19U]
-#define IS31_CHIP2_CHANNEL21 u8IS31Data[2U][20U]
-#define IS31_CHIP2_CHANNEL22 u8IS31Data[2U][21U]
-#define IS31_CHIP2_CHANNEL23 u8IS31Data[2U][22U]
-#define IS31_CHIP2_CHANNEL24 u8IS31Data[2U][23U]
-#define IS31_CHIP2_CHANNEL25 u8IS31Data[2U][24U]
-#define IS31_CHIP2_CHANNEL26 u8IS31Data[2U][25U]
-#define IS31_CHIP2_CHANNEL27 u8IS31Data[2U][26U]
-#define IS31_CHIP2_CHANNEL28 u8IS31Data[2U][27U]
-#define IS31_CHIP2_CHANNEL29 u8IS31Data[2U][28U]
-#define IS31_CHIP2_CHANNEL30 u8IS31Data[2U][29U]
-#define IS31_CHIP2_CHANNEL31 u8IS31Data[2U][30U]
-#define IS31_CHIP2_CHANNEL32 u8IS31Data[2U][31U]
-#define IS31_CHIP2_CHANNEL33 u8IS31Data[2U][32U]
-#define IS31_CHIP2_CHANNEL34 u8IS31Data[2U][33U]
-#define IS31_CHIP2_CHANNEL35 u8IS31Data[2U][34U]
-#define IS31_CHIP2_CHANNEL36 u8IS31Data[2U][35U]
-
-#endif
-
-#if (IS31_CHIP_NUM >= 4U)
-#define IS31_CHIP3_CHANNEL01 u8IS31Data[3U][0U]
-#define IS31_CHIP3_CHANNEL02 u8IS31Data[3U][1U]
-#define IS31_CHIP3_CHANNEL03 u8IS31Data[3U][2U]
-#define IS31_CHIP3_CHANNEL04 u8IS31Data[3U][3U]
-#define IS31_CHIP3_CHANNEL05 u8IS31Data[3U][4U]
-#define IS31_CHIP3_CHANNEL06 u8IS31Data[3U][5U]
-#define IS31_CHIP3_CHANNEL07 u8IS31Data[3U][6U]
-#define IS31_CHIP3_CHANNEL08 u8IS31Data[3U][7U]
-#define IS31_CHIP3_CHANNEL09 u8IS31Data[3U][8U]
-#define IS31_CHIP3_CHANNEL10 u8IS31Data[3U][9U]
-#define IS31_CHIP3_CHANNEL11 u8IS31Data[3U][10U]
-#define IS31_CHIP3_CHANNEL12 u8IS31Data[3U][11U]
-#define IS31_CHIP3_CHANNEL13 u8IS31Data[3U][12U]
-#define IS31_CHIP3_CHANNEL14 u8IS31Data[3U][13U]
-#define IS31_CHIP3_CHANNEL15 u8IS31Data[3U][14U]
-#define IS31_CHIP3_CHANNEL16 u8IS31Data[3U][15U]
-#define IS31_CHIP3_CHANNEL17 u8IS31Data[3U][16U]
-#define IS31_CHIP3_CHANNEL18 u8IS31Data[3U][17U]
-#define IS31_CHIP3_CHANNEL19 u8IS31Data[3U][18U]
-#define IS31_CHIP3_CHANNEL20 u8IS31Data[3U][19U]
-#define IS31_CHIP3_CHANNEL21 u8IS31Data[3U][20U]
-#define IS31_CHIP3_CHANNEL22 u8IS31Data[3U][21U]
-#define IS31_CHIP3_CHANNEL23 u8IS31Data[3U][22U]
-#define IS31_CHIP3_CHANNEL24 u8IS31Data[3U][23U]
-#define IS31_CHIP3_CHANNEL25 u8IS31Data[3U][24U]
-#define IS31_CHIP3_CHANNEL26 u8IS31Data[3U][25U]
-#define IS31_CHIP3_CHANNEL27 u8IS31Data[3U][26U]
-#define IS31_CHIP3_CHANNEL28 u8IS31Data[3U][27U]
-#define IS31_CHIP3_CHANNEL29 u8IS31Data[3U][28U]
-#define IS31_CHIP3_CHANNEL30 u8IS31Data[3U][29U]
-#define IS31_CHIP3_CHANNEL31 u8IS31Data[3U][30U]
-#define IS31_CHIP3_CHANNEL32 u8IS31Data[3U][31U]
-#define IS31_CHIP3_CHANNEL33 u8IS31Data[3U][32U]
-#define IS31_CHIP3_CHANNEL34 u8IS31Data[3U][33U]
-#define IS31_CHIP3_CHANNEL35 u8IS31Data[3U][34U]
-#define IS31_CHIP3_CHANNEL36 u8IS31Data[3U][35U]
-
-#endif
-/*-------------------------------------------------------------------------------------------*/
-
-/*------------------------------------------------------*/
-#define     EXTEND_IO       0x78
-
-EXTERN_IS31FL3236 uint32_t IIC_3236_NACK_Time;
-
-EXTERN_IS31FL3236 void IS31_Shutdown(void);
-EXTERN_IS31FL3236 void IS31FL3236_Update(void);
-EXTERN_IS31FL3236 void IS31FL3236_Init(void);
-EXTERN_IS31FL3236 void IS31FL3236_Clear(void);
-EXTERN_IS31FL3236 void IS31_OFF_Wakeup(void);
-EXTERN_IS31FL3236 void LED_OFF_Display(void);
-
-// extern void Sys_Run_MODE_2ms_Tasks(void);
-// extern void Sys_Run_MODE_5ms_Tasks(void);
-// extern void Sys_Run_MODE_10ms_Tasks(void);
-
-
-
-
-
-
-
-#endif

HJ232_Source/source/Driver/inc/IS31_IIC_Master.h

-#ifndef IS31_IIC_MASTER_H_
-#define IS31_IIC_MASTER_H_
-
-#include "gpio.h"
-#define                 IS31_IIC_WaitOverTime                  50
-
-#define  IIC_ACCESS_PORT_REG_DIRECT
-
-
-#define SCL_LED_DRIVER_PORT PORT7
-#define SCL_LED_DRIVER_PIN 	PIN5
-#define SDA_LED_DRIVER_PORT PORT7
-#define SDA_LED_DRIVER_PIN 	PIN4
-
-
-
-
-/******************************************************************************
-
-******************************************************************************/
-
-//#define   IIC_SDAGet             PORT_GetBit(SEG_LED_SD);
-
-
-
-//#define IS31_IIC_SCL_Dir_Out    PORT_Init(SEG_LED_SCL, OPENDRAIN_OUTPUT);
-//#define IS31_IIC_SCL_Dir_In     PORT_Init(SEG_LED_SCL, INPUT);
-//#define IS31_IIC_SDA_Dir_Out    PORT_Init(SEG_LED_SD, OPENDRAIN_OUTPUT);
-//#define IS31_IIC_SDA_Dir_In     PORT_Init(SEG_LED_SD, INPUT);
-//#define IS31_IIC_SDB_Dir_Out    PORT_Init(SEG_LED_CSB, OUTPUT);
-
-
-//#define IS31_IIC_SCL_HIGH       PORT_SetBit(SEG_LED_SCL);  
-//#define IS31_IIC_SCL_LOW        PORT_ClrBit(SEG_LED_SCL);
-//#define IS31_IIC_SDA_HIGH       PORT_SetBit(SEG_LED_SD);  
-//#define IS31_IIC_SDA_LOW        PORT_ClrBit(SEG_LED_SD);
-//#define IS31_IIC_SDB_HIGH       PORT_SetBit(SEG_LED_CSB);
-//#define IS31_IIC_SDB_LOW        PORT_ClrBit(SEG_LED_CSB);
-
-
-
-extern uint8_t IIC_SDAGet (void);
-extern void IS31_IIC_SCL_Dir_Out(void);
-extern void IS31_IIC_SCL_Dir_In(void);
-extern void IS31_IIC_SDA_Dir_Out(void);
-extern void IS31_IIC_SDA_Dir_In(void);
-extern void  bsp_IIC_SDA_out( uint8_t dat ) ;
-extern void  bsp_IIC_SCL_out( uint8_t dat ); 
-
-
-
-
-
-/******************************************************************************
-
-******************************************************************************/
-extern void      Simulated_IIC_2_Init(void);
-
-extern void      IS31_IIC_delay(uint32_t time);
-extern void      IS31_IIC_Start(void);
-extern void      IS31_IIC_Stop(void);
-extern void      IS31_IIC_NACK(void);
-extern void      IS31_IIC_ACK(void);
-extern void      IS31_IIC_SendByte(uint8_t Data);
-extern uint8_t     IS31_IIC_ReadByte(void);
-extern uint8_t     IS31_IIC_WaitAck(void);
-extern void      Simulated_Release_SCL(void);
-extern void 			bsp_IIC_nop(void);
-#endif

HJ232_Source/source/Driver/src/BU98R10.C

 
 
 #include "BU98R10.h"
-#include "IS31FL3236.h"
+
 
 /* 端口寄存器基地址 */
 #define Register_Base_Address 0X40040000UL

HJ232_Source/source/Driver/src/IS31FL3236.c

-#include "common.h"
-#include "wdt.h"
-#define  GLOBALS_IS31_IIC_MASTER
-#include "IS31FL3236.h"
-#include "IS31_IIC_Master.h"
-
-#define  AW21xxx_DEVICE_ADDR 0x68
-#define  AW21_REG_UPDATE 0x6E
-#define  AW21_REG_BR0  1
-#define  AW21_REG_COL0 0x4A
-#define  AW21_COL_UPDATE 0x49
-
-//#define  IS31FLxxxx_DEVICE_ADDR 0x78
-#define  IS31_REG_GCR 0x4A
-#define  IS31_REG_UPDATE 0x25
-
-extern uint8_t IIC_addr;
-
-
-
-uint8_t IS31FLxxxx_Device_Addr[IS31_CHIP_NUM] = {0x78};
-
-uint32_t IIC_3236_NACK_Time = 0u;
-uint8_t u8IS31Data[IS31_CHIP_NUM][IS31_CHANNEL_NUM];
-
-
-void IS31_Set_SDB_Pin(uint8_t u8Level)
-{
-    if(u8Level == 0)
-    {
-        PORT_ClrBit(SEG_LED_CSB);
-    }
-    else
-    {
-        PORT_SetBit(SEG_LED_CSB);
-    }
-}
-
-void IS31_Shutdown(void)
-{
-    IS31_Set_SDB_Pin(0U);
-}
-void IS31_OFF_Wakeup(void)
-{
-    IS31_Set_SDB_Pin(1U);
-}
-
-void IS31FL3236_Clear(void)
-{
-    uint8_t i = 0u;
-    uint8_t j = 0U;
-
-    for (i = 0U; i < IS31_CHIP_NUM; i++)
-    {
-        for (j = 0U; j < IS31_CHANNEL_NUM; j++)
-        {
-            u8IS31Data[i][j] = 0U;
-        }
-    }
-}
-
-void extend_i2c_write_one_byte(uint8_t DEVICE_ADDR,uint8_t REG_ADDR,uint8_t data)
-{
-    uint8_t ack = 0u; 
-    IS31_IIC_Start();
-    IS31_IIC_SendByte(DEVICE_ADDR);
-    ack = IS31_IIC_WaitAck();
-    IS31_IIC_SendByte(REG_ADDR);
-    ack = IS31_IIC_WaitAck();
-    IS31_IIC_SendByte(data);
-    ack = IS31_IIC_WaitAck();
-    IS31_IIC_Stop();  
-}
-
-void extend_CheckChips(void)
-{
-  
-}
-
-uint8_t chipType = 0u;
-void IS31FL3236_Init(void)
-{
-    uint8_t i = 0u;
-    uint8_t j = 0U;
-    uint8_t ack = 0u; 
-    
-    IS31_Set_SDB_Pin(1);
-
-    for (i = 0U; i < IS31_CHIP_NUM; i++)
-    {
-        for (j = 0U; j < IS31_CHANNEL_NUM; j++)
-        {
-            u8IS31Data[i][j] = 0U;
-        }
-    }
-    //IS31_IIC_delay(30000);
-    IS31_IIC_delay(35000);
-
-    if(chipType == 0x00)
-    {
-        IS31_IIC_Start();
-        IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR);
-        ack = IS31_IIC_WaitAck();
-        IS31_IIC_SendByte(0x7E);
-        ack = IS31_IIC_WaitAck();
-        IS31_IIC_Stop();
-        
-        IS31_IIC_Start();
-        IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR | 0x01);
-        ack = IS31_IIC_WaitAck();
-        chipType = IS31_IIC_ReadByte();
-        IS31_IIC_ACK();
-        IS31_IIC_Stop();
-        
-        if((chipType != 0xA8) && (chipType != 0xFF))
-        {
-            IS31_IIC_delay(10000);
-            
-            IS31_IIC_Start();
-            IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR);
-            ack = IS31_IIC_WaitAck();
-            IS31_IIC_SendByte(0x7E);
-            ack = IS31_IIC_WaitAck();
-            IS31_IIC_Stop();
-            
-            IS31_IIC_Start();
-            IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR | 0x01);
-            ack = IS31_IIC_WaitAck();
-            chipType = IS31_IIC_ReadByte();
-            IS31_IIC_ACK();
-            IS31_IIC_Stop();
-        }
-        
-        if((chipType != 0xA8) && (chipType != 0xFF))
-        {
-            IS31_IIC_delay(10000);
-            
-            IS31_IIC_Start();
-            IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR);
-            ack = IS31_IIC_WaitAck();
-            IS31_IIC_SendByte(0x7E);
-            ack = IS31_IIC_WaitAck();
-            IS31_IIC_Stop();
-            
-            IS31_IIC_Start();
-            IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR | 0x01);
-            ack = IS31_IIC_WaitAck();
-            chipType = IS31_IIC_ReadByte();
-            IS31_IIC_ACK();
-            IS31_IIC_Stop();
-        }
-    }
-    
-    if(chipType == 0xA8) //AW21036
-    {
- 
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, 0x7f, 0x00);
-        //IS31_IIC_delay(30000);
-        IS31_IIC_delay(35000);
-
-
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, 0x00, 0x01);
-        
-
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, 0x6e, 0xff);
-
- 
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, 0x6e, 0xff);
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, 0xab, 0x00);
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, 0xac, 0x00);
-        
-
-        IS31_IIC_Start();
-        IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR);
-        ack = IS31_IIC_WaitAck();
-
-        IS31_IIC_SendByte(AW21_REG_BR0);
-        ack = IS31_IIC_WaitAck();
-        
-        for(i = 0;i < 36;i++)
-        {
-            IS31_IIC_SendByte(0x70);
-            ack = IS31_IIC_WaitAck();
-            WDT_Restart();
-        }
-        
-        for(i = 0;i < 36; i++) 
-        {
-            extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, AW21_REG_COL0 + i,0x00);
-        }
-
-        
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, AW21_COL_UPDATE, 0x00);
-    }
-    else
-    {
-        for (j = 0; j < 2; j++)
-        {
-            
-            IIC_addr = IS31FLxxxx_Device_Addr[j];
-            extend_i2c_write_one_byte(IS31FLxxxx_Device_Addr[j], 0x4F, 0x00);
-            //IS31_IIC_delay(30000);
-            IS31_IIC_delay(35000);
-
-            extend_i2c_write_one_byte(IS31FLxxxx_Device_Addr[j],0x00,0x01);
-            
-            IS31_IIC_Start();
-            IS31_IIC_SendByte(IS31FLxxxx_Device_Addr[j]);
-            ack = IS31_IIC_WaitAck();
-            
-            IS31_IIC_SendByte(0x26);
-            ack = IS31_IIC_WaitAck();
-           
-            for(i = 0;i < 36;i++)
-            {
-                IS31_IIC_SendByte(0x01);
-                ack = IS31_IIC_WaitAck();
-                WDT_Restart();
-            }
-            IS31_IIC_Stop();
-
-            extend_i2c_write_one_byte(IS31FLxxxx_Device_Addr[j],IS31_REG_GCR,0x00);
-        }
-    }
-}
-
-uint8_t LedUpdateStep = 0u;
-uint8_t LedUpdateDevice = 0u;
-uint8_t LedUpdateDeviceFlg = 0u;
-void IS31FL3236_Update(void)
-{
-    uint8_t ack = 0u;
-    int i;
-    
-    IIC_addr = IS31FLxxxx_Device_Addr[LedUpdateDevice];
-	if(!LedUpdateDeviceFlg)
-		{ return; }
-	LedUpdateDeviceFlg = 0;
-    
-    if(IIC_3236_NACK_Time > 30000)
-    {
-        IIC_3236_NACK_Time = 0;
-        IS31_Set_SDB_Pin(0);
-        for(i=0;i<30000;i++)
-        {
-            WDT_Restart();
-        }
-        IS31_Set_SDB_Pin(1);
-        IS31FL3236_Init();
-    }
-
-    if(LedUpdateStep >= 36)
-    {
-        LedUpdateStep = 0;
-    }
-
-    if (LedUpdateStep == 0)
-    {
-        LedUpdateStep = 5;
-    }
-    if (LedUpdateStep == 18)
-    {
-        LedUpdateStep = 23;
-    }
-    if (LedUpdateStep == 28)
-    {
-        LedUpdateStep = 33;
-    }
-    if (LedUpdateStep == 35)
-    {
-        LedUpdateStep = 5;
-    }
-    
-    if(chipType == 0xA8)
-    {
-        IS31_IIC_Start();
-        IS31_IIC_SendByte(AW21xxx_DEVICE_ADDR);
-        ack = IS31_IIC_WaitAck();
-        IS31_IIC_SendByte(AW21_REG_COL0 + LedUpdateStep);
-        ack = IS31_IIC_WaitAck();
-
-        while(LedUpdateStep < 36)
-        {
-            if(u8IS31Data[0][LedUpdateStep])
-            {
-                IS31_IIC_SendByte(0xff);
-            }
-            else
-            {
-                IS31_IIC_SendByte(0x00);
-            }
-
-            ack = IS31_IIC_WaitAck();
-            LedUpdateStep++;
-            //if((LedUpdateStep % 7) == 0)
-            //{
-            //   break;
-            //}
-            WDT_Restart();
-						
-						
-						// Sys_Run_MODE_2ms_Tasks();
-						// Sys_Run_MODE_5ms_Tasks();
-						// Sys_Run_MODE_10ms_Tasks();
-						
-        }
-				
-        IS31_IIC_Stop();
-        
-        extend_i2c_write_one_byte(AW21xxx_DEVICE_ADDR, AW21_COL_UPDATE, 0x00);
-    }
-    else
-    {
-        IS31_IIC_Start();
-        IS31_IIC_SendByte(IS31FLxxxx_Device_Addr[LedUpdateDevice]);
-        ack = IS31_IIC_WaitAck();
-        IS31_IIC_SendByte(0x01 + LedUpdateStep);
-        ack = IS31_IIC_WaitAck();
-
-        while(LedUpdateStep < 36)
-        {
-            IS31_IIC_SendByte(u8IS31Data[LedUpdateDevice][LedUpdateStep]);
-            ack = IS31_IIC_WaitAck();
-            LedUpdateStep++;
-            //if((LedUpdateStep % 7) == 0)
-            //{
-            //    break;
-            //}
-            WDT_Restart();
-			// Sys_Run_MODE_2ms_Tasks();
-			// Sys_Run_MODE_5ms_Tasks();
-			// Sys_Run_MODE_10ms_Tasks();
-						
-        }
-        IS31_IIC_Stop();
-        
-        
-        extend_i2c_write_one_byte(IS31FLxxxx_Device_Addr[LedUpdateDevice],IS31_REG_UPDATE,0x00);
-        if(LedUpdateStep >= 36)
-        {
-            LedUpdateStep = 0;
-        }
-    }
-}

HJ232_Source/source/Driver/src/can.c

@@ -488,7 +488,7 @@ void bsp_CAN_Init(void)
     /* Set CAN0RXD pin */
     CRXD0_PORT_SETTING();
     
-    PORT_ClrBit(CAN0_STB);
+    PORT_ClrBit(CAN_STB_MCU);
 
     CanSendLock = 0;
   

HJ232_Source/source/Driver/src/timerA_B_C.c

@@ -89,8 +89,8 @@ void TMB0_Stop(void)
     TMB->TBSR = 0x00U;
 
     CGC->PER1 &= ~CGC_PER1_TMBEN_Msk;     /* disables input clock supply */
-    PORT_Init(PWM_BL        , OUTPUT);
-	PORT_ClrBit(PWM_BL);
+    PORT_Init(BACKLIGHT_PWM, OUTPUT);
+	PORT_ClrBit(BACKLIGHT_PWM);
 }
 /*-------------------------------------------------------------------------
 * Function Name  : TMB0_PWM_Freq_Duty

HJ232_Source/source/System/init.c

@@ -25,8 +25,8 @@
 #include "can.h"
 #include "eeManager_Interface.h"
 #include "Services_Mileage_User.h"
-#include "IS31_IIC_Master.h"
-#include "IS31FL3236.h"
+
+
 #include "Services_Mileage.h"
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
@@ -42,43 +42,7 @@
 ******************************************************************************/
 void Sys_Startup_Pre_Init(void)
 {
-//    uint32_t i = 0u;
-//    /* Release all Modules (except SDRAM controller) */
-//    Sys_Peripheral_Reset(SYS_PERI_RESETTABLE & (~SYS_PERI_SDRB0));
-//
-//    /* Prepare device (clear all internal config, prepare interrupts) */
-//    R_DEV_Prepare();
-//    Clock_Pre_Init();
-//	RTC_Pre_Init();
-//    GPIO_Init(0);
-//
-//    /*时序延时*/
-//    GPIO_OUT_PORT11_PIN02 = 0 ; /*FLASH电平转换信号  P17_0*/
-//    for (i = 0u; i < 10000u;  i++) {;;}
-//    GPIO_OUT_PORT11_PIN02 = 1 ;
-//
-//    VCC12V0_OUT_EN = 0u; /*P42_12*/
-//    for (i = 0u; i < 1000u;  i++) {;;}
-//    VCC12V0_OUT_EN = 1u;
-//
-//    GPIO_OUT_PORT42_PIN03 = 1u;/*P42_3*/
-//
-//    for (i = 0u; i < 6000000u;  i++) {;;}/*10000000u~127ms*/
-//    MCU_RSTB_LCD = 1u;   /*P3_0*/
-//
-//    for (i = 0u; i < 3000000u;  i++) {;;}/*4000000u~66ms*/
-//    LCD_BIAS_EN = 1u;   /*P3_1*/
-//
-//    for (i = 0u; i < 3000000u;  i++) {;;}
-//    MCU_DCLK = 1u;   /*MCU_DCLK/P45_0*/
-//
-//    for (i = 0u; i < 1000u;  i++) {;;}
-//    LCD_STDBYB = 1U; /*61194_EN_MCU/P11-3*/
-//
-//    Mem_SDRAM_Init(MEM_SDRAM_2x_W9812G6KH_120MHz, Mem_SDRAM_DRV_25Ohm);
-//    //Mem_SDRAM_Init(MEM_SDRAM_2x_IS45S16800F_120MHz, Mem_SDRAM_DRV_25Ohm);
-//
-//    Sys_Enable_Preload_Buffer();
+
 }
 
 /**************************************************************************//**
@@ -95,8 +59,8 @@ void Sys_Startup_Init(void)
     
     GPIO_Init(GPIO_WAKEUP_MODE);
 
-	    Simulated_IIC_2_Init();
-    IS31FL3236_Init();
+
+
 
 
     Sys_Tick_Timer_Start();

HJ232_Source/source/System/tasks.c

@@ -32,8 +32,8 @@
 #include "BU98R10.h"
 #include "Services_Mileage_User.h"
 #include "can.h"
-#include "IS31FL3236.h"
-#include "IS31_IIC_Master.h"
+
+
 #include "app_Telltales.h"
 #include "Services_Mileage.h"
 #include "Gui_Seg_Dis.h"
@@ -103,7 +103,6 @@ void Sys_Run_Mode_20ms_Tasks(void)
 {
 	BU98R10_Update_Request();
     Diag_Req_Send(20);		
-    IS31FL3236_Update();
 }
 /*============================================================================*/
 
@@ -119,12 +118,6 @@ void Sys_Run_Mode_50ms_Tasks(void)
 
 
 
-    CAN_LED_Check_50msTask();
-
-
-    SetDtcFault();
-
-
 
 
 }

HJ232_Source/tim4DelayCounter.uvprojx

@@ -543,36 +543,6 @@
               <FileType>1</FileType>
               <FilePath>.\source\Driver\src\flash.c</FilePath>
             </File>
-            <File>
-              <FileName>IS31FL3236.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>.\source\Driver\inc\IS31FL3236.h</FilePath>
-            </File>
-            <File>
-              <FileName>IS31FL3236.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\source\Driver\src\IS31FL3236.c</FilePath>
-            </File>
-            <File>
-              <FileName>AW93015.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>.\source\Driver\inc\AW93015.h</FilePath>
-            </File>
-            <File>
-              <FileName>AW93015.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\source\Driver\src\AW93015.c</FilePath>
-            </File>
-            <File>
-              <FileName>IS31_IIC_Master.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>.\source\Driver\inc\IS31_IIC_Master.h</FilePath>
-            </File>
-            <File>
-              <FileName>IS31_IIC_Master.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\source\Driver\src\IS31_IIC_Master.c</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>