Skip to content

TianYing_ty100
TianYing_ty100
Commit fa9fdbc9 authored by 高士达's avatar 高士达
Browse files
Options

Merge branch 'lijianshuang' into 'dev' 

Lijianshuang

See merge request !83
parents ecebdbe4 ca782e9b
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 333 deletions
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx
View file @ fa9fdbc9
......@@ -513,16 +513,6 @@
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_TPMS\Data_TPMS.h</FilePath>
</File>
<File>
<FileName>FaultCode.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\FaultCode\FaultCode.c</FilePath>
</File>
<File>
<FileName>FaultCode.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\FaultCode\FaultCode.h</FilePath>
</File>
<File>
<FileName>Data_Voltage.c</FileName>
<FileType>1</FileType>
......
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT
View file @ fa9fdbc9
......@@ -15,7 +15,6 @@ SET CPU_CLOCK=0x00B71B00
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can_app.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_tpms.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\faultcode.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_voltage.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\bluetooth.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_crc16.__i"
......
Firmware/Source/Application/Application.h
View file @ fa9fdbc9
......@@ -17,7 +17,7 @@
#include "Data_Coolant/Data_Coolant.h"
#include "Data_TPMS/Data_TPMS.h"
#include "Data_Voltage/Data_Voltage.h"
#include "FaultCode/FaultCode.h"
#include "FaultCode/code.h"
#include "BLUETOOTH/BlueTooth.h"
#include "BLUETOOTH/Protocol_CRC16.h"
......
Firmware/Source/Application/CAN_User/Can_App.c
View file @ fa9fdbc9
......@@ -83,7 +83,7 @@ void Can_Set_Buff_6EF(canlib_uint8_t CopyData[])
uint16_t Espeed_tx = 0;
uint16_t TripA_tx = 0;
Espeed_tx = Get_ActualEngineSpeed()/100;
TripA_tx = Data_Read_Trip(EM_TRIP_A);
TripA_tx = (uint16_t)Data_Read_Trip(EM_TRIP_A);
p6EF = (CANMsg6EFUnion *)CopyData;
if ( p6EF != ( void * )0 )
{
......
Firmware/Source/Application/CAN_User/Can_App.h
View file @ fa9fdbc9
......@@ -124,5 +124,5 @@ void Can_Set_Buff_6EF(canlib_uint8_t CopyData[]);
void Can_Set_Buff_450(canlib_uint8_t CopyData[]);
void Can_Set_Buff_580(canlib_uint8_t CopyData[]);
extern void CAN_TX_Count_Init(void);
#endif
Firmware/Source/Application/CAN_User/Can_User.c
View file @ fa9fdbc9
......@@ -219,7 +219,7 @@ void Can_Rx_Cak(CanTxRxMsg *Msg)
if ((Msg->Id == DIAG_ID_Rx_FUN) || (Msg->Id == DIAG_ID_Rx_PHY))
{
DoCAN_L_Data_Indication(Msg->Id, Msg->DLC, Msg->Data);
DoCAN_L_Data_Indication((uint16_t)(Msg->Id), Msg->DLC, Msg->Data);
}
}
/**
......
Firmware/Source/Application/Data_Coolant/Data_Coolant.c
View file @ fa9fdbc9
......@@ -517,7 +517,7 @@ uint16_t GET_DataCoolantTempValueDisp(void)
}
uint16_t GET_DataCoolantSegValue(void)
{
return (u32ColCurNum)/100;
return (uint16_t)((u32ColCurNum)/100);
}
uint8_t GET_DataCollantTempValueValid(void)
{
......
Firmware/Source/Application/Data_TPMS/Data_TPMS.c
View file @ fa9fdbc9
......@@ -563,8 +563,8 @@ uint16_t Get_Front_TPMS_Sig_Value (void)
//}
//else
{
value = TPMS.Front_Press_Value + 50;
value = value / 100;
//value = TPMS.Front_Press_Value + 50;
value = (uint16_t)((TPMS.Front_Press_Value + 50) / 100);
}
return value;
}
......@@ -582,15 +582,15 @@ uint16_t Get_Rear_TPMS_Sig_Value (void)
//}
//else
{
value = TPMS.Rear_Press_Value + 50;
value = value / 100;
//value = TPMS.Rear_Press_Value + 50;
value = (uint8_t)((TPMS.Rear_Press_Value + 50) / 100);
}
return value;
}
uint16_t Get_Rear_TPMS_TX (void)
{
uint16_t value = 0;
value = Data_Bar_To_Psi(TPMS.Rear_Press_Value) / 100;
value = (uint16_t)(Data_Bar_To_Psi(TPMS.Rear_Press_Value) / 100);
if(value > 990)
{
value = 990;
......@@ -600,7 +600,7 @@ uint16_t Get_Rear_TPMS_TX (void)
uint16_t Get_Front_TPMS_TX (void)
{
uint16_t value = 0;
value = Data_Bar_To_Psi(TPMS.Front_Press_Value) / 100;
value = (uint16_t)(Data_Bar_To_Psi(TPMS.Front_Press_Value) / 100);
if(value > 990)
{
value = 990;
......
Firmware/Source/Application/Data_VSpeed/Data_VSpeed.c
View file @ fa9fdbc9
......@@ -70,10 +70,10 @@ void Data_Vehicle_Speed_Processing_Service(void)
{
uint8_t i;
uint16_t Delta;
uint32_t VSpeed;
uint16_t VSpeed;
uint32_t VSpeedCal;
uint8_t ESC_VehicleSpeedState;
uint32_t Vehicle_Speed;
uint8_t Vehicle_Speed;
Vehicle_Speed = Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed( );
ESC_VehicleSpeedState = Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed_State( );
......@@ -163,13 +163,13 @@ void Data_Vehicle_Speed_Processing_Service(void)
if ( (DataVSpeedTarget >= DataVSpeedHysteresis) || (DataVSpeedTarget < DATA_VSPEED_HYSTERESIS) )
{
DataVSpeedHysteresis = DataVSpeedTarget;
DataVSpeedHysteresis = (uint16_t)DataVSpeedTarget;
}
else
{
if ( DataVSpeedHysteresis - DataVSpeedTarget >= DATA_VSPEED_HYSTERESIS )
{
DataVSpeedHysteresis = DataVSpeedTarget;
DataVSpeedHysteresis = (uint16_t)DataVSpeedTarget;
}
}
......@@ -444,7 +444,7 @@ uint16_t Get_DispVechileSpeed(void)
}
else /* MILE */
{
Vspeed = Data_Km_To_Mile(DataVSpeedDisp);
Vspeed = (uint16_t)Data_Km_To_Mile(DataVSpeedDisp);
if ( Vspeed >= 1230 )
{
Vspeed = 1230;
......
Firmware/Source/Application/Data_Voltage/Data_Voltage.h
View file @ fa9fdbc9
......@@ -5,7 +5,7 @@
typedef struct
{
uint32_t Buffer[30];
uint8_t Buffer[30];
uint8_t Cnt;
uint8_t time;
uint16_t ResOpen_ActTimer;
......
Firmware/Source/Application/FaultCode/FaultCode.c deleted 100644 → 0
View file @ ecebdbe4
#include "FaultCode\FaultCode.h"
#include "Application.h"
uint8_t DTC_Amnt_Number = 0;
uint8_t DTC_Amnt_Number_Count = 0;
uint8_t FaultCode_Number = 0;
uint32_t DTC_Data[FualtCodeMax] = {0};
uint32_t DTC_Data_Count[FualtCodeMax] = {0};
uint32_t FaultCode_Data[FualtCodeMax] = {0};
uint32_t u32Countbuf = 0UL;
void Fault_Code_Receive(uint8_t CopyData[])
{
uint8_t i = 0;
//ECU_FaultCode_Processing_Service();
}
uint8_t FaultCode_Compare(uint32_t FaultCode, uint32_t *CodeList, uint8_t len)
{
uint8_t i = 0;
uint8_t result = 0;
for (i = 0; i < len; i++)
{
if (FaultCode == CodeList[i])
{
result = 1;
}
}
return result;
}
static void Fault_Code_App_Swap(uint32_t *pData1, uint32_t *pData2)
{
uint32_t psw;
if ((*pData1) > (*pData2))
{
psw = (*pData2);
(*pData2) = (*pData1);
(*pData1) = psw;
}
}
static void Fault_Code_App_SortNByte(uint32_t *SortData, uint8_t len)
{
uint8_t n = 0, m;
for (; n < len - 1; n++)
{
for (m = n + 1; m < len; m++)
{
Fault_Code_App_Swap((SortData + n), (SortData + m));
}
}
}
uint32_t u32YZHDArray[200];
uint32_t u32YZHDArraycount = 0;
uint32_t u32YZHDCount=0;
void ECU_FaultCode_Processing_Service(void)
{
uint8_t DTCH1 = 0;
uint8_t DTCM1 = 0;
uint8_t DTCH2 = 0;
uint8_t DTCM2 = 0;
uint32_t DTC1 = 0;
uint32_t DTC2 = 0;
uint32_t i = 0;
if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x402_Msg_Count) == CAN_SIG_LOST)
{
memset(FaultCode_Data, 0, FaultCode_Number);
FaultCode_Number = 0;
}
else
{
u32YZHDCount = 0;
DTCH1 = Get_CAN_CH0_ID_402_Sig_ECU_DTCH1();
DTCM1 = Get_CAN_CH0_ID_402_Sig_ECU_DTCM1();
DTCH2 = Get_CAN_CH0_ID_402_Sig_ECU_DTCH2();
DTCM2 = Get_CAN_CH0_ID_402_Sig_ECU_DTCM2();
DTC_Amnt_Number = Get_CAN_CH0_ID_402_Sig_ECU_DTCAmnt();
if (((DTCH1 & 0xF0) >> 4) >= 0xA)
{
DTC1 |= ((DTCH1 & 0xF0) >> 4) + 3;
}
else
{
DTC1 |= (DTCH1 & 0xF0) >> 4;
}
DTC1 <<= 8;
if ((DTCH1 & 0xF) >= 0xA)
{
DTC1 |= (DTCH1 & 0xF) + 3;
}
else
{
DTC1 |= DTCH1 & 0xF;
}
DTC1 <<= 8;
if (((DTCM1 & 0xF0) >> 4) >= 0xA)
{
DTC1 |= ((DTCM1 & 0xF0) >> 4) + 3;
}
else
{
DTC1 |= (DTCM1 & 0xF0) >> 4;
}
DTC1 <<= 8;
if ((DTCM1 & 0xF) >= 0xA)
{
DTC1 |= (DTCM1 & 0xF) + 3;
}
else
{
DTC1 |= DTCM1 & 0xF;
}
if (((DTCH2 & 0xF0) >> 4) >= 0xA)
{
DTC2 |= ((DTCH2 & 0xF0) >> 4) + 3;
}
else
{
DTC2 |= (DTCH2 & 0xF0) >> 4;
}
DTC2 <<= 8;
if ((DTCH2 & 0xF) >= 0xA)
{
DTC2 |= (DTCH2 & 0xF) + 3;
}
else
{
DTC2 |= DTCH2 & 0xF;
}
DTC2 <<= 8;
if (((DTCM2 & 0xF0) >> 4) >= 0xA)
{
DTC2 |= ((DTCM2 & 0xF0) >> 4) + 3;
}
else
{
DTC2 |= (DTCM2 & 0xF0) >> 4;
}
DTC2 <<= 8;
if ((DTCM2 & 0xF) >= 0xA)
{
DTC2 |= (DTCM2 & 0xF) + 3;
}
else
{
DTC2 |= DTCM2 & 0xF;
}
if (DTC_Amnt_Number == 0)
{
for (i = 0; i < FualtCodeMax; i++)
{
FaultCode_Data[i] = 0;
DTC_Data_Count[i] = 0;
DTC_Data[i] = 0;
}
DTC_Amnt_Number_Count = 0;
}
if (DTC_Amnt_Number_Count < DTC_Amnt_Number)
{
if ((DTC1 != 0) && (FaultCode_Compare(DTC1, &DTC_Data_Count[0], DTC_Amnt_Number_Count) == 0))
{
DTC_Data_Count[DTC_Amnt_Number_Count] = DTC1;
DTC_Amnt_Number_Count++;
Fault_Code_App_SortNByte(DTC_Data_Count, DTC_Amnt_Number_Count);
}
}
if (DTC_Amnt_Number_Count < DTC_Amnt_Number)
{
if ((DTC2 != 0) && (FaultCode_Compare(DTC2, &DTC_Data_Count[0], DTC_Amnt_Number_Count) == 0))
{
DTC_Data_Count[DTC_Amnt_Number_Count] = DTC2;
DTC_Amnt_Number_Count++;
Fault_Code_App_SortNByte(DTC_Data_Count, DTC_Amnt_Number_Count);
}
}
if (DTC_Amnt_Number_Count > DTC_Amnt_Number)
{
for (i = 0; i < FualtCodeMax; i++)
{
// FaultCode_Data[i] = 0;
DTC_Data_Count[i] = 0;
DTC_Data[i] = 0;
}
DTC_Amnt_Number_Count = 0;
}
if (DTC_Amnt_Number_Count == DTC_Amnt_Number)
{
for (i = 0; i < DTC_Amnt_Number_Count; i++)
{
DTC_Data[i] = DTC_Data_Count[i];
DTC_Data_Count[i] = 0;
Fault_Code_App_SortNByte(DTC_Data, FaultCode_Number);
}
FaultCode_Number = DTC_Amnt_Number;
DTC_Amnt_Number_Count = 0;
for (i = 0; i < FaultCode_Number; i++)
{
if (FaultCode_Data[i] != DTC_Data[i])
{
FaultCode_Data[i] = DTC_Data[i];
Fault_Code_App_SortNByte(FaultCode_Data, FaultCode_Number);
}
}
}
if (u32YZHDArraycount < 200)
{
u32YZHDArray[u32YZHDArraycount++] = u32YZHDCount;
}
}
}
else
{
memset(FaultCode_Data, 0, FaultCode_Number);
FaultCode_Number = 0;
}
}
Firmware/Source/Application/FaultCode/FaultCode.h deleted 100644 → 0
View file @ ecebdbe4
#ifndef FAULTCODE_H__
#define FAULTCODE_H__
#include "Application.h"
#include "common.h"
#define FualtCodeMax 72
extern uint32_t FaultCode_Data[FualtCodeMax] ;
extern uint8_t FaultCode_Number;
uint8_t FaultCode_Compare(uint32_t FaultCode, uint32_t* CodeList, uint8_t len);
void ECU_FaultCode_Processing_Service ( void );
//void Fault_Code_Sort(void);
extern void Fault_Code_Receive(uint8_t CopyData[]);
static void Fault_Code_App_SortNByte(uint32_t *SortData, uint8_t len);
static void Fault_Code_App_Swap(uint32_t *pData1, uint32_t *pData2);
extern uint32_t u32YZHDCount;
#endif
Firmware/Source/Application/Fuel/Data_Fuel.c
View file @ fa9fdbc9
......@@ -115,7 +115,7 @@ void Fuel_R_Cal(uint8_t deltaTime)
{
temp32 += FuelData[i];
}
FuelR = temp32 / (FUEL_CAL_END - FUEL_CAL_START);
FuelR = (uint16_t)(temp32 / (FUEL_CAL_END - FUEL_CAL_START));
FuelDataCount = 0;
FuelADCompleteFlg = 1;
}
......
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ fa9fdbc9
......@@ -62,7 +62,7 @@ void Clear_Bu98(void)
}
}
uint8_t u8VspeedCount = 0;
void Gauge_Service(void)
{
static uint16_t VSpeed_Count = 0u;
......@@ -93,11 +93,7 @@ void Gauge_Service(void)
{
LED_Driver_Channel_Set(LampChannel_0, k, LED_OFF);
}
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_35_ODO, LED_OFF);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_34_TRIP, LED_OFF);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Screen_Time, LED_OFF);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_08_KMH, LED_OFF);
//LED_Driver_Channel_Set(LampChannel_0, LampCh0_09_MPH, LED_OFF);
}
}
else
......@@ -112,8 +108,16 @@ void Gauge_Service(void)
// BU98R10Chip1DDRAM.Byte[i] = 0x77;
//}
if(u8VspeedCount < 3)
{
u8VspeedCount ++ ;
}
else
{
u8VspeedCount = 0;
SEG_SET_VSpeed_NUM(1u, Get_DispVechileSpeed( ) / 10u,Get_Dis_KM_Unit());
}
SEG_SET_VSpeed_NUM(1u, Get_DispVechileSpeed( ) / 10u,Get_Dis_KM_Unit());
SEG_SET_ODO_TRIP_FAULTCODE_TCS_DIS(Get_Dis_KM_Unit(), Get_ODO_Value() / 10u, Get_Trip_Value());
Gauge_Clock_Display();
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ fa9fdbc9
......@@ -4490,7 +4490,7 @@ uint8_t check_SEG_step = 0;
/*仪表段码扫描函数*/
void Check_SEG_Display(void)
{
uint32_t a;
uint8_t a;
uint8_t i = 0;
a = check_SEG_step / 25u;
......@@ -4531,12 +4531,12 @@ void Checkself_SEG_Display(void)
{
uint16_t Vspeed = 0;
uint16_t Espeed = 0;
uint16_t Fuel = 0;
uint8_t Fuel = 0;
uint16_t collant = 0;
uint16_t TPMS_dis = 0;
uint16_t voltage = 0;
uint16_t hour = 0;
uint16_t min = 0;
uint8_t hour = 0;
uint8_t min = 0;
uint32_t ODO = 0;
uint32_t Mileage = 0;
// uint32_t i = 0;
......
Firmware/Source/Component/BU98R10/BU98R10.c
View file @ fa9fdbc9
......@@ -12,6 +12,8 @@
#define BU98R10_CHIP1_CSB RTE_GPIO_PORT07_PIN01
#define BU98R10_CHIP1_SCL RTE_GPIO_PORT07_PIN00
#define BU98R10_NOP_TIME 5U
uint8_t BU98R10_CHIP0_GET_SD_LEVEL(void);
uint8_t BU98R10_CHIP0_GET_SD_LEVEL(void)
{
......@@ -23,6 +25,59 @@ uint8_t BU98R10_CHIP1_GET_SD_LEVEL(void)
return RTE_GPIO_Get_Level(BU98R10_CHIP1_SD);
}
void NOP_DelayTime(uint8_t timer)
{
// uint8_t i = 0;
// for(i = 0;i < timer;i++)
// {
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
__NOP();
// }
}
void BU98R10_CHIP0_SET_SD_LEVEL(uint8_t Level);
void BU98R10_CHIP0_SET_SD_LEVEL(uint8_t Level)
{
......@@ -30,15 +85,22 @@ void BU98R10_CHIP0_SET_SD_LEVEL(uint8_t Level)
{
//RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
//RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_HIGH);
PORT->P0 |= (1<<2);
//PORT->P0 |= (1<<2);
//PORT->PM0 &= ~(1<<2);
PORT->PM0 &= ~(1<<2);
PORT->PSET0 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
//RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
//RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_LOW);
PORT->P0 &= ~(1<<2);//P02
PORT->PM0 &= ~(1<<2);
// PORT->P0 &= ~(1<<2);//P02
// PORT->PM0 &= ~(1<<2);
PORT->PM0 &= ~(1<<2);
PORT->PCLR0 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
void BU98R10_CHIP1_SET_SD_LEVEL(uint8_t Level);
......@@ -48,15 +110,21 @@ void BU98R10_CHIP1_SET_SD_LEVEL(uint8_t Level)
{
//RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
//RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_HIGH);
PORT->P7 |= (1<<2);
PORT->PM7 &= ~(1<<2);
// PORT->P7 |= (1<<2);
// PORT->PM7 &= ~(1<<2);
PORT->PM7 &= ~(1<<2);
PORT->PSET7 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
//RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
//RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_LOW);
PORT->P7 &= ~(1<<2);//P72
// PORT->P7 &= ~(1<<2);//P72
// PORT->PM7 &= ~(1<<2);
PORT->PM7 &= ~(1<<2);
PORT->PCLR7 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
void BU98R10_CHIP0_SET_CSB_LEVEL(uint8_t Level);
......@@ -66,15 +134,21 @@ void BU98R10_CHIP0_SET_CSB_LEVEL(uint8_t Level)
{
// RTE_GPIO_Config(BU98R10_CHIP0_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
//RTE_GPIO_Set_Level(BU98R10_CHIP0_CSB, RTE_GPIO_LEVEL_HIGH);
PORT->P0 |= (1<<3);
PORT->PM0 &= ~(1<<3);
// PORT->P0 |= (1<<3);
// PORT->PM0 &= ~(1<<3);
PORT->PM0 &= ~(1<<3);
PORT->PSET0 = (1<<3);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
// RTE_GPIO_Config(BU98R10_CHIP0_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
//RTE_GPIO_Set_Level(BU98R10_CHIP0_CSB, RTE_GPIO_LEVEL_LOW);
PORT->P0 &= ~(1<<3);//P03
PORT->PM0 &= ~(1<<3);
// PORT->P0 &= ~(1<<3);//P03
// PORT->PM0 &= ~(1<<3);
PORT->PM0 &= ~(1<<3);
PORT->PCLR0 = (1<<3);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
void BU98R10_CHIP1_SET_CSB_LEVEL(uint8_t Level);
......@@ -84,15 +158,21 @@ void BU98R10_CHIP1_SET_CSB_LEVEL(uint8_t Level)
{
// RTE_GPIO_Config(BU98R10_CHIP1_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
//RTE_GPIO_Set_Level(BU98R10_CHIP1_CSB, RTE_GPIO_LEVEL_HIGH);
PORT->P7 |= (1<<1);
// PORT->P7 |= (1<<1);
// PORT->PM7 &= ~(1<<1);
PORT->PM7 &= ~(1<<1);
PORT->PSET7 = (1<<1);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
//RTE_GPIO_Config(BU98R10_CHIP1_CSB, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
//RTE_GPIO_Set_Level(BU98R10_CHIP1_CSB, RTE_GPIO_LEVEL_LOW);
PORT->P7 &= ~(1<<1);//P71
// PORT->P7 &= ~(1<<1);//P71
// PORT->PM7 &= ~(1<<1);
PORT->PM7 &= ~(1<<1);
PORT->PCLR7 = (1<<1);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
void BU98R10_CHIP0_SET_SCL_LEVEL(uint8_t Level);
......@@ -102,15 +182,21 @@ void BU98R10_CHIP0_SET_SCL_LEVEL(uint8_t Level)
{
//RTE_GPIO_Config(BU98R10_CHIP0_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
//RTE_GPIO_Set_Level(BU98R10_CHIP0_SCL, RTE_GPIO_LEVEL_HIGH);
PORT->P0 |= (1<<4);
PORT->PM0 &= ~(1<<4);
// PORT->P0 |= (1<<4);
// PORT->PM0 &= ~(1<<4);
PORT->PM0 &= ~(1<<4);
PORT->PSET0 = (1<<4);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
//RTE_GPIO_Config(BU98R10_CHIP0_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
//RTE_GPIO_Set_Level(BU98R10_CHIP0_SCL, RTE_GPIO_LEVEL_LOW);
PORT->P0 &= ~(1<<4);//P04
PORT->PM0 &= ~(1<<4);
// PORT->P0 &= ~(1<<4);//P04
// PORT->PM0 &= ~(1<<4);
PORT->PM0 &= ~(1<<4);
PORT->PCLR0 = (1<<4);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
void BU98R10_CHIP1_SET_SCL_LEVEL(uint8_t Level);
......@@ -120,15 +206,21 @@ void BU98R10_CHIP1_SET_SCL_LEVEL(uint8_t Level)
{
//RTE_GPIO_Config(BU98R10_CHIP1_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
//RTE_GPIO_Set_Level(BU98R10_CHIP1_SCL, RTE_GPIO_LEVEL_HIGH);
PORT->P7 |= (1<<0);
PORT->PM7 &= ~(1<<0);
// PORT->P7 |= (1<<0);
// PORT->PM7 &= ~(1<<0);
PORT->PM7 &= ~(1<<0);
PORT->PSET7 = (1<<0);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
//RTE_GPIO_Config(BU98R10_CHIP1_SCL, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW);
//RTE_GPIO_Set_Level(BU98R10_CHIP1_SCL, RTE_GPIO_LEVEL_LOW);
PORT->P7 &= ~(1<<0);//P70
PORT->PM7 &= ~(1<<0);
// PORT->P7 &= ~(1<<0);//P70
// PORT->PM7 &= ~(1<<0);
PORT->PM7 &= ~(1<<0);
PORT->PCLR7 = (1<<0);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
void BU98R10_CHIP0_SET_SD_DIR(uint8_t Dir);
......@@ -137,14 +229,18 @@ void BU98R10_CHIP0_SET_SD_DIR(uint8_t Dir)
if (Dir)
{
//RTE_GPIO_Set_Level(BU98R10_CHIP0_SD, RTE_GPIO_LEVEL_HIGH);
PORT->P0 |= (1<<2);
PORT->PM0 &= ~(1<<2);
// PORT->P0 |= (1<<2);
// PORT->PM0 &= ~(1<<2);
// RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
PORT->PSET0 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
//RTE_GPIO_Config(BU98R10_CHIP0_SD, RTE_GPIO_DIR_IN);
PORT->PM0 |= (1<<2);
// PORT->PM0 |= (1<<2);
PORT->PCLR0 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
void BU98R10_CHIP1_SET_SD_DIR(uint8_t Dir);
......@@ -154,13 +250,17 @@ void BU98R10_CHIP1_SET_SD_DIR(uint8_t Dir)
{
//RTE_GPIO_Set_Level(BU98R10_CHIP1_SD, RTE_GPIO_LEVEL_HIGH);
//RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH);
PORT->P7 |= (1<<2);
PORT->PM7 &= ~(1<<2);
// PORT->P7 |= (1<<2);
// PORT->PM7 &= ~(1<<2);
PORT->PSET7 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
else
{
//RTE_GPIO_Config(BU98R10_CHIP1_SD, RTE_GPIO_DIR_IN);
PORT->PM7 |= (1<<2);
// PORT->PM7 |= (1<<2);
PORT->PCLR7 = (1<<2);
NOP_DelayTime(BU98R10_NOP_TIME);
}
}
......
Firmware/Source/Component/BU98R10/BU98R10.h
View file @ fa9fdbc9
......@@ -938,7 +938,7 @@ void BU98R10_All_Data_Write(uint8_t Dat0, uint8_t Dat1);
extern void checkSegTftState(void);
#endif
extern void NOP_DelayTime(uint8_t timer);
#endif
Firmware/Source/Component/Key/Key_user.c
View file @ fa9fdbc9
......@@ -558,7 +558,7 @@ uint8_t Get_Dis_Tpms_Unit(void)
uint8_t Get_Dis_Tcs_Val(void)
{
return MenuData.Tcs_Val; // 0 off, 1 on
return (uint8_t)(MenuData.Tcs_Val); // 0 off, 1 on
}
uint8_t Get_Tpms_TX_Flag(void)
{
......
Firmware/Source/Component/Service_Interval/Service_Interval.c
View file @ fa9fdbc9
......@@ -70,7 +70,7 @@ void Service_Interval_KL30_Init(Intlib_uint8_t *pMemSpace, Maintain_Init_t *pIni
if ( g_EEPromRead_Cbk != Intlib_NULL )
{
g_EEPromRead_Cbk(( Intlib_uint32_t * )&DataIntervalSave, sizeof(DataIntervalSave_t) / 4);
g_EEPromRead_Cbk(( Intlib_uint32_t * )&DataIntervalSave, (Intlib_uint16_t)(sizeof(DataIntervalSave_t) / 4));
if ( DataIntervalSave.Flag != 0x7887A55A )
{
g_IntervalCalc->Interval100m = pInitData->IntervalKm * 10;
......@@ -85,7 +85,7 @@ void Service_Interval_KL30_Init(Intlib_uint8_t *pMemSpace, Maintain_Init_t *pIni
DataIntervalSave.TotalTimer = g_IntervalCalc->CurTimer_1s;
if ( g_EEPromWrite_Cbk != Intlib_NULL )
{
g_EEPromWrite_Cbk(( Intlib_uint32_t * )&DataIntervalSave, sizeof(DataIntervalSave_t) / 4);
g_EEPromWrite_Cbk(( Intlib_uint32_t * )&DataIntervalSave, (Intlib_uint16_t)(sizeof(DataIntervalSave_t) / 4));
}
}
else
......@@ -212,7 +212,7 @@ void Service_Interval_Processing(void)
DataIntervalSave.MilAfterReset = g_IntervalCalc->MilAfterReset;
DataIntervalSave.Interval1s = g_IntervalCalc->Interval1s;
DataIntervalSave.TotalTimer = g_IntervalCalc->CurTimer_1s;
g_EEPromWrite_Cbk(( Intlib_uint32_t * )&DataIntervalSave, sizeof(DataIntervalSave_t) / 4);
g_EEPromWrite_Cbk(( Intlib_uint32_t * )&DataIntervalSave, (Intlib_uint16_t)(sizeof(DataIntervalSave_t) / 4));
}
}
}
......@@ -301,12 +301,12 @@ void Service_Interval_SetKm(Intlib_uint32_t IntervalKm)
{
if (g_EEPromWrite_Cbk != Intlib_NULL)
{
g_EEPromWrite_Cbk((Intlib_uint32_t *)&DataIntervalSave, sizeof(DataIntervalSave_t) / 4);
g_EEPromWrite_Cbk((Intlib_uint32_t *)&DataIntervalSave, (Intlib_uint16_t)(sizeof(DataIntervalSave_t) / 4));
}
if (g_EEPromRead_Cbk != Intlib_NULL)
{
g_EEPromRead_Cbk((Intlib_uint32_t *)&ReadDataIntervalSave, sizeof(DataIntervalSave_t) / 4);
g_EEPromRead_Cbk((Intlib_uint32_t *)&ReadDataIntervalSave, (Intlib_uint16_t)(sizeof(DataIntervalSave_t) / 4));
}
if (memcmp(&DataIntervalSave, &ReadDataIntervalSave, sizeof(DataIntervalSave_t)) == 0)
......@@ -358,7 +358,7 @@ void Service_Interval_SetDay(Intlib_uint32_t IntervalDay)
if ( g_EEPromWrite_Cbk != Intlib_NULL )
{
g_EEPromWrite_Cbk(( Intlib_uint32_t * )&DataIntervalSave, sizeof(DataIntervalSave_t) / 4);
g_EEPromWrite_Cbk(( Intlib_uint32_t * )&DataIntervalSave, (Intlib_uint16_t)(sizeof(DataIntervalSave_t) / 4));
}
}
}
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/GPIO/RTE_GPIO.h
View file @ fa9fdbc9
......@@ -142,7 +142,7 @@ typedef enum
typedef struct
{
uint16_t u16PinNum; /**< GPIO端口编号(RTE_GPIO_PORTxx_PINyy) */
uint16_t u16PinMode; /**< GPIO工作模式 */
uint8_t u16PinMode; /**< GPIO工作模式 */
}RTE_GPIO_Config_st_t;
/******************************************************************************
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/Tick_Timer/RTE_Tick_Timer_BAT32A239.c
View file @ fa9fdbc9
......@@ -24,7 +24,7 @@ void RTE_Tick_Timer_Start(uint32_t u32Interval, RTE_Tick_Timer_Call_Back_ptr_t p
u32Interval = 1UL;
}
u8Value_us = RTE_TICK_TIMER_CLK_SRC_FREQ/1000000;
u8Value_us = (uint8_t)(RTE_TICK_TIMER_CLK_SRC_FREQ/1000000);
SysTick->LOAD = u32Interval * u8Value_us;
NVIC_SetPriority (SysTick_IRQn, (1UL << __NVIC_PRIO_BITS) - 1UL);
SysTick->VAL = 0UL;
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/UART/UART_DEMO.c
View file @ fa9fdbc9
......@@ -99,7 +99,7 @@ char Uart0_Receive(void)
* @param None
* @return None
*****************************************************************************/
void Uart0_IntSend(uint8_t *tx_buf, uint16_t tx_num)
void Uart0_IntSend(uint8_t *tx_buf, uint32_t tx_num)
{
pData.data = tx_buf;
pData.len = tx_num;
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/UART/UART_DEMO.h
View file @ fa9fdbc9
......@@ -18,7 +18,7 @@ int8_t Uart0_Init(uint32_t bound);
void Uart0_Send(uint8_t ch);
char Uart0_Receive(void);
void Uart0_IntSend(uint8_t *tx_buf, uint16_t tx_num);
void Uart0_IntSend(uint8_t *tx_buf, uint32_t tx_num);
void uart0_interrupt_send(void *msg);
void uart0_interrupt_receive(void);
#endif
Firmware/Source/System/Sys_Task_List.c
View file @ fa9fdbc9
......@@ -37,13 +37,12 @@ void Sys_5ms_Tasks(void)
{
Flash_Sync_Signal_Generation_Service();
}
}
//uint8_t ljs_buf[200] = {0};
void Sys_10ms_Tasks(void)
{
//memset(ljs_buf, 0x55, 200);
Line_In_Debounce_Service(10u);
{
Line_In_Debounce_Service(10u);
if(Common_GetIgnOnTime() >= 3000)
{
Key_Service();
......@@ -57,7 +56,7 @@ void Sys_10ms_Tasks(void)
Data_TPMS_Processing_Service();
Protocol_Service();
Protocol_Send_Service();
//Uart0_IntSend(ljs_buf, 200) ;
FaultCode_Service(10u);
}
......@@ -68,14 +67,14 @@ void Sys_20ms_Tasks(void)
Data_Vehicle_Speed_Processing_Service();
Data_Engine_Speed_Processing_Service();
Data_Coolant_Temp_Processing_Service();
//Data_Voltage_Processing_Service();
BU98R10_Update_Request();
}
void Sys_50ms_Tasks(void)
{
// BU98R10_Update_Request();
LED_Driver_Scan_Refresh();
Telltales_Management();
Gauge_Service();
......@@ -83,7 +82,7 @@ void Sys_50ms_Tasks(void)
}
uint8_t u8LEDDriverCheckCount = 0U;
//uint16_t ljs_voltage = 0;
void Sys_100ms_Tasks(void)
{
if((PageType != Page_Time_Hour)&&(PageType != Page_Time_Minute))
......@@ -97,10 +96,9 @@ void Sys_100ms_Tasks(void)
BackLight_Process();
Services_Mileage_Callback();
Data_Voltage_Processing_Service();
S3_ServerCNTT();
//ECU_FaultCode_Processing_Service();
S3_ServerCNTT();
Send_UUID_To_Esp32();
//ljs_voltage = ADC_Conv_Single_Channel(ADC_CH_KL15_VOLTAGE);
if (u8LEDDriverCheckCount >= 10U)
{
u8LEDDriverCheckCount = 0U;
......@@ -119,7 +117,7 @@ void Sys_100ms_Tasks(void)
{
CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
}
//R_test = ADC_Read_Signal(ADC_CH_FUEL1);
}
......@@ -140,5 +138,5 @@ void Sys_Exact_50us_Tasks(void)
task_1ms =0U;
eeprom_1ms_timeCount( );
}
//u32YZHDCount++;
}
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