Skip to content

TianYing_ty100
TianYing_ty100
Commit 8eb4f559 authored by 李俭双's avatar 李俭双
Browse files
Options

🐞 fix:调试串口，更改蓝牙指示灯判断条件，更改蓝牙显示bug

parent ff4d7d95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 27 deletions
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RTE/Device/BAT32G139GK64FB/userdefine.h
View file @ 8eb4f559
...@@ -18,7 +18,7 @@ User definitions ...@@ -18,7 +18,7 @@ User definitions
typedef unsigned short MD_STATUS; typedef unsigned short MD_STATUS;
#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0 #define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
#define APP_BASE (0x00008000ul) #define APP_BASE (0x00008000ul)
/* Status list definition */ /* Status list definition */
......
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx
View file @ 8eb4f559
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
</OCR_RVCT3> </OCR_RVCT3>
<OCR_RVCT4> <OCR_RVCT4>
<Type>1</Type> <Type>1</Type>
<StartAddress>0x8000</StartAddress> <StartAddress>0x0</StartAddress>
<Size>0x40000</Size> <Size>0x40000</Size>
</OCR_RVCT4> </OCR_RVCT4>
<OCR_RVCT5> <OCR_RVCT5>
...@@ -543,6 +543,46 @@ ...@@ -543,6 +543,46 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_Voltage\Data_Voltage.h</FilePath> <FilePath>..\..\..\..\Source\Application\Data_Voltage\Data_Voltage.h</FilePath>
</File> </File>
<File>
<FileName>BlueTooth.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\BlueTooth.c</FilePath>
</File>
<File>
<FileName>BlueTooth.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\BlueTooth.h</FilePath>
</File>
<File>
<FileName>Protocol_CRC16.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\Protocol_CRC16.c</FilePath>
</File>
<File>
<FileName>Protocol_CRC16.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\Protocol_CRC16.h</FilePath>
</File>
<File>
<FileName>Protocol_Lib.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\Protocol_Lib.c</FilePath>
</File>
<File>
<FileName>Protocol_Lib.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\Protocol_Lib.h</FilePath>
</File>
<File>
<FileName>Protocol_User.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\Protocol_User.c</FilePath>
</File>
<File>
<FileName>Protocol_User.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\BLUETOOTH\Protocol_User.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
...@@ -818,6 +858,11 @@ ...@@ -818,6 +858,11 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\Maintenance\Maintenance.h</FilePath> <FilePath>..\..\..\..\Source\Component\Maintenance\Maintenance.h</FilePath>
</File> </File>
<File>
<FileName>System_Monitor.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
......
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT
View file @ 8eb4f559
...@@ -18,6 +18,10 @@ SET CPU_CLOCK=0x00B71B00 ...@@ -18,6 +18,10 @@ SET CPU_CLOCK=0x00B71B00
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_tpms.__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\faultcode.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_voltage.__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\bu98r10.__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\services_mileage_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\eemanager_interface.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\eemanager_interface.__i"
...@@ -32,6 +36,7 @@ SET CPU_CLOCK=0x00B71B00 ...@@ -32,6 +36,7 @@ SET CPU_CLOCK=0x00B71B00
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\system_monitor_user.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\system_monitor_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\telltales_user.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\telltales_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\maintenance.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\maintenance.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\system_monitor_1.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_tick_timer_bat32a239.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_tick_timer_bat32a239.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_wdt_bat32a239.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_wdt_bat32a239.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_gpio_bat32a239.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_gpio_bat32a239.__i"
...@@ -71,7 +76,7 @@ SET CPU_CLOCK=0x00B71B00 ...@@ -71,7 +76,7 @@ SET CPU_CLOCK=0x00B71B00
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\tima.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\tima.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timb.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timb.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timm.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timm.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uart_1.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uart.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\wdt.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\wdt.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\isr.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\isr.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\docan_iso15765.__i" "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\docan_iso15765.__i"
......
Firmware/Source/Application/BLUETOOTH/Protocol_Lib.c
View file @ 8eb4f559
...@@ -127,7 +127,9 @@ Protocol_uint32_t Protocol_Parse(const Protocol_uint8_t *pData, Protocol_uint32_ ...@@ -127,7 +127,9 @@ Protocol_uint32_t Protocol_Parse(const Protocol_uint8_t *pData, Protocol_uint32_
} }
dataLen = pData [ 2 ]; dataLen = pData [ 2 ];
frameLen = dataLen + DATA_PACKAGE_FIXED_LEN; frameLen = dataLen + DATA_PACKAGE_FIXED_LEN;
if ( frameLen > remainLen ) if ( frameLen > remainLen )
{ {
// 数据内容不全 // 数据内容不全
...@@ -193,7 +195,7 @@ Protocol_uint32_t Protocol_Parse(const Protocol_uint8_t *pData, Protocol_uint32_ ...@@ -193,7 +195,7 @@ Protocol_uint32_t Protocol_Parse(const Protocol_uint8_t *pData, Protocol_uint32_
{ {
for ( i = 0; i < frameLen; ++i ) for ( i = 0; i < frameLen; ++i )
{ {
dataBuf [ i ] = pData [ i ]; // dataBuf [ i ] = pData [ i ];
} }
i = 0; i = 0;
#ifdef DEBUG_PRO_DATA #ifdef DEBUG_PRO_DATA
......
Firmware/Source/Application/BLUETOOTH/Protocol_User.c
View file @ 8eb4f559
...@@ -222,5 +222,5 @@ void UART_Put(Protocol_uint16_t Data) ...@@ -222,5 +222,5 @@ void UART_Put(Protocol_uint16_t Data)
UARTRxBuf.write_pos = (UARTRxBuf.write_pos + 1) % UART_RX_MAX_DEPTH; UARTRxBuf.write_pos = (UARTRxBuf.write_pos + 1) % UART_RX_MAX_DEPTH;
} }
return; //return;
} }
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ 8eb4f559
...@@ -145,6 +145,10 @@ void Gauge_Service(void) ...@@ -145,6 +145,10 @@ void Gauge_Service(void)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Screen_Time, 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_08_KMH, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_09_MPH, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, LampCh0_09_MPH, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_10_Navigator1, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_19_Navigator2, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_17_Length2, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_18_Length1, LED_OFF);
} }
} }
......
Firmware/Source/Component/LED_Driver/LED_Driver_Interface.h
View file @ 8eb4f559
...@@ -25,17 +25,17 @@ typedef enum ...@@ -25,17 +25,17 @@ typedef enum
LampCh0_08_KMH, LampCh0_08_KMH,
LampCh0_09_MPH, LampCh0_09_MPH,
LampCh0_10_Navigator, LampCh0_10_Navigator1,
LampCh0_11_Temp_AlarmR, LampCh0_11_Temp_AlarmR,
LampCh0_12_ABS_Alarm, LampCh0_12_ABS_Alarm,
LampCh0_13_Temp_AlarmW, LampCh0_13_Temp_AlarmW,
LampCh0_14_Resting_Area, LampCh0_14_ARRIVED_SERVICE_AREA,
LampCh0_15_Tollbooth, LampCh0_15_ARRIVED_TOLLGATE,
LampCh0_16_Underpass1, LampCh0_16_ARRIVED_TUNNEL,
LampCh0_17_Length2, LampCh0_17_Length2,
LampCh0_18_Length1, LampCh0_18_Length1,
LampCh0_19_Underpass2, LampCh0_19_Navigator2,
LampCh0_20_Fuel_Y, LampCh0_20_Fuel_Y,
LampCh0_21_Fuel_W, LampCh0_21_Fuel_W,
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ 8eb4f559
...@@ -37,8 +37,8 @@ static Tellib_uint16_t LED_Lateral_Strut_Judgement(void); ...@@ -37,8 +37,8 @@ static Tellib_uint16_t LED_Lateral_Strut_Judgement(void);
static void LED_Lateral_Strut_Execution(Tellib_uint16_t led_status); static void LED_Lateral_Strut_Execution(Tellib_uint16_t led_status);
static Tellib_uint16_t LED_Tire_Pressure_Judgement(void); static Tellib_uint16_t LED_Tire_Pressure_Judgement(void);
static void LED_Tire_Pressure_Execution(Tellib_uint16_t led_status); static void LED_Tire_Pressure_Execution(Tellib_uint16_t led_status);
static Tellib_uint16_t LED_Navigato_Judgement(void); //static Tellib_uint16_t LED_Navigato_Judgement(void);
static void LED_Navigato_Execution(Tellib_uint16_t led_status); //static void LED_Navigato_Execution(Tellib_uint16_t led_status);
Led_HighBeam_Count HighBeam_Timer; Led_HighBeam_Count HighBeam_Timer;
...@@ -60,7 +60,7 @@ const LED_Attribute_st LED_Attribute [ LED_Max ] = { ...@@ -60,7 +60,7 @@ const LED_Attribute_st LED_Attribute [ LED_Max ] = {
{em_LED_Low_Batt_Vol, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Low_Batt_Judgement, LED_Low_Batt_Execution}, {em_LED_Low_Batt_Vol, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Low_Batt_Judgement, LED_Low_Batt_Execution},
{em_LED_Lateral_Strut, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Lateral_Strut_Judgement, LED_Lateral_Strut_Execution}, {em_LED_Lateral_Strut, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Lateral_Strut_Judgement, LED_Lateral_Strut_Execution},
{em_LED_Tire_Pressure_Alarm, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Tire_Pressure_Judgement, LED_Tire_Pressure_Execution}, {em_LED_Tire_Pressure_Alarm, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Tire_Pressure_Judgement, LED_Tire_Pressure_Execution},
{em_LED_Navigator, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Navigato_Judgement, LED_Navigato_Execution}, //{em_LED_Navigator, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Navigato_Judgement, LED_Navigato_Execution},
}; };
...@@ -342,7 +342,7 @@ static void LED_Coolant_Execution(Tellib_uint16_t led_status) ...@@ -342,7 +342,7 @@ static void LED_Coolant_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Bluetooth_Judgement(void) static Tellib_uint16_t LED_Bluetooth_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
if (0) if (BlueTooth.BLE_St)
{ {
LED_STATE = 1u; LED_STATE = 1u;
} }
......
Firmware/Source/Component/Telltales/Telltales_user.h
View file @ 8eb4f559
...@@ -18,7 +18,7 @@ typedef enum ...@@ -18,7 +18,7 @@ typedef enum
em_LED_Low_Batt_Vol, em_LED_Low_Batt_Vol,
em_LED_Lateral_Strut, em_LED_Lateral_Strut,
em_LED_Tire_Pressure_Alarm, em_LED_Tire_Pressure_Alarm,
em_LED_Navigator, //em_LED_Navigator,
LED_Max , LED_Max ,
} LED_Idx_t; } LED_Idx_t;
......
Firmware/Source/Device/Cmsemicon/BAT32A239/RTE/UART/UART_DEMO.c
View file @ 8eb4f559
...@@ -158,8 +158,8 @@ void uart0_interrupt_receive(void) ...@@ -158,8 +158,8 @@ void uart0_interrupt_receive(void)
UART_ClearFlag(UART0,UART_FLAG_FEF | UART_FLAG_PEF | UART_FLAG_OVF); UART_ClearFlag(UART0,UART_FLAG_FEF | UART_FLAG_PEF | UART_FLAG_OVF);
uart_callback_error(err_type); uart_callback_error(err_type);
} }
rx_data = UART0_RX;
UART_Put((uint16_t)UART0_RX); UART_Put((uint16_t)rx_data);
......
Firmware/utility/诊断工具/Option/Option.properties
View file @ 8eb4f559
#new Option #new Option
#Wed May 15 17:36:23 CST 2024 #Thu May 23 14:16:06 CST 2024
IsSort=true IsSort=true
MergeFlashIsCompression=false MergeFlashIsCompression=false
ChangeAppFilePath= ChangeAppFilePath=
...@@ -56,8 +56,8 @@ IsHexDisplay=true ...@@ -56,8 +56,8 @@ IsHexDisplay=true
MergeLineInXLSPath= MergeLineInXLSPath=
MergeFlashInPutFilePath= MergeFlashInPutFilePath=
MergeFlashIsInternal=false MergeFlashIsInternal=false
MergeOutPutFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\20240515 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\\20240515\\TianYing.hex MergeAppFilePath=D\:\\Git\\\u5929\u9E70\\tianying_ty100\\Firmware\\utility\\\u7A0B\u5E8F\u91CA\u653E\\TianYing.hex
MergeTelltalesXLSPath= MergeTelltalesXLSPath=
FillingByte=-86 FillingByte=-86
ImageVersion=0 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