Skip to content

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

Merge branch 'lijianshuang' into 'dev' 

Lijianshuang

See merge request !33
parents ea2bb0b7 cb3de13f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 83 deletions
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx
View file @ 77ddf539
......@@ -275,7 +275,7 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>1</Type>
<StartAddress>0x0</StartAddress>
<StartAddress>0x8000</StartAddress>
<Size>0x40000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
......@@ -513,16 +513,6 @@
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_Coolant\Data_Coolant.h</FilePath>
</File>
<File>
<FileName>Data_TPMS.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\Data_TPMS\Data_TPMS.c</FilePath>
</File>
<File>
<FileName>Data_TPMS.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_TPMS\Data_TPMS.h</FilePath>
</File>
<File>
<FileName>FaultCode.c</FileName>
<FileType>1</FileType>
......@@ -583,6 +573,26 @@
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\Protocol_User.h</FilePath>
</File>
<File>
<FileName>Data_TPMS.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\Data_TPMS\Data_TPMS.c</FilePath>
</File>
<File>
<FileName>Data_TPMS.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_TPMS\Data_TPMS.h</FilePath>
</File>
<File>
<FileName>code.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\FaultCode\code.c</FilePath>
</File>
<File>
<FileName>code.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\FaultCode\code.h</FilePath>
</File>
</Files>
</Group>
<Group>
......
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT
View file @ 77ddf539
......@@ -15,13 +15,14 @@ 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_coolant.__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"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_lib.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_tpms.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\code.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\bu98r10.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\services_mileage_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\eemanager_interface.__i"
......
Firmware/Source/Application/BLUETOOTH/Protocol_Lib.c
View file @ 77ddf539
......@@ -11,6 +11,7 @@
#include <stdio.h>
#include <string.h>
#include "Protocol_Lib.h"
#include "Protocol_CRC16.h"
static UARTOpen UARTOpen_Cbk;
static UARTSend UARTSend_Cbk;
static UARTRead UARTRead_Cbk;
......
Firmware/Source/Application/BLUETOOTH/Protocol_User.c
View file @ 77ddf539
......@@ -27,7 +27,7 @@ static Protocol_uint8_t UsartDataBuf [ 256 ];
static Protocol_uint8_t mDataBufPtr [ UART_DATA_BUF_LEN ];
static Protocol_uint8_t Protocol_OpenUart(void);
static Protocol_uint32_t Protocol_UartRead(Protocol_uint8_t *pData, Protocol_uint32_t u32Len);
static Protocol_uint32_t Protocol_UartRead(Protocol_uint8_t *pData, Protocol_uint32_t len);
static Protocol_uint32_t Protocol_UartSend(const Protocol_uint8_t *pData, Protocol_uint32_t u32Len);
static void Protocol_UartHandle(const Protocol_Data_t *pData);
......
Firmware/Source/Application/CAN_User/Can_App.c
View file @ 77ddf539
......@@ -15,8 +15,10 @@ void Can_Set_Buff_220(canlib_uint8_t CopyData[])
{
p220->Msg [ i ] = 0xFFu;
}
}
p220 -> Sig.TCS_TX = Get_Dis_Tcs_Val();
}
}
void Can_Set_Buff_6EE(canlib_uint8_t CopyData[])
{
......@@ -33,12 +35,22 @@ void Can_Set_Buff_6EE(canlib_uint8_t CopyData[])
{
p6EE->Msg [ i ] = 0xFFu;
}
}
//p6EE -> Sig.Vsppe_H3_TX = (Vspeed_tx >> 8) & 0x7u ;
//p6EE -> Sig.Vsppe_L8_TX = Vspeed_tx & 0xFF ;
p6EE -> Sig.ODO_TX_H = (ODO_tx >> 16) & 0xFF ;
p6EE -> Sig.ODO_TX_M = (ODO_tx >> 8) & 0xFF ;
p6EE -> Sig.ODO_TX_L = ODO_tx & 0xFF ;
if(Get_Fuel_RES() > 255)
{
p6EE -> Sig.Fuel_Res_TX = 0xFF ;
}
else
{
p6EE -> Sig.Fuel_Res_TX = Get_Fuel_RES() ;
}
}
//p6EE -> Sig.Vsppe_H3_TX = (Vspeed_tx >> 8) & 0x7u ;
//p6EE -> Sig.Vsppe_L8_TX = Vspeed_tx & 0xFF ;
// p6EE -> Sig.Uint_TX = Get_Dis_KM_Unit() ;
// p6EE -> Sig.Coolant_Seg_TX = GET_DataCoolantTempSegDisp() ;
//if (GET_DataCollantTempWarnflg() == 2)
......@@ -50,14 +62,6 @@ void Can_Set_Buff_6EE(canlib_uint8_t CopyData[])
// p6EE -> Sig.Coolant_Warn_TX = 0;
//}
//p6EE -> Sig.Fuel_Seg_TX = Get_CurFuelSetp() ;
if(Get_Fuel_RES() > 255)
{
p6EE -> Sig.Fuel_Res_TX = 0xFF ;
}
else
{
p6EE -> Sig.Fuel_Res_TX = Get_Fuel_RES() ;
}
}
......@@ -76,10 +80,11 @@ void Can_Set_Buff_6EF(canlib_uint8_t CopyData[])
{
p6EF->Msg [ i ] = 0xFFu;
}
}
//p6EF -> Sig.Espeed_TX = Espeed_tx;
p6EF -> Sig.TripA_H = (TripA_tx >> 8) & 0xFF;
p6EF -> Sig.TripA_L = TripA_tx & 0xFF;
}
//p6EF -> Sig.Espeed_TX = Espeed_tx;
//p6EF -> Sig.Coolant_TX = GET_DataCoolantTempValueDisp() + 40;
}
void Can_Set_Buff_450(canlib_uint8_t CopyData[])
......@@ -94,11 +99,12 @@ void Can_Set_Buff_450(canlib_uint8_t CopyData[])
{
p450->Msg [ i ] = 0xFFu;
}
}
p450 -> Sig.Front_Pressure_TX_H = (Get_Front_TPMS_TX() >> 8) & 0xFF;
p450 -> Sig.Front_Pressure_TX_L = Get_Front_TPMS_TX() & 0xFF;
p450 -> Sig.Rear_Pressure_TX_H = (Get_Rear_TPMS_TX() >> 8) & 0xFF;
p450 -> Sig.Rear_Pressure_TX_L = Get_Rear_TPMS_TX() & 0xFF;
}
}
void Can_Set_Buff_580(canlib_uint8_t CopyData[])
{
......@@ -112,7 +118,7 @@ void Can_Set_Buff_580(canlib_uint8_t CopyData[])
{
p580->Msg [ i ] = 0xFFu;
}
}
if(Get_Tpms_TX_Flag() == 1)
{
p580 -> Sig.TPMS_LEARN_CND_BYTE0 = 0x31;
......@@ -137,6 +143,8 @@ void Can_Set_Buff_580(canlib_uint8_t CopyData[])
p580 -> Sig.TPMS_LEARN_CND_BYTE3 = 0x0;
p580 -> Sig.TPMS_LEARN_CND_BYTE4 = 0x02;
}
}
}
......
Firmware/Source/Application/CommonInterface/CommonInterface.c
View file @ 77ddf539
......@@ -98,7 +98,8 @@ void Common_Set_Disp_V_Speed_Valid(DataValid_t Val)
uint16_t Common_Get_DispSpeed(void)
{
uint16_t m_Res;
uint16_t m_Res = 0;
return m_Res;
}
......
Firmware/Source/Application/CommonInterface/CommonInterface.h
View file @ 77ddf539
......@@ -5,7 +5,7 @@
#define TY200_080000b 0
#define TY200_080000b_ty 1
#define IC_Current TY200_080000b //选择当前程序为哪个零件号的仪表
#define IC_Current TY200_080000b_ty //选择当前程序为哪个零件号的仪表
/*COMMON INTERFACE*/
typedef enum
......
Firmware/Source/Application/Fuel/Data_Fuel.h
View file @ 77ddf539
......@@ -18,5 +18,6 @@ extern uint8_t Get_Fuel_Disp_Byte(void);
extern uint8_t Get_CurFuelSetp(void);
extern FuelSensorSts_t Get_Fuel_Sensor_State(void);
uint16_t Get_Fuel_RES(void);
void Fuel_R_Cal(uint8_t deltaTime);
#endif
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ 77ddf539
......@@ -4367,7 +4367,7 @@ void Checkself_SEG_Display(void)
uint16_t Espeed = 0;
uint16_t Fuel = 0;
uint16_t collant = 0;
uint16_t TPMS = 0;
uint16_t TPMS_dis = 0;
uint16_t voltage = 0;
uint16_t hour = 0;
uint16_t min = 0;
......@@ -4402,8 +4402,8 @@ void Checkself_SEG_Display(void)
SEG_SET_Clock(hour, min, 1, 1, 1);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Screen_Time, LED_ON);
#if(IC_Current == TY200_080000b_ty)
TPMS = (Checkself_SEG_step / 3) * 11;
SEG_SET_TPMS_DISPLAY(1, TPMS, TPMS, 0, 1, 1);
TPMS_dis = (Checkself_SEG_step / 3) * 11;
SEG_SET_TPMS_DISPLAY(1, TPMS_dis, TPMS_dis, 0, 1, 1);
#endif
voltage = (Checkself_SEG_step / 3) * 111;
SEG_SET_Voltage_NUM(1, voltage);
......
Firmware/Source/Component/Components.h
View file @ 77ddf539
......@@ -6,9 +6,11 @@
#include "GenDelay\GenDelay.h"
#include "CAN_Signal\CAN_Lib.h"
#include "Line_In\Line_In.h"
#include "Line_In\Line_In_user.h"
#include "PowerManagement\PowerManagement.h"
#include "PowerManagement\PowerManag_user.h"
#include "System_Monitor\System_Monitor.h"
#include "System_Monitor\System_Monitor_User.h"
#include "Telltales\Telltales_Lib.h"
#include "Telltales\Telltales_user.h"
#include "Mileage\Services_Mileage.h"
......@@ -29,6 +31,8 @@
#include "TrmerM\TrmerM.h"
#include "RTC\RTE_RTC.h"
#include "AD\RTE_AD.h"
#include "Maintenance\Maintenance.h"
......
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ 77ddf539
......@@ -3,7 +3,8 @@
#include "Components.h"
#include "Application.h"
#include "RTE.h"
#include "UDS_ISO14229_Services.h"
#include "timm.h"
RTC_Information_st_t g_stRTCInformation;
......
Firmware/Source/Component/System_Monitor/System_Monitor_User.c
View file @ 77ddf539
......@@ -2,6 +2,7 @@
#include "Components.h"
#include "Application.h"
#include "delay.h"
#include "wdt.h"
#define u16Base_Vol 0u
#define u16ENTER_LOW_N_RANGE 6500U
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/CLOCK_Select/RTE_CLOCK_Select_BAT32A239.c
View file @ 77ddf539
......@@ -3,6 +3,7 @@
#include "core_cm0plus.h"
#include "RTE_CLOCK_Select.h"
#include "cgc.h"
#include "delay.h"
#define USED_FX_FCLK
//#define USED_FHOCO_FCLK
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/DeepSleep/DeepSleep.c
View file @ 77ddf539
#include <stdint.h>
#include "GPIO\RTE_GPIO.h"
#include "DeepSleep.h"
#include"isr.h"
void DEEPSLEEP_EXTI0_IRQHandler(void *msg);
void DEEPSLEEP_EXTI1_IRQHandler(void *msg);
......@@ -73,9 +73,9 @@ const RTE_DEEPSLEEP_INTP_Table_st_t DEEPSLEEP_INTP_Table[] =
void RTE_DEEPSLEEP_GPIO_Interrupt_Enable(uint16_t u16Pin, Trigger_TypeDef EXTI_Trigger)
{
// int32_t i32Result;
uint8_t u8Index;
uint16_t u16PortIndex;
uint16_t u16PinIndex;
uint8_t u8Index = 0;
uint16_t u16PortIndex = 0;
uint16_t u16PinIndex = 0;
GPIO_InitTypeDef GPIO_InitStruct = {0};
INTP_InitTypeDef INTP_InitStructure;
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/GPIO/RTE_GPIO_BAT32A239.c
View file @ 77ddf539
......@@ -527,10 +527,10 @@ int32_t RTE_GPIO_Interrupt_Register(RTE_GPIO_IRQ_Desc_st_t *pstIRQDesc,
*/
int32_t RTE_GPIO_Interrupt_Enable(RTE_GPIO_IRQ_Desc_st_t *pstIRQDesc)
{
int32_t i32Result;
uint8_t u8Index;
uint16_t u16PortIndex;
uint16_t u16PinIndex;
int32_t i32Result = 0;
uint8_t u8Index = 0;
uint16_t u16PortIndex = 0;
uint16_t u16PinIndex = 0;
INTP_InitTypeDef stEXTICfg;
// GPIO_InitTypeDef GPIO_InitStruct;
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/GPIO/RTE_GPIO_BAT32A239.h
View file @ 77ddf539
......@@ -17,14 +17,14 @@ typedef struct
void *pvHandler;
}RTE_GPIO_IRQ_Desc_st_t;
#define RTE_GPIO_PORT_GROUP_00 (00U)
#define RTE_GPIO_PORT_GROUP_01 (01U)
#define RTE_GPIO_PORT_GROUP_02 (02U)
#define RTE_GPIO_PORT_GROUP_03 (03U)
#define RTE_GPIO_PORT_GROUP_04 (04U)
#define RTE_GPIO_PORT_GROUP_05 (05U)
#define RTE_GPIO_PORT_GROUP_06 (06U)
#define RTE_GPIO_PORT_GROUP_07 (07U)
#define RTE_GPIO_PORT_GROUP_00 (0U)
#define RTE_GPIO_PORT_GROUP_01 (1U)
#define RTE_GPIO_PORT_GROUP_02 (2U)
#define RTE_GPIO_PORT_GROUP_03 (3U)
#define RTE_GPIO_PORT_GROUP_04 (4U)
#define RTE_GPIO_PORT_GROUP_05 (5U)
#define RTE_GPIO_PORT_GROUP_06 (6U)
#define RTE_GPIO_PORT_GROUP_07 (7U)
#define RTE_GPIO_PORT_GROUP_12 (12U)
#define RTE_GPIO_PORT_GROUP_13 (13U)
#define RTE_GPIO_PORT_GROUP_14 (14U)
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/RTC/RTE_RTC.c
View file @ 77ddf539
......@@ -5,7 +5,7 @@
#include "BAT32A239.h"
#include "gpio.h"
#include "RTE_RTC.h"
#include"isr.h"
#define USED_FSUB_RTC_FCLK
......
Firmware/Source/System/Sys_Task_List.c
View file @ 77ddf539
......@@ -4,6 +4,7 @@
#include "Components.h"
#include "RTE.h"
#include "UDS_ISO14229_Server.h"
void Sys_Pseudo_Real_Time_Tasks(void)
{
Power_Management_Service();
......
Firmware/utility/程序释放/20240619/TianYing.hex 0 → 100644
View file @ 77ddf539
This diff is collapsed.
Firmware/utility/诊断工具/Option/Option.properties
View file @ 77ddf539
#new Option
#Thu Jun 06 11:11:09 CST 2024
#Wed Jun 19 19:12:31 CST 2024
IsSort=true
MergeFlashIsCompression=false
ChangeAppFilePath=
......@@ -7,7 +7,7 @@ MergeCanXLSPath=
RH850_D1M1AGPIOJSONpath=
DBFFilePath=
MergeCrcTtpe=21
MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TianYing_TY200.080000b_Boot_B1.00_240513.hex
MergeBootFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\Boot_Release\\TY200.080000b(ty)\\TY_TY200.080000b(ty)_Boot_B1.00_240607.hex
IsMergeChangeAddress=false
MergeFlashOutPutFilePath=
GPIOOutPutPath=
......@@ -56,8 +56,8 @@ IsHexDisplay=true
MergeLineInXLSPath=
MergeFlashInPutFilePath=
MergeFlashIsInternal=false
MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E
MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\TianYing.hex
MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240619
MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240619\\TianYing.hex
MergeTelltalesXLSPath=
FillingByte=-86
ImageVersion=0
......
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